[jbosstools-commits] JBoss Tools SVN: r35961 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: marker and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Oct 24 19:39:15 EDT 2011
Author: dazarov
Date: 2011-10-24 19:39:14 -0400 (Mon, 24 Oct 2011)
New Revision: 35961
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
Log:
Wrong name of "Add annotation" and "Delete annotation" quick fixes for CDI problem markers https://issues.jboss.org/browse/JBIDE-10024
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-10-24 23:24:33 UTC (rev 35960)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-10-24 23:39:14 UTC (rev 35961)
@@ -114,6 +114,14 @@
public static String CREATE_INTERCEPTOR_TITLE;
public static String CREATE_DECORATOR_TITLE;
+ public static String CDI_QUICK_FIXES_ANNOTATION;
+ public static String CDI_QUICK_FIXES_INTERFACE;
+ public static String CDI_QUICK_FIXES_CLASS;
+ public static String CDI_QUICK_FIXES_TYPE;
+ public static String CDI_QUICK_FIXES_METHOD;
+ public static String CDI_QUICK_FIXES_FIELD;
+ public static String CDI_QUICK_FIXES_PARAMETER;
+
public static String QUESTION;
public static String DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-10-24 23:24:33 UTC (rev 35960)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-10-24 23:39:14 UTC (rev 35961)
@@ -98,6 +98,14 @@
CREATE_INTERCEPTOR_TITLE=Create ''{0}'' CDI Interceptor
CREATE_DECORATOR_TITLE=Create ''{0}'' CDI Decorator
+CDI_QUICK_FIXES_ANNOTATION=annotation
+CDI_QUICK_FIXES_INTERFACE=interface
+CDI_QUICK_FIXES_CLASS=class
+CDI_QUICK_FIXES_TYPE=type
+CDI_QUICK_FIXES_METHOD=method
+CDI_QUICK_FIXES_FIELD=field
+CDI_QUICK_FIXES_PARAMETER=parameter of ''{0}'' method
+
QUESTION=Question
DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS=Decreasing field visibility may cause compilation problems. Do you want to continue?
@@ -105,7 +113,7 @@
SELECT_BEAN_WIZARD_ENTER_BEAN_NAME=Enter CDI Bean name prefix or pattern (? = any character, * = any string):
SELECT_BEAN_WIZARD_SELECT_BEAN=Select CDI Bean:
-ADD_QUALIFIERS_TO_BEAN_WIZARD_TITLE=Add/Remove Qualifiers to/from the Bean
+ADD_QUALIFIERS_TO_BEAN_WIZARD_TITLE=Add/Remove Qualifiers to/from the ''{0}'' bean
ADD_QUALIFIERS_TO_BEAN_WIZARD_AVAILABLE=Available:
ADD_QUALIFIERS_TO_BEAN_WIZARD_IN_BEAN=In the Bean:
ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE=Move qualifiers to the right to add them to the ''{0}'' bean
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-10-24 23:24:33 UTC (rev 35960)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-10-24 23:39:14 UTC (rev 35961)
@@ -19,6 +19,7 @@
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution2;
@@ -38,13 +39,24 @@
String shortName = MarkerResolutionUtils.getShortName(qualifiedName);
String type = "";
if(element instanceof IType){
- type = "class";
+ try {
+ if(((IType) element).isAnnotation())
+ type = CDIUIMessages.CDI_QUICK_FIXES_ANNOTATION;
+ else if(((IType) element).isInterface())
+ type = CDIUIMessages.CDI_QUICK_FIXES_INTERFACE;
+ else if(((IType) element).isClass())
+ type = CDIUIMessages.CDI_QUICK_FIXES_CLASS;
+ else
+ type = CDIUIMessages.CDI_QUICK_FIXES_TYPE;
+ } catch (JavaModelException ex) {
+ CDIUIPlugin.getDefault().logError(ex);
+ }
}else if(element instanceof IMethod){
- type = "method";
+ type = CDIUIMessages.CDI_QUICK_FIXES_METHOD;
}else if(element instanceof IField){
- type = "field";
+ type = CDIUIMessages.CDI_QUICK_FIXES_FIELD;
}else if(element instanceof ILocalVariable && ((ILocalVariable) element).isParameter()){
- type = "parameter of '"+element.getParent().getElementName()+"' method";
+ type = NLS.bind(CDIUIMessages.CDI_QUICK_FIXES_PARAMETER, element.getParent().getElementName());
}
label = NLS.bind(CDIUIMessages.ADD_ANNOTATION_MARKER_RESOLUTION_TITLE, new String[]{shortName, element.getElementName(), type});
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-10-24 23:24:33 UTC (rev 35960)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-10-24 23:39:14 UTC (rev 35961)
@@ -17,9 +17,9 @@
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution2;
@@ -39,13 +39,24 @@
String shortName = MarkerResolutionUtils.getShortName(qualifiedName);
String type = "";
if(element instanceof IType){
- type = "class";
+ try {
+ if(((IType) element).isAnnotation())
+ type = CDIUIMessages.CDI_QUICK_FIXES_ANNOTATION;
+ else if(((IType) element).isInterface())
+ type = CDIUIMessages.CDI_QUICK_FIXES_INTERFACE;
+ else if(((IType) element).isClass())
+ type = CDIUIMessages.CDI_QUICK_FIXES_CLASS;
+ else
+ type = CDIUIMessages.CDI_QUICK_FIXES_TYPE;
+ } catch (JavaModelException ex) {
+ CDIUIPlugin.getDefault().logError(ex);
+ }
}else if(element instanceof IMethod){
- type = "method";
+ type = CDIUIMessages.CDI_QUICK_FIXES_METHOD;
}else if(element instanceof IField){
- type = "field";
+ type = CDIUIMessages.CDI_QUICK_FIXES_FIELD;
}else if(element instanceof ILocalVariable && ((ILocalVariable) element).isParameter()){
- type = "parameter of '"+element.getParent().getElementName()+"' method";
+ type = NLS.bind(CDIUIMessages.CDI_QUICK_FIXES_PARAMETER, element.getParent().getElementName());
}
label = NLS.bind(CDIUIMessages.DELETE_ANNOTATION_MARKER_RESOLUTION_TITLE, new String[]{shortName, element.getElementName(), type});
More information about the jbosstools-commits
mailing list