Attachment 51565 Details for Bug 157814 – Proposed patch for JDT/UI

[patch] Proposed patch for JDT/UI

v00-ui-v20061003-0800.txt (text/plain), 10.49 KB, created by Frederic Fusier

on 2006-10-06 13:55:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-10-06 13:55:23 EDT

Size: 10.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/MethodOccurenceCollector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/MethodOccurenceCollector.java,v
>retrieving revision 1.14
>diff -u -r1.14 MethodOccurenceCollector.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/MethodOccurenceCollector.java	14 Sep 2006 17:53:32 -0000	1.14
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/MethodOccurenceCollector.java	6 Oct 2006 16:31:45 -0000
>@@ -37,7 +37,7 @@
> 				return;
> 			
> 			if (match instanceof MethodReferenceMatch
>-					&& ((MethodReferenceMatch) match).isPolymorphic()
>+					&& ((MethodReferenceMatch) match).isOverridden()
> 					&& match.getAccuracy() == SearchMatch.A_INACCURATE) {
> 				return; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=156491
> 			}
>Index: ui/org/eclipse/jdt/internal/ui/search/JavaElementMatch.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaElementMatch.java,v
>retrieving revision 1.5
>diff -u -r1.5 JavaElementMatch.java
>--- ui/org/eclipse/jdt/internal/ui/search/JavaElementMatch.java	14 Sep 2006 17:53:32 -0000	1.5
>+++ ui/org/eclipse/jdt/internal/ui/search/JavaElementMatch.java	6 Oct 2006 16:31:45 -0000
>@@ -21,16 +21,16 @@
> 	private final boolean fIsWriteAccess;
> 	private final boolean fIsReadAccess;
> 	private final boolean fIsJavadoc;
>-	private final boolean fIsPolymorphic;
>+	private final boolean fIsOverridden;
> 	
>-	JavaElementMatch(Object element, int matchRule, int offset, int length, int accuracy, boolean isReadAccess, boolean isWriteAccess, boolean isJavadoc, boolean isPolymorphic) {
>+	JavaElementMatch(Object element, int matchRule, int offset, int length, int accuracy, boolean isReadAccess, boolean isWriteAccess, boolean isJavadoc, boolean isOverridden) {
> 		super(element, offset, length);
> 		fAccuracy= accuracy;
> 		fMatchRule= matchRule;
> 		fIsWriteAccess= isWriteAccess;
> 		fIsReadAccess= isReadAccess;
> 		fIsJavadoc= isJavadoc;
>-		fIsPolymorphic= isPolymorphic;
>+		fIsOverridden= isOverridden;
> 	}
> 
> 	public int getAccuracy() {
>@@ -49,8 +49,8 @@
> 		return fIsJavadoc;
> 	}
> 	
>-	public boolean isPolymorphic() {
>-		return fIsPolymorphic;
>+	public boolean isOverridden() {
>+		return fIsOverridden;
> 	}
> 	
> 	public int getMatchRule() {
>Index: ui/org/eclipse/jdt/internal/ui/search/JavaMatchFilter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaMatchFilter.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaMatchFilter.java
>--- ui/org/eclipse/jdt/internal/ui/search/JavaMatchFilter.java	27 Sep 2006 16:24:50 -0000	1.2
>+++ ui/org/eclipse/jdt/internal/ui/search/JavaMatchFilter.java	6 Oct 2006 16:31:45 -0000
>@@ -294,19 +294,19 @@
> 
> class PolymorphicFilter extends JavaMatchFilter {
>     public boolean filters(JavaElementMatch match) {
>-        return match.isPolymorphic();
>+        return match.isOverridden();
>     }
> 
>     public String getName() {
>-        return SearchMessages.MatchFilter_PolymorphicFilter_name; 
>+        return SearchMessages.MatchFilter_OverriddenFilter_name; 
>     }
> 
>     public String getActionLabel() {
>-        return SearchMessages.MatchFilter_PolymorphicFilter_actionLabel; 
>+        return SearchMessages.MatchFilter_OverriddenFilter_actionLabel; 
>     }
> 
>     public String getDescription() {
>-        return SearchMessages.MatchFilter_PolymorphicFilter_description; 
>+        return SearchMessages.MatchFilter_OverriddenFilter_description; 
>     }
>     
>     public boolean isApplicable(JavaSearchQuery query) {
>Index: ui/org/eclipse/jdt/internal/ui/search/NewSearchResultCollector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/NewSearchResultCollector.java,v
>retrieving revision 1.16
>diff -u -r1.16 NewSearchResultCollector.java
>--- ui/org/eclipse/jdt/internal/ui/search/NewSearchResultCollector.java	14 Sep 2006 17:53:32 -0000	1.16
>+++ ui/org/eclipse/jdt/internal/ui/search/NewSearchResultCollector.java	6 Oct 2006 16:31:45 -0000
>@@ -45,12 +45,12 @@
> 				isWriteAccess= localVarRef.isWriteAccess();
> 				isReadAccess= localVarRef.isReadAccess();
> 			}
>-			boolean isPolymorphic= false;
>+			boolean isOverridden= false;
> 			if (match instanceof MethodReferenceMatch) {
> 				MethodReferenceMatch methodRef= (MethodReferenceMatch) match;
>-				isPolymorphic= methodRef.isPolymorphic();
>+				isOverridden= methodRef.isOverridden();
> 			}
>-			fSearch.addMatch(new JavaElementMatch(enclosingElement, match.getRule(), match.getOffset(), match.getLength(), match.getAccuracy(), isReadAccess, isWriteAccess, match.isInsideDocComment(), isPolymorphic));
>+			fSearch.addMatch(new JavaElementMatch(enclosingElement, match.getRule(), match.getOffset(), match.getLength(), match.getAccuracy(), isReadAccess, isWriteAccess, match.isInsideDocComment(), isOverridden));
> 		}
> 	}
> 
>Index: ui/org/eclipse/jdt/internal/ui/search/SearchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchMessages.java,v
>retrieving revision 1.22
>diff -u -r1.22 SearchMessages.java
>--- ui/org/eclipse/jdt/internal/ui/search/SearchMessages.java	27 Sep 2006 16:24:50 -0000	1.22
>+++ ui/org/eclipse/jdt/internal/ui/search/SearchMessages.java	6 Oct 2006 16:31:45 -0000
>@@ -71,6 +71,21 @@
> 	public static String SearchPage_searchFor_field;
> 	public static String SearchPage_searchFor_package;
> 	public static String SearchPage_searchFor_constructor;
>+	public static String SearchPage_searchFor_class;
>+	public static String SearchPage_searchFor_interface;
>+	public static String SearchPage_searchFor_enum;
>+	public static String SearchPage_searchFor_annotation;
>+	public static String SearchPage_searchFor_class_enum;
>+	public static String SearchPage_searchFor_class_interface;
>+	public static String SearchPage_matchMode_label;
>+	public static String SearchPage_matchMode_exact;
>+	public static String SearchPage_matchMode_prefix;
>+	public static String SearchPage_matchMode_pattern;
>+	public static String SearchPage_matchMode_regexp;
>+	public static String SearchPage_matchMode_erasure;
>+	public static String SearchPage_matchMode_equivalent;
>+	public static String SearchPage_matchMode_full;
>+	public static String SearchPage_matchMode_camelcase;
> 	public static String SearchPage_limitTo_label;
> 	public static String SearchPage_limitTo_declarations;
> 	public static String SearchPage_limitTo_implementors;
>@@ -227,9 +242,9 @@
> 	public static String MatchFilter_JavadocFilter_name;
> 	public static String MatchFilter_JavadocFilter_actionLabel;
> 	public static String MatchFilter_JavadocFilter_description;
>-	public static String MatchFilter_PolymorphicFilter_name;
>-	public static String MatchFilter_PolymorphicFilter_actionLabel;
>-	public static String MatchFilter_PolymorphicFilter_description;
>+	public static String MatchFilter_OverriddenFilter_name;
>+	public static String MatchFilter_OverriddenFilter_actionLabel;
>+	public static String MatchFilter_OverriddenFilter_description;
> 	public static String MatchFilter_ErasureFilter_name;
> 	public static String MatchFilter_ErasureFilter_actionLabel;
> 	public static String MatchFilter_ErasureFilter_description;
>Index: ui/org/eclipse/jdt/internal/ui/search/SearchMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchMessages.properties,v
>retrieving revision 1.118
>diff -u -r1.118 SearchMessages.properties
>--- ui/org/eclipse/jdt/internal/ui/search/SearchMessages.properties	27 Sep 2006 16:24:50 -0000	1.118
>+++ ui/org/eclipse/jdt/internal/ui/search/SearchMessages.properties	6 Oct 2006 16:31:45 -0000
>@@ -53,6 +53,22 @@
> SearchPage_searchIn_projects=Required projects
> SearchPage_searchIn_libraries=Application libraries
> SearchPage_searchFor_constructor= Co&nstructor
>+SearchPage_searchFor_class= &Class
>+SearchPage_searchFor_interface= &Interface
>+SearchPage_searchFor_enum= &Enum
>+SearchPage_searchFor_annotation= &Annotation
>+SearchPage_searchFor_class_enum= Class+En&um
>+SearchPage_searchFor_class_interface= Class+Inte&rface
>+
>+SearchPage_matchMode_label= Match Mode
>+SearchPage_matchMode_exact= &Exact
>+SearchPage_matchMode_prefix= &Prefix
>+SearchPage_matchMode_pattern= Pa&ttern
>+SearchPage_matchMode_regexp= &Regexp
>+SearchPage_matchMode_erasure= Eras&ure
>+SearchPage_matchMode_equivalent= E&quivalent
>+SearchPage_matchMode_full= &Full
>+SearchPage_matchMode_camelcase= &Camel Case
> 
> SearchPage_limitTo_label= Limit To
> SearchPage_limitTo_declarations= Dec&larations
>@@ -65,7 +81,12 @@
> SearchPage_expression_label= Se&arch string (* = any string, ? = any character):
> SearchPage_expression_caseSensitive= Case sens&itive
> 
>-SearchPage_searchJRE_label=Search the JRE s&ystem libraries
>+#SearchPage_searchJRE_label=Search the JRE s&ystem libraries
>+SearchPage_includeMask_label=Search include mask
>+SearchPage_includeMask_sources=Sources
>+SearchPage_includeMask_applicationLibraries=Application Libraries
>+SearchPage_includeMask_systemLibraries=System Libraries
>+SearchPage_includeMask_referencedProjects=Referenced Projects
> 
> # Concatenate two working set names e.g. "Source, Lib"
> SearchUtil_workingSetConcatenation= {0}, {1}
>@@ -268,9 +289,9 @@
> MatchFilter_JavadocFilter_actionLabel=Filter &Javadoc
> MatchFilter_JavadocFilter_description=Filters matches that are inside Javadoc comments
> 
>-MatchFilter_PolymorphicFilter_name=Polymorphic method references
>-MatchFilter_PolymorphicFilter_actionLabel=Filter &Polymorphic
>-MatchFilter_PolymorphicFilter_description=Filters polymorphic method references (references to methods that are declared in a supertype or in a subtype)
>+MatchFilter_OverriddenFilter_name=Overridden method references
>+MatchFilter_OverriddenFilter_actionLabel=Filter &Overridden
>+MatchFilter_OverriddenFilter_description=Filters overridden method references (references to methods that are declared in a supertype)
> 
> MatchFilter_ErasureFilter_name=Incompatible type arguments
> MatchFilter_ErasureFilter_actionLabel=Filter In&compatible

Actions: View | Diff

Attachments on bug 157814: 51564 | 51565