filter sublimejava from list of imports

delfoxie · delfoxie · commit 4be9711a808d · 2012-11-19T15:42:19.000-05:00
diff --git a/SublimeJava.java b/SublimeJava.java
@@ -285,12 +285,14 @@ private static boolean isPackage(String packageName)
     private static Map<String, Set<String>> importMap = new HashMap<String, Set<String>>();
     private static final String CLASS_NAME_RE = "(?:$|.)?(\\w+).class";
     private static final String DIGITS_CLASS_NAME_RE = "\\d+";
+    private static final String SUBLIME_JAVA_CLASS_RE = "SublimeJava";
 
-    private static Pattern classnamePattern, digitsClassnamePattern;
+    private static Pattern classnamePattern, digitsClassnamePattern, sublimeJavaClassPattern;
     static 
     {
         classnamePattern = Pattern.compile(CLASS_NAME_RE);
         digitsClassnamePattern = Pattern.compile(DIGITS_CLASS_NAME_RE);
+        sublimeJavaClassPattern = Pattern.compile(SUBLIME_JAVA_CLASS_RE);
     }
 
     private static void addToImportMap(String classFileName)
@@ -414,24 +416,28 @@ private static void getPossibleImports(String classname)
             Set<String> possibleImports = importMap.get(classname);
             if (possibleImports != null) 
             {
-                for (String impClass : possibleImports) 
-                {
-                    System.out.println(impClass);
-                }
+                printImports(possibleImports);
             }
         }
         else
         {
             for (Set<String> imports : importMap.values()) {
-                for (String impClass : imports)
-                {
-                    System.out.println(impClass);
-                }
+                printImports(imports);
             }
         }
         
     }
 
+    private static void printImports(Set<String> imports) {
+        for (String impClass : imports)
+        {
+            if (!sublimeJavaClassPattern.matcher(impClass).matches())
+            {
+                System.out.println(impClass);
+            }
+        }
+    }
+
     private static void completePackage(String packageName) 
         throws IOException
     {

Original file line number	Diff line number	Diff line change
`@@ -285,12 +285,14 @@ private static boolean isPackage(String packageName)`
`285`	`285`	`private static Map<String, Set<String>> importMap = new HashMap<String, Set<String>>();`
`286`	`286`	`private static final String CLASS_NAME_RE = "(?:$\|.)?(\\w+).class";`
`287`	`287`	`private static final String DIGITS_CLASS_NAME_RE = "\\d+";`
	`288`	`+ private static final String SUBLIME_JAVA_CLASS_RE = "SublimeJava";`
`288`	`289`
`289`		`- private static Pattern classnamePattern, digitsClassnamePattern;`
	`290`	`+ private static Pattern classnamePattern, digitsClassnamePattern, sublimeJavaClassPattern;`
`290`	`291`	`static`
`291`	`292`	`{`
`292`	`293`	`classnamePattern = Pattern.compile(CLASS_NAME_RE);`
`293`	`294`	`digitsClassnamePattern = Pattern.compile(DIGITS_CLASS_NAME_RE);`
	`295`	`+ sublimeJavaClassPattern = Pattern.compile(SUBLIME_JAVA_CLASS_RE);`
`294`	`296`	`}`
`295`	`297`
`296`	`298`	`private static void addToImportMap(String classFileName)`
`@@ -414,24 +416,28 @@ private static void getPossibleImports(String classname)`
`414`	`416`	`Set<String> possibleImports = importMap.get(classname);`
`415`	`417`	`if (possibleImports != null)`
`416`	`418`	`{`
`417`		`- for (String impClass : possibleImports)`
`418`		`- {`
`419`		`- System.out.println(impClass);`
`420`		`- }`
	`419`	`+ printImports(possibleImports);`
`421`	`420`	`}`
`422`	`421`	`}`
`423`	`422`	`else`
`424`	`423`	`{`
`425`	`424`	`for (Set<String> imports : importMap.values()) {`
`426`		`- for (String impClass : imports)`
`427`		`- {`
`428`		`- System.out.println(impClass);`
`429`		`- }`
	`425`	`+ printImports(imports);`
`430`	`426`	`}`
`431`	`427`	`}`
`432`	`428`
`433`	`429`	`}`
`434`	`430`
	`431`	`+ private static void printImports(Set<String> imports) {`
	`432`	`+ for (String impClass : imports)`
	`433`	`+ {`
	`434`	`+ if (!sublimeJavaClassPattern.matcher(impClass).matches())`
	`435`	`+ {`
	`436`	`+ System.out.println(impClass);`
	`437`	`+ }`
	`438`	`+ }`
	`439`	`+ }`
	`440`	`+`
`435`	`441`	`private static void completePackage(String packageName)`
`436`	`442`	`throws IOException`
`437`	`443`	`{`