diff options
Diffstat (limited to 'bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java')
| -rw-r--r-- | bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java index f94b5a23..8df0250b 100644 --- a/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java +++ b/bundles/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/search/matching/JavaSearchPattern.java @@ -54,7 +54,7 @@ public class JavaSearchPattern extends SearchPattern implements IIndexConstants /** * Mask used on match rule for generic relevance. */ - public static final int MATCH_COMPATIBILITY_MASK = R_ERASURE_MATCH | R_EQUIVALENT_MATCH | R_FULL_MATCH; + public static final int MATCH_COMPATIBILITY_MASK = R_EQUIVALENT_MATCH | R_FULL_MATCH; // Signatures and arguments for parameterized types search char[][] typeSignatures; @@ -90,10 +90,6 @@ public class JavaSearchPattern extends SearchPattern implements IIndexConstants return this.isCaseSensitive; } - boolean isErasureMatch() { - return (this.matchCompatibility & R_ERASURE_MATCH) != 0; - } - boolean isEquivalentMatch() { return (this.matchCompatibility & R_EQUIVALENT_MATCH) != 0; } @@ -153,49 +149,15 @@ public class JavaSearchPattern extends SearchPattern implements IIndexConstants boolean matchDifferentTypeSuffixes(int typeSuffix, int patternSuffix) { switch(typeSuffix) { case CLASS_SUFFIX : - switch (patternSuffix) { - case CLASS_AND_INTERFACE_SUFFIX : - case CLASS_AND_ENUM_SUFFIX : - return true; - } return false; case INTERFACE_SUFFIX : - switch (patternSuffix) { - case CLASS_AND_INTERFACE_SUFFIX : - case INTERFACE_AND_ANNOTATION_SUFFIX: - return true; - } return false; case ENUM_SUFFIX : - return patternSuffix == CLASS_AND_ENUM_SUFFIX; - - case ANNOTATION_TYPE_SUFFIX : - return patternSuffix == INTERFACE_AND_ANNOTATION_SUFFIX; - - case CLASS_AND_INTERFACE_SUFFIX : - switch (patternSuffix) { - case CLASS_SUFFIX : - case INTERFACE_SUFFIX : - return true; - } - return false; - - case CLASS_AND_ENUM_SUFFIX : - switch (patternSuffix) { - case CLASS_SUFFIX : - case ENUM_SUFFIX : - return true; - } return false; - case INTERFACE_AND_ANNOTATION_SUFFIX : - switch (patternSuffix) { - case INTERFACE_SUFFIX : - case ANNOTATION_TYPE_SUFFIX : - return true; - } + case ANNOTATION_TYPE_SUFFIX : return false; } @@ -231,9 +193,6 @@ public class JavaSearchPattern extends SearchPattern implements IIndexConstants output.append(" case sensitive"); //$NON-NLS-1$ else output.append(" case insensitive"); //$NON-NLS-1$ - if ((this.matchCompatibility & R_ERASURE_MATCH) != 0) { - output.append(", erasure only"); //$NON-NLS-1$ - } if ((this.matchCompatibility & R_EQUIVALENT_MATCH) != 0) { output.append(", equivalent oronly"); //$NON-NLS-1$ } |