Bug 544931 - Fix type filtering for Organize Imports command.
Dots ('.') in type filter expressions were being recognized as a regular
expression wildcard causing additional packages to be filtered out. For
example, the filter 'org.apache.commons.collections.*', intended to
filter out all types directly under 'org.apache.commons.collections',
would also filter out types of 'org.apache.commons.collections4'.
Change-Id: I6fda097616823f5a475ad4b68384afee58f8cb06
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/TypeNameMatchCollector.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/TypeNameMatchCollector.java
index 088cece..4eabad2 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/TypeNameMatchCollector.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/TypeNameMatchCollector.java
@@ -82,8 +82,9 @@
String curr= tok.nextToken();
if (curr.length() > 0) {
// Simulate '*', and '?' wildcards using '.*' and '.'
- curr = curr.replaceAll("\\*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$
- curr = curr.replaceAll("\\?", "."); //$NON-NLS-1$ //$NON-NLS-2$
+ curr = curr.replace(".", "\\."); //$NON-NLS-1$ //$NON-NLS-2$
+ curr = curr.replace("*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$
+ curr = curr.replace("?", "."); //$NON-NLS-1$ //$NON-NLS-2$
fStringMatchers[i]= Pattern.compile(curr);
}
}
