From 2f3715aaaa79d1a1aa329860d28ae9f5628a132b Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Mon, 4 Aug 2014 14:01:07 -0700 Subject: [PATCH] Get filename from File faster [DO NOT MERGE] Use the direct call from a File object to get the filename instead of going through Path which depends on Java 7 making the LayoutLib tests incompatible with Java 6. Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad (cherry picked from commit 7dbf91fee96790fbeb9858740be1bb375f29ecb5) --- .../android/layoutlib/bridge/intensive/Main.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index 4af07dd8d8217..31b3e25cb117d 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -116,17 +116,16 @@ public class Main { } File[] possibleSdks = sdkDir.listFiles(new FileFilter() { @Override - public boolean accept(File pathname) { - return pathname.isDirectory() && pathname.getAbsolutePath().contains("android-sdk"); + public boolean accept(File path) { + return path.isDirectory() && path.getAbsolutePath().contains("android-sdk"); } }); for (File possibleSdk : possibleSdks) { File platformsDir = new File(possibleSdk, "platforms"); File[] platforms = platformsDir.listFiles(new FileFilter() { @Override - public boolean accept(File pathname) { - return pathname.isDirectory() - && pathname.toPath().getFileName().toString().startsWith("android-"); + public boolean accept(File path) { + return path.isDirectory() && path.getName().startsWith("android-"); } }); if (platforms == null || platforms.length == 0) { @@ -137,10 +136,8 @@ public class Main { @Override public int compare(File o1, File o2) { final int MAX_VALUE = 1000; - String suffix1 = o1.toPath().getFileName().toString() - .substring("android-".length()); - String suffix2 = o2.toPath().getFileName().toString() - .substring("android-".length()); + String suffix1 = o1.getName().substring("android-".length()); + String suffix2 = o2.getName().substring("android-".length()); int suff1, suff2; try { suff1 = Integer.parseInt(suffix1);