JBoss Tools SVN: r33062 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-19 19:41:22 -0400 (Tue, 19 Jul 2011)
New Revision: 33062
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
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/CDIProblemMarkerResolutionGenerator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-7632, https://issues.jboss.org/browse/JBIDE-7633, https://issues.jboss.org/browse/JBIDE-7630
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -97,4 +97,9 @@
public String SEAM_FACES_INPUT_FIELD_TYPE_NAME = "org.jboss.seam.faces.validation.InputField";
public String SEAM_FACES_INPUT_ELEMENT_TYPE_NAME = "org.jboss.seam.faces.validation.InputElement";
+
+ public String ELEMENT_TYPE_TYPE_NAME = "java.lang.annotation.ElementType.TYPE";
+ public String ELEMENT_TYPE_METHOD_NAME = "java.lang.annotation.ElementType.METHOD";
+ public String ELEMENT_TYPE_FIELD_NAME = "java.lang.annotation.ElementType.FIELD";
+ public String ELEMENT_TYPE_PARAMETER_NAME = "java.lang.annotation.ElementType.PARAMETER";
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -65,7 +65,7 @@
* Stereotype annotation type should be annotated with @Target with correct targets [JSR-299 §2.7.1]
* Stereotype annotation type should be annotated with @Retention(RUNTIME)
*/
- validateTargetAnnotation(stereotype, STEREOTYPE_GENERAL_TARGET_VARAINTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE, resource);
+ validateTargetAnnotation(stereotype, STEREOTYPE_GENERAL_TARGET_VARAINTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE, resource, CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE_ID);
/*
* Stereotype annotation type should be annotated with @Retention(RUNTIME)
@@ -177,7 +177,7 @@
/*
* Scope annotation type should be annotated with @Target({TYPE, METHOD, FIELD})
*/
- validateTargetAnnotation(scope, SCOPE_GENERAL_TARGET_VARIANTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE, resource);
+ validateTargetAnnotation(scope, SCOPE_GENERAL_TARGET_VARIANTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE, resource, CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID);
/*
* Scope annotation type should be annotated with @Retention(RUNTIME)
@@ -210,7 +210,7 @@
* Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE}) or @Target({"FIELD", "PARAMETER"})
* Qualifier annotation type should be annotated with @Retention(RUNTIME)
*/
- validateTargetAnnotation(qualifier, QUALIFIER_GENERAL_TARGET_VARIANTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE, resource);
+ validateTargetAnnotation(qualifier, QUALIFIER_GENERAL_TARGET_VARIANTS, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE, resource, CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE_ID);
/*
* Qualifier annotation type should be annotated with @Retention(RUNTIME)
@@ -218,12 +218,12 @@
validateRetentionAnnotation(qualifier, CDIValidationMessages.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE, resource, CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID);
}
- private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource) throws JavaModelException {
+ private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource, int message_id) throws JavaModelException {
IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target==null) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange(), resource), resource);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange(), resource), resource, message_id);
} else if(!CDIUtil.checkTargetAnnotation(target, variants)) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource, message_id);
}
}
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -32,6 +32,9 @@
public static final int MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID = 11;
public static final int MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID = 12;
public static final int MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID = 13;
+ public static final int MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE_ID = 14;
+ public static final int MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE_ID = 15;
+ public static final int MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID = 16;
/*
* (non-Javadoc)
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-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -105,6 +105,8 @@
public static String MAKE_FIELD_PROTECTED_MARKER_RESOLUTION_TITLE;
public static String ADD_RETENTION_MARKER_RESOLUTION_TITLE;
public static String CHANGE_RETENTION_MARKER_RESOLUTION_TITLE;
+ public static String ADD_TARGET_MARKER_RESOLUTION_TITLE;
+ public static String CHANGE_TARGET_MARKER_RESOLUTION_TITLE;
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-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-07-19 23:41:22 UTC (rev 33062)
@@ -89,6 +89,8 @@
MAKE_FIELD_PROTECTED_MARKER_RESOLUTION_TITLE=Make ''{0}'' field protected
ADD_RETENTION_MARKER_RESOLUTION_TITLE=Add @Retention(RUNTIME) annotation to ''{0}'' class
CHANGE_RETENTION_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to @Retention(RUNTIME)
+ADD_TARGET_MARKER_RESOLUTION_TITLE=Add @Target({0}) annotation to ''{1}'' class
+CHANGE_TARGET_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to @Target({1})
QUESTION=Question
DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS=Decreasing field visibility may cause compilation problems. Do you want to continue?
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.ui.marker;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IMarkerResolution2;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUIPlugin;
+
+public class AddTargetAnnotationMarkerResolution implements
+ IMarkerResolution2 {
+ private IType type;
+ private String label;
+ private String[] qualifiedNames;
+ private String[] shortNames;
+ private String totalList;
+
+ public AddTargetAnnotationMarkerResolution(IType type, String[] typeNames){
+ this.qualifiedNames = typeNames;
+ this.type = type;
+ shortNames = MarkerResolutionUtils.getShortNames(qualifiedNames);
+ totalList = "{"+MarkerResolutionUtils.getTotalList(shortNames)+"}";
+ label = NLS.bind(CDIUIMessages.ADD_TARGET_MARKER_RESOLUTION_TITLE, totalList, type.getElementName());
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void run(IMarker marker) {
+ try{
+ ICompilationUnit original = type.getCompilationUnit();
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ for(String qualifiedName : qualifiedNames){
+ MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, true);
+ }
+
+ IType workingCopyType = MarkerResolutionUtils.findWorkingCopyType(compilationUnit, type);
+
+ MarkerResolutionUtils.addAnnotation(CDIConstants.TARGET_ANNOTATION_TYPE_NAME, compilationUnit, workingCopyType, "("+totalList+")");
+
+ compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
+ compilationUnit.discardWorkingCopy();
+ }catch(CoreException ex){
+ CDIUIPlugin.getDefault().logError(ex);
+ }
+ }
+
+
+
+ public String getDescription() {
+ return label;
+ }
+
+ public Image getImage() {
+ return null;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -191,7 +191,7 @@
messageId == CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID ||
messageId == CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID){
- TypeAndAnnotation ta = findTypeOrRetentionAnnotation(file, start);
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start, CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
if(ta != null){
if(ta.annotation == null){
return new IMarkerResolution[] {
@@ -204,6 +204,58 @@
}
}
+ }else if(messageId == CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE_ID){
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start, CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
+ if(ta != null){
+ if(ta.annotation == null){
+ return new IMarkerResolution[] {
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME}),
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME})
+ };
+ }else{
+ return new IMarkerResolution[] {
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME}),
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME})
+ };
+
+ }
+ }
+ }else if(messageId == CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE_ID){
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start, CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
+ if(ta != null){
+ if(ta.annotation == null){
+ return new IMarkerResolution[] {
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME}),
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME}),
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ };
+ }else{
+ return new IMarkerResolution[] {
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME}),
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME}),
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ };
+
+ }
+ }
+ }else if(messageId == CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID){
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start, CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
+ if(ta != null){
+ if(ta.annotation == null){
+ return new IMarkerResolution[] {
+ new AddTargetAnnotationMarkerResolution(ta.type, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ };
+ }else{
+ return new IMarkerResolution[] {
+ new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ };
+
+ }
+ }
}
}
return new IMarkerResolution[] {};
@@ -318,15 +370,15 @@
}
}
- private TypeAndAnnotation findTypeOrRetentionAnnotation(IFile file, int start) throws JavaModelException{
+ private TypeAndAnnotation findTypeAndAnnotation(IFile file, int start, String annotationQualifiedName) throws JavaModelException{
IJavaElement javaElement = findJavaElement(file, start);
if(javaElement != null && javaElement instanceof IType){
IType type = (IType)javaElement;
if(!type.isBinary()){
- String shortName = MarkerResolutionUtils.getShortName(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
+ String shortName = MarkerResolutionUtils.getShortName(annotationQualifiedName);
IAnnotation[] annotations = type.getAnnotations();
for(IAnnotation annotation : annotations){
- if(annotation.getElementName().equals(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME) ||
+ if(annotation.getElementName().equals(annotationQualifiedName) ||
annotation.getElementName().equals(shortName))
return new TypeAndAnnotation(type, annotation);
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.ui.marker;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IBuffer;
+import org.eclipse.jdt.core.ICompilationUnit;
+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;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUIPlugin;
+
+public class ChangeTargetAnnotationMarkerResolution implements
+ IMarkerResolution2 {
+ private String label=null;
+ private IType type;
+ private IAnnotation annotation;
+ private String[] qualifiedNames;
+ private String[] shortNames;
+ private String totalList;
+
+
+ public ChangeTargetAnnotationMarkerResolution(IType type, IAnnotation annotation, String[] typeNames){
+ this.type = type;
+ this.annotation = annotation;
+ this.qualifiedNames = typeNames;
+ shortNames = MarkerResolutionUtils.getShortNames(qualifiedNames);
+ totalList = "{"+MarkerResolutionUtils.getTotalList(shortNames)+"}";
+
+ try {
+ label = NLS.bind(CDIUIMessages.CHANGE_TARGET_MARKER_RESOLUTION_TITLE, annotation.getSource(), totalList);
+ } catch (JavaModelException e) {
+ CDIUIPlugin.getDefault().logError(e);
+ }
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void run(IMarker marker) {
+ try{
+ ICompilationUnit original = type.getCompilationUnit();
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ for(String qualifiedName : qualifiedNames){
+ MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, true);
+ }
+
+ IAnnotation workingCopyAnnotation = MarkerResolutionUtils.findWorkingCopyAnnotation(compilationUnit, type, annotation);
+
+ IBuffer buffer = compilationUnit.getBuffer();
+ String shortName = MarkerResolutionUtils.getShortName(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
+
+ buffer.replace(workingCopyAnnotation.getSourceRange().getOffset(), workingCopyAnnotation.getSourceRange().getLength(), MarkerResolutionUtils.AT+shortName+"("+totalList+")");
+
+ compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
+ compilationUnit.discardWorkingCopy();
+ }catch(CoreException ex){
+ CDIUIPlugin.getDefault().logError(ex);
+ }
+ }
+
+ public String getDescription() {
+ return label;
+ }
+
+ public Image getImage() {
+ return null;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-07-19 22:26:25 UTC (rev 33061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-07-19 23:41:22 UTC (rev 33062)
@@ -221,6 +221,24 @@
return name;
}
+ public static String[] getShortNames(String[] qualifiedNames){
+ String[] shortNames = new String[qualifiedNames.length];
+ for(int i = 0; i < qualifiedNames.length; i++){
+ shortNames[i] = getShortName(qualifiedNames[i]);
+ }
+ return shortNames;
+ }
+
+ public static String getTotalList(String[] names){
+ String list = "";
+ for(int i = 0; i < names.length; i++){
+ if(i != 0)
+ list += ", ";
+ list += names[i];
+ }
+ return list;
+ }
+
public static IAnnotation getAnnotation(IJavaElement element, String qualifiedName){
if(element instanceof IAnnotatable){
String name = getShortName(qualifiedName);
14 years, 8 months
JBoss Tools SVN: r33061 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-07-19 18:26:25 -0400 (Tue, 19 Jul 2011)
New Revision: 33061
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
https://issues.jboss.org/browse/JBIDE-9373
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2011-07-19 22:02:13 UTC (rev 33060)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2011-07-19 22:26:25 UTC (rev 33061)
@@ -312,9 +312,9 @@
initializeParameters();
try {
if(isDataModel() && getType().isArray()) {
- fMemberType = getSourceType().getJavaProject().findType(getType().getQualifiedTypeNameOfArrayElement());
+ fMemberType = getType().getSource().getJavaProject().findType(getType().getQualifiedTypeNameOfArrayElement());
} else if(getType().getQualifiedName()!=null) {
- fMemberType = getSourceType().getJavaProject().findType(getType().getQualifiedName());
+ fMemberType = getType().getSource().getJavaProject().findType(getType().getQualifiedName());
}
} catch (JavaModelException e) {
ELCorePlugin.getPluginLog().logError(e);
14 years, 8 months
JBoss Tools SVN: r33059 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-07-19 17:43:36 -0400 (Tue, 19 Jul 2011)
New Revision: 33059
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-7631
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Documented
+@Qualifier
+public @interface TestQualifier1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Documented
+@Qualifier
+public @interface TestQualifier1 {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+
+@Retention(value = null)
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Documented
+@Qualifier
+public @interface TestQualifier2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Documented
+@Qualifier
+public @interface TestQualifier2 {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+@Scope
+@Inherited
+@Target({ TYPE, METHOD, FIELD })
+@Documented
+public @interface TestScope1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+@Retention(RUNTIME)
+@Scope
+@Inherited
+@Target({ TYPE, METHOD, FIELD })
+@Documented
+public @interface TestScope1 {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+
+@Retention(value = null)
+@Scope
+@Inherited
+@Target({ TYPE, METHOD, FIELD })
+@Documented
+public @interface TestScope2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+@Scope
+@Inherited
+@Target({ TYPE, METHOD, FIELD })
+@Documented
+public @interface TestScope2 {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+
+@Stereotype
+@Target( { TYPE })
+@ApplicationScoped
+@Named
+public @interface TestStereotype1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+@Retention(RUNTIME)
+@Stereotype
+@Target( { TYPE })
+@ApplicationScoped
+@Named
+public @interface TestStereotype1 {
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+@Retention(value = null)
+@Stereotype
+@Target( { TYPE })
+@ApplicationScoped
+@Named
+public @interface TestStereotype2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
+@Retention(RUNTIME)
+@Stereotype
+@Target( { TYPE })
+@ApplicationScoped
+@Named
+public @interface TestStereotype2 {
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-19 21:34:06 UTC (rev 33058)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-19 21:43:36 UTC (rev 33059)
@@ -25,9 +25,12 @@
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.cdi.core.test.tck.validation.ValidationTest;
+import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddRetentionAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.ChangeRetentionAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllDisposerDuplicantMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
@@ -43,7 +46,6 @@
*
*/
public class CDIMarkerResolutionTest extends ValidationTest {
- public static final String MARKER_TYPE = "org.jboss.tools.cdi.core.cdiproblem";
private void checkResolution(IProject project, String[] fileNames, String markerType, String idName, int id, Class<? extends IMarkerResolution> resolutionClass) throws CoreException {
checkResolution(project, fileNames, new String[]{}, markerType, idName, id, resolutionClass);
@@ -193,7 +195,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerOfSessionBeanBroken.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID,
MakeFieldStaticMarkerResolution.class);
@@ -210,7 +212,7 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer1.qfxresult",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerLocal.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
MakeMethodBusinessMarkerResolution.class);
@@ -225,7 +227,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer2.qfxresult",
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
AddLocalBeanMarkerResolution.class);
@@ -239,7 +241,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerNoInterface.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID,
MakeMethodPublicMarkerResolution.class);
@@ -255,7 +257,7 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken1.qfxresult",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Terrier.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID,
MakeMethodBusinessMarkerResolution.class);
@@ -269,7 +271,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken2.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID,
AddLocalBeanMarkerResolution.class);
@@ -283,7 +285,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID,
MakeMethodPublicMarkerResolution.class);
@@ -299,7 +301,7 @@
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken1.qfxresult",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/LocalInt.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID,
MakeMethodBusinessMarkerResolution.class);
@@ -313,7 +315,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken2.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID,
AddLocalBeanMarkerResolution.class);
@@ -327,7 +329,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID,
MakeMethodPublicMarkerResolution.class);
@@ -341,7 +343,7 @@
// new String[]{
// "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TimestampLogger_Broken.qfxresult"
// },
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MULTIPLE_DISPOSERS_FOR_PRODUCER_ID,
DeleteAllDisposerDuplicantMarkerResolution.class);
@@ -355,7 +357,7 @@
// new String[]{
// "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Goose_Broken.qfxresult"
// },
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MULTIPLE_INJECTION_CONSTRUCTORS_ID,
DeleteAllInjectedConstructorsMarkerResolution.class);
@@ -369,7 +371,7 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
AddSerializableInterfaceMarkerResolution.class);
@@ -383,9 +385,93 @@
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.qfxresult"
},
- MARKER_TYPE,
+ CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
AddSerializableInterfaceMarkerResolution.class);
}
+
+ public void testAddRetentionToQualifierResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier1.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
+ AddRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testChangeRetentionToQualifierResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier2.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
+ ChangeRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testAddRetentionToScopeResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope1.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope1.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID,
+ AddRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testChangeRetentionToScopeResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope2.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope2.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID,
+ ChangeRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testAddRetentionToStereotypeResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype1.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID,
+ AddRetentionAnnotationMarkerResolution.class);
+ }
+
+ public void testChangeRetentionToStereotypeResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype2.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID,
+ ChangeRetentionAnnotationMarkerResolution.class);
+ }
}
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33058 - in trunk/build: aggregate/soa-site and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-07-19 17:34:06 -0400 (Tue, 19 Jul 2011)
New Revision: 33058
Modified:
trunk/build/aggregate/site/aggregateSite.jbosstools.properties
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/index.html
trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties
trunk/build/aggregate/soa-site/index-template.html
trunk/build/aggregate/soa-site/index.html
trunk/build/parent/pom.xml
trunk/build/results/buildResults.xsl
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/publish.sh
trunk/build/target-platform/target2p2mirror.xml
Log:
refactor e37RC2-wtp33RC2 to e370-wtp330 and indigo/RC2/ to indigo/SR0/ in prep for new TP & updated reqs mirror (JBDS-1700, JBDS-1706)
Modified: trunk/build/aggregate/site/aggregateSite.jbosstools.properties
===================================================================
--- trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-07-19 21:34:06 UTC (rev 33058)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/RC2/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/site/index-template.html 2011-07-19 21:34:06 UTC (rev 33058)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
</ul>
</td>
</tr>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/site/index.html 2011-07-19 21:34:06 UTC (rev 33058)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
</ul>
</td>
</tr>
Modified: trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties
===================================================================
--- trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-07-19 21:34:06 UTC (rev 33058)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/RC2/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/,http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: trunk/build/aggregate/soa-site/index-template.html
===================================================================
--- trunk/build/aggregate/soa-site/index-template.html 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/soa-site/index-template.html 2011-07-19 21:34:06 UTC (rev 33058)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
<li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
Modified: trunk/build/aggregate/soa-site/index.html
===================================================================
--- trunk/build/aggregate/soa-site/index.html 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/aggregate/soa-site/index.html 2011-07-19 21:34:06 UTC (rev 33058)
@@ -41,7 +41,7 @@
</p>
<ul>
- <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2">JBoss Tools Requirements - Composite Mirror - Indigo RC2</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li>
<li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li>
</ul>
</td>
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/parent/pom.xml 2011-07-19 21:34:06 UTC (rev 33058)
@@ -32,7 +32,7 @@
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37RC2-wtp33RC2.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e370-wtp330.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
@@ -43,7 +43,7 @@
<local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
- <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/RC2/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR0/</jboss-requirements-composite-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
@@ -52,7 +52,7 @@
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/3.3.indigo/</jbosstools-nightly>
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
- <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/RC2/</jboss-requirements-composite-extras-mirror>
+ <jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR0/</jboss-requirements-composite-extras-mirror>
</properties>
<build>
Modified: trunk/build/results/buildResults.xsl
===================================================================
--- trunk/build/results/buildResults.xsl 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/results/buildResults.xsl 2011-07-19 21:34:06 UTC (rev 33058)
@@ -238,7 +238,7 @@
<tr>
<td>
<a class="blue"
- href="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/e...">Target Platform Update Zip</a>
+ href="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/e...">Target Platform Update Zip</a>
</td>
</tr>
<tr>
@@ -323,4 +323,4 @@
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/jbds.target 2011-07-19 21:34:06 UTC (rev 33058)
@@ -11,9 +11,9 @@
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
- <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/RC2/"/> -->
- <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/RC2/"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/"/>
+ <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR0/"/> -->
+ <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR0/"/> -->
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/"/>
</source>
<iu id="javax.wsdl" version=""/>
<iu id="org.jdom" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/multiple.target 2011-07-19 21:34:06 UTC (rev 33058)
@@ -15,7 +15,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/"/>
<!-- m2e 1.0 / m2e-wtp 0.13 + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
@@ -230,4 +230,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058)
@@ -29,7 +29,7 @@
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/publish.sh 2011-07-19 21:34:06 UTC (rev 33058)
@@ -4,7 +4,7 @@
# defaults for JBoss Tools
# don't forget to increment these files when moving up a version:
# build.xml, *.target*, publish.sh, target2p2mirror.xml
-targetZipFile=e37RC2-wtp33RC2.target
+targetZipFile=e370-wtp330.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -23,7 +23,7 @@
'-exclude') exclude="$2"; shift 2;;
'-jbt_3.3.indigo')
# defaults for JBT (trunk)
- targetZipFile=e37RC2-wtp33RC2.target
+ targetZipFile=e370-wtp330.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo
@@ -32,7 +32,7 @@
shift 1;;
'-jbt')
# defaults for JBT (stable branch)
- targetZipFile=e37RC2-wtp33RC2.target
+ targetZipFile=e370-wtp330.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -41,7 +41,7 @@
shift 1;;
'-jbds_3.3.indigo')
# defaults for JBDS (trunk)
- targetZipFile=jbds500-e37RC2-wtp33RC2.target
+ targetZipFile=jbds500-e370-wtp330.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo
@@ -50,7 +50,7 @@
shift 1;;
'-jbds')
# defaults for JBDS (stable branch)
- targetZipFile=jbds500-e37RC2-wtp33RC2.target
+ targetZipFile=jbds500-e370-wtp330.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057)
+++ trunk/build/target-platform/target2p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058)
@@ -1,7 +1,7 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <property name="targetFile" value="e37RC2-wtp33RC2.target" />
+ <property name="targetFile" value="e370-wtp330.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
14 years, 8 months
JBoss Tools SVN: r33056 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-07-19 17:22:22 -0400 (Tue, 19 Jul 2011)
New Revision: 33056
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
Log:
JBIDE-9371
https://issues.jboss.org/browse/JBIDE-9371
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-07-19 21:18:42 UTC (rev 33055)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-07-19 21:22:22 UTC (rev 33056)
@@ -167,14 +167,16 @@
public static List<CDICoreNature> getProjects(IProject project) throws CoreException {
List<CDICoreNature> list = new ArrayList<CDICoreNature>();
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
- for (int i = 0; i < es.length; i++) {
- if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
- if(p == null || !p.isAccessible()) continue;
- CDICoreNature sp = CDICorePlugin.getCDI(p, false);
- if(sp != null) list.add(sp);
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(project);
+ if(javaProject != null) {
+ IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
+ for (int i = 0; i < es.length; i++) {
+ if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
+ if(p == null || !p.isAccessible()) continue;
+ CDICoreNature sp = CDICorePlugin.getCDI(p, false);
+ if(sp != null) list.add(sp);
+ }
}
}
return list;
14 years, 8 months
JBoss Tools SVN: r33055 - in trunk/download.jboss.org/jbosstools/updates/indigo/extras: RC2 and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-07-19 17:18:42 -0400 (Tue, 19 Jul 2011)
New Revision: 33055
Added:
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo...
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo...
Log:
revert changes to RC2 and create new SR0 version of the extras site
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr... 2011-07-19 21:17:33 UTC (rev 33054)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr... 2011-07-19 21:18:42 UTC (rev 33055)
@@ -3,10 +3,10 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311107978000'/>
+<property name='p2.timestamp' value='1311110045000'/>
</properties>
<children size='9'>
-<child location='../../../requirements/egit/1.0.0/'/>
+<child location='../../../requirements/egit/0.11/'/>
<child location='../../../requirements/findbugs/1.3.9/'/>
<child location='../../../requirements/jslint/1.5/'/>
<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo... 2011-07-19 21:17:33 UTC (rev 33054)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo... 2011-07-19 21:18:42 UTC (rev 33055)
@@ -3,10 +3,10 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311107988000'/>
+<property name='p2.timestamp' value='1311110057000'/>
</properties>
<children size='9'>
-<child location='../../../requirements/egit/1.0.0/'/>
+<child location='../../../requirements/egit/0.11/'/>
<child location='../../../requirements/findbugs/1.3.9/'/>
<child location='../../../requirements/jslint/1.5/'/>
<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
Copied: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... (from rev 33054, trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... 2011-07-19 21:18:42 UTC (rev 33055)
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1311107978000'/>
+</properties>
+<children size='9'>
+<child location='../../../requirements/egit/1.0.0/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
+<child location='../../../requirements/pmd/3.2.6/'/>
+
+<child location='../../../requirements/springide/2.6.0.201103160035/'/>
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
+</children>
+</repository>
+
Copied: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... (from rev 33054, trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo...)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... 2011-07-19 21:18:42 UTC (rev 33055)
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1311107988000'/>
+</properties>
+<children size='9'>
+<child location='../../../requirements/egit/1.0.0/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
+<child location='../../../requirements/pmd/3.2.6/'/>
+
+<child location='../../../requirements/springide/2.6.0.201103160035/'/>
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
+</children>
+</repository>
+
14 years, 8 months
JBoss Tools SVN: r33054 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/lib.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-07-19 17:17:33 -0400 (Tue, 19 Jul 2011)
New Revision: 33054
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/lib/ClassPathMonitor.java
Log:
JBIDE-9371
https://issues.jboss.org/browse/JBIDE-9371
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/lib/ClassPathMonitor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/lib/ClassPathMonitor.java 2011-07-19 21:16:01 UTC (rev 33053)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/scanner/lib/ClassPathMonitor.java 2011-07-19 21:17:33 UTC (rev 33054)
@@ -152,14 +152,16 @@
public static List<IJSF2Project> getProjects(IProject project) throws CoreException {
List<IJSF2Project> list = new ArrayList<IJSF2Project>();
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
- for (int i = 0; i < es.length; i++) {
- if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
- if(p == null || !p.isAccessible()) continue;
- IJSF2Project sp = JSF2ProjectFactory.getJSF2Project(p, false);
- if(sp != null) list.add(sp);
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(project);
+ if(javaProject != null) {
+ IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
+ for (int i = 0; i < es.length; i++) {
+ if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
+ if(p == null || !p.isAccessible()) continue;
+ IJSF2Project sp = JSF2ProjectFactory.getJSF2Project(p, false);
+ if(sp != null) list.add(sp);
+ }
}
}
return list;
14 years, 8 months
JBoss Tools SVN: r33053 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-07-19 17:16:01 -0400 (Tue, 19 Jul 2011)
New Revision: 33053
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java
Log:
Partial fix for JBIDE-8359 VisualEditor throws exception and stays open for file from project that is being closed
Exception fixed but it editors cannot be closed it this scenario.
It happens because editors saved in editor area from previous session aren't loaded right after eclipse start. Only editor for active tab is loaded.
When project is deleted only active editor is closed all others stay opened with message in editing area that edited resource is not exist.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-07-19 21:01:17 UTC (rev 33052)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-07-19 21:16:01 UTC (rev 33053)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbenchWindow;
@@ -85,33 +86,32 @@
}
public void checkNatures(IProject project) throws CoreException {
- if (project == null) {
- return;
- }
- addProject(project);
- boolean isJSFCheck = true;
- boolean isJSFNaturesCheck = true;
- boolean isKBNaturesCheck = true;
- updateProjectPersistentProperties(project);
- isJSFCheck = Boolean.parseBoolean(project
- .getPersistentProperty(IS_JSF_CHECK_NEED));
- isJSFNaturesCheck = Boolean.parseBoolean(project
- .getPersistentProperty(IS_JSF_NATURES_CHECK_NEED));
- isKBNaturesCheck = Boolean.parseBoolean(project
- .getPersistentProperty(IS_KB_NATURES_CHECK_NEED));
- KbProject.checkKBBuilderInstalled(project);
- String missingNature = checkMissingNatures(project);
- if (missingNature != null) {
- ProjectNaturesInfoDialog dialog = null;
- if (KbProject.NATURE_ID.equals(missingNature) && isKBNaturesCheck) {
- dialog = new KBNaturesInfoDialog(project);
- } else if (WebProject.JSF_NATURE_ID.equals(missingNature)
- && isJSFNaturesCheck && isJSFCheck) {
- dialog = new JSFNaturesInfoDialog(project);
+ if (project != null && project.isAccessible()) {
+ addProject(project);
+ boolean isJSFCheck = true;
+ boolean isJSFNaturesCheck = true;
+ boolean isKBNaturesCheck = true;
+ updateProjectPersistentProperties(project);
+ isJSFCheck = Boolean.parseBoolean(project
+ .getPersistentProperty(IS_JSF_CHECK_NEED));
+ isJSFNaturesCheck = Boolean.parseBoolean(project
+ .getPersistentProperty(IS_JSF_NATURES_CHECK_NEED));
+ isKBNaturesCheck = Boolean.parseBoolean(project
+ .getPersistentProperty(IS_KB_NATURES_CHECK_NEED));
+ KbProject.checkKBBuilderInstalled(project);
+ String missingNature = checkMissingNatures(project);
+ if (missingNature != null) {
+ ProjectNaturesInfoDialog dialog = null;
+ if (KbProject.NATURE_ID.equals(missingNature) && isKBNaturesCheck) {
+ dialog = new KBNaturesInfoDialog(project);
+ } else if (WebProject.JSF_NATURE_ID.equals(missingNature)
+ && isJSFNaturesCheck && isJSFCheck) {
+ dialog = new JSFNaturesInfoDialog(project);
+ }
+ if (dialog != null) {
+ dialog.open();
+ }
}
- if (dialog != null) {
- dialog.open();
- }
}
}
@@ -129,29 +129,22 @@
}
private void handleResourceChangeEvent(IResourceChangeEvent changeEvent) {
- IResourceDelta[] affectedChildren = changeEvent.getDelta()
- .getAffectedChildren();
- if (affectedChildren == null) {
- return;
- }
+ IResourceDelta[] affectedChildren = changeEvent.getDelta().getAffectedChildren();
for (int i = 0; i < affectedChildren.length; i++) {
IResourceDelta resourceDelta = affectedChildren[i];
if (resourceDelta.getResource() instanceof IProject) {
IProject project = (IProject) resourceDelta.getResource();
if (resourceDelta.getKind() == IResourceDelta.ADDED) {
processAddProject(project);
- continue;
- }
- if (resourceDelta.getKind() == IResourceDelta.REMOVED) {
+ } else if (resourceDelta.getKind() == IResourceDelta.REMOVED) {
processRemoveProject(project);
- continue;
+ } else {
+ try {
+ updateProjectJSFPersistents(project);
+ } catch (CoreException e) {
+ ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e);
+ }
}
- try {
- updateProjectJSFPersistents(project);
- } catch (CoreException e) {
- ProblemReportingHelper.reportProblem(
- JspEditorPlugin.PLUGIN_ID, e);
- }
}
}
}
@@ -159,15 +152,9 @@
private void updateProjectPersistentProperties(IProject project)
throws CoreException {
if (project.isAccessible()) {
-// String jsfCheckString = project
-// .getPersistentProperty(IS_JSF_CHECK_NEED);
-// if (jsfCheckString == null) {
- updateProjectJSFPersistents(project);
-// }
+ updateProjectJSFPersistents(project);
if (project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) == null) {
- project
- .setPersistentProperty(IS_JSF_NATURES_CHECK_NEED,
- Boolean.TRUE.toString());
+ project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, Boolean.TRUE.toString());
}
if (project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) == null) {
project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, Boolean.TRUE.toString());
@@ -180,16 +167,13 @@
}
public void addProject(IProject project) {
- if (getProject(project) == null) {
+ if (!projectsCollection.contains(project)) {
projectsCollection.add(project);
}
}
public void dispose() {
- if (partListener != null) {
- partListener = null;
- }
-// ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+ partListener = null;
projectsCollection.clear();
}
@@ -206,19 +190,18 @@
projectsCollection.remove(project);
}
- private void updateProjectJSFPersistents(IProject project)
- throws CoreException {
+ private void updateProjectJSFPersistents(IProject project) throws CoreException {
if (project.isAccessible()) {
+ IJavaElement javaElement = null;
try {
- IJavaElement javaElement = FileUtil.searchForClass(JavaCore
- .create(project), SEARCH_CLASS);
- if (javaElement == null) {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
- } else {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString());
- }
+ javaElement = FileUtil.searchForClass(JavaCore.create(project), SEARCH_CLASS);
} catch (CoreException e) {
+ // ignore
+ }
+ if (javaElement == null) {
project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
+ } else {
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString());
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-07-19 21:01:17 UTC (rev 33052)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2011-07-19 21:16:01 UTC (rev 33053)
@@ -16,6 +16,9 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.Assert;
@@ -41,6 +44,7 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IKeyBindingService;
import org.eclipse.ui.INestableKeyBindingService;
import org.eclipse.ui.IPropertyListener;
@@ -60,6 +64,7 @@
*
*/
public abstract class JSPMultiPageEditorPart extends EditorPart {
+
private static final String COMMAND_NEXT_SUB_TAB = "org.eclipse.ui.navigate.nextSubTab"; //$NON-NLS-1$
private static final String COMMAND_PREVIOUS_SUB_TAB = "org.eclipse.ui.navigate.previousSubTab"; //$NON-NLS-1$
@@ -117,6 +122,7 @@
editorComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
editorComp.setLayout(new FillLayout(SWT.VERTICAL));
editor.createPartControl(editorComp);
+ sourcePart.init(site, input);
}else {
editor.createPartControl(parent2);
}
@@ -281,7 +287,9 @@
protected abstract IEditorSite createSite(IEditorPart editor);
public void dispose() {
- selectionBar.dispose();
+ if(selectionBar!=null) {
+ selectionBar.dispose();
+ }
getSite().setSelectionProvider(null);
for (int i = 0; i < nestedEditors.size(); ++i) {
IEditorPart editor = (IEditorPart) nestedEditors.get(i);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-07-19 21:01:17 UTC (rev 33052)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-07-19 21:16:01 UTC (rev 33053)
@@ -110,7 +110,9 @@
int style) {
super(parent, style);
this.textEditor = textEditor;
- this.textEditor.getTextViewer().addSelectionChangedListener(this);
+ if(this.textEditor.getTextViewer()!= null) {
+ this.textEditor.getTextViewer().addSelectionChangedListener(this);
+ }
ICommandService commandService = (ICommandService) PlatformUI
.getWorkbench().getService(ICommandService.class);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2011-07-19 21:01:17 UTC (rev 33052)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2011-07-19 21:16:01 UTC (rev 33053)
@@ -182,9 +182,9 @@
throws PartInitException {
setSite(site);
setInput(input);
- if (editorSettings == null)
+ if (editorSettings == null) {
editorSettings = EditorSettings.getEditorSetting(this);
- else if (input instanceof FileEditorInput) {
+ } else if (input instanceof FileEditorInput) {
editorSettings.setInput((FileEditorInput) input);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java 2011-07-19 21:01:17 UTC (rev 33052)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java 2011-07-19 21:16:01 UTC (rev 33053)
@@ -59,8 +59,7 @@
* @return
*/
private String replaceEL(String toReplace) {
-
- return ElService.getInstance().replaceElAndResources(this.pageContext, toReplace);
+ return ElService.getInstance().replaceElAndResources(this.pageContext, toReplace);
}
}
14 years, 8 months