JBoss Tools SVN: r19606 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-29 10:05:07 -0500 (Tue, 29 Dec 2009)
New Revision: 19606
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-29 12:44:49 UTC (rev 19605)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-29 15:05:07 UTC (rev 19606)
@@ -40,19 +40,16 @@
* javaProjectName + "/" + fullyQualifiedName entity name -> EntityInfo
* this collection of processed entities
*/
- protected Map<String, EntityInfo> mapCUs_Info;
+ protected Map<String, EntityInfo> mapCUs_Info = new TreeMap<String, EntityInfo>();
/**
* annotation style preference
*/
protected AnnotStyle annotationStylePreference = AnnotStyle.FIELDS;
-
- public AllEntitiesInfoCollector() {
- initCollector();
- }
+
public void initCollector() {
// clear collection
- mapCUs_Info = new TreeMap<String, EntityInfo>();
+ mapCUs_Info.clear();
}
/**
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29 12:44:49 UTC (rev 19605)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29 15:05:07 UTC (rev 19606)
@@ -142,7 +142,7 @@
processor.setEntityInfo(entry.getValue());
cu.accept(processor);
- }
+ }
}
Mappings mappings = config.createMappings();
@@ -210,7 +210,7 @@
}
private PersistentClass getMappedSuperclass(IJavaProject project, Map<String, PersistentClass> persistentClasses, RootClass rootClass) throws JavaModelException{
- IType type = Utils.findType(project, rootClass.getClassName());
+ IType type = Utils.findType(project, rootClass.getClassName());
//TODO not direct superclass?
if (type.getSuperclassName() != null){
String[][] supertypes = type.resolveType(type.getSuperclassName());
@@ -257,13 +257,7 @@
TypeVisitor typeVisitor;
- /**
- * information about all entities
- */
- protected Map<String, EntityInfo> entities;
-
public void setEntities(Map<String, EntityInfo> entities) {
- this.entities = entities;
rootClasses.clear();
Iterator<Map.Entry<String, EntityInfo>> it = entities.entrySet().iterator();
while (it.hasNext()) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 12:44:49 UTC (rev 19605)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 15:05:07 UTC (rev 19606)
@@ -16,6 +16,7 @@
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -362,7 +363,12 @@
collector.collect(icu);
}
collector.resolveRelations();
- project_infos.put(javaProject, collector.getMapCUs_Info().values());
+ Collection<EntityInfo> c = new ArrayList<EntityInfo>();
+ for (Iterator<EntityInfo> i = collector.getMapCUs_Info().values().iterator();
+ i.hasNext();) {
+ c.add(i.next());
+ }
+ project_infos.put(javaProject, c);
}
}
14 years, 3 months
JBoss Tools SVN: r19605 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-29 07:44:49 -0500 (Tue, 29 Dec 2009)
New Revision: 19605
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2009-12-29 10:46:22 UTC (rev 19604)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2009-12-29 12:44:49 UTC (rev 19605)
@@ -149,8 +149,9 @@
// - the bean class of a managed bean is annotated with both
// the @Interceptor and @Decorator stereotypes (3.1)
+ public static final String BOTH_INTERCEPTOR_AND_DECORATOR = INSTANCE.createSeverityOption("bothInterceptorAndDecorator"); //$NON-NLS-1$
// - bean class of a session bean is annotated @Interceptor or @Decorator (3.2)
- public static final String BOTH_INTERCEPTOR_AND_DECORATOR = INSTANCE.createSeverityOption("bothInterceptorAndDecorator"); //$NON-NLS-1$
+ public static final String SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR = INSTANCE.createSeverityOption("sessionBeanAnnotatedInterceptorOrDecorator"); //$NON-NLS-1$
// - interceptor or decorator has a method annotated @Produces (3.3.2)
// - interceptor or decorator has a field annotated @Produces (3.4.2)
public static final String PRODUCER_IN_INTERCEPTOR_OR_DECORATOR = INSTANCE.createSeverityOption("producerInInterceptorOrDecorator"); //$NON-NLS-1$
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2009-12-29 10:46:22 UTC (rev 19604)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2009-12-29 12:44:49 UTC (rev 19605)
@@ -21,6 +21,79 @@
public static String testKey;
+ public static String STEREOTYPE_DECLARES_NON_EMPTY_NAME;
+ public static String RESOURCE_PRODUCER_FIELD_SETS_EL_NAME;
+ public static String PARAM_INJECTION_DECLARES_EMPTY_NAME;
+ public static String INTERCEPTOR_HAS_NAME;
+ public static String DECORATOR_HAS_NAME;
+
+ public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION;
+ public static String PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD;
+ public static String PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE;
+ public static String PRODUCER_FIELD_TYPE_HAS_WILDCARD;
+ public static String PRODUCER_FIELD_TYPE_IS_VARIABLE;
+ public static String PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT;
+ public static String INJECTION_TYPE_IS_VARIABLE;
+ public static String STEREOTYPE_IS_ANNOTATED_TYPED;
+ public static String MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER;
+ public static String MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER;
+
+ public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS;
+ public static String MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE;
+ public static String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE;
+ public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN;
+ public static String ILLEGAL_SCOPE_FOR_SESSION_BEAN;
+ public static String ILLEGAL_SCOPE_FOR_PRODUCER_METHOD;
+ public static String ILLEGAL_SCOPE_FOR_PRODUCER_FIELD;
+ public static String ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED;
+ public static String ILLEGAL_SCOPE_FOR_INTERCEPTOR;
+ public static String ILLEGAL_SCOPE_FOR_DECORATOR;
+
+ public static String PRODUCER_ANNOTATED_INJECT;
+ public static String PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED;
+ public static String OBSERVER_ANNOTATED_INJECT;
+ public static String OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED;
+ public static String ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN;
+ public static String MULTIPLE_DISPOSING_PARAMETERS;
+ public static String DISPOSER_ANNOTATED_INJECT;
+ public static String ILLEGAL_DISPOSER_IN_SESSION_BEAN;
+ public static String NO_PRODUCER_MATCHING_DISPOSER;
+ public static String MULTIPLE_DISPOSERS_FOR_PRODUCER;
+ public static String ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN;
+ public static String MULTIPLE_INJECTION_CONSTRUCTORS;
+ public static String CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED;
+ public static String GENERIC_METHOD_ANNOTATED_INJECT;
+ public static String MULTIPLE_OBSERVING_PARAMETERS;
+ public static String ILLEGAL_OBSERVER_IN_SESSION_BEAN;
+ public static String ILLEGAL_CONDITIONAL_OBSERVER;
+
+ public static String BOTH_INTERCEPTOR_AND_DECORATOR;
+ public static String PRODUCER_IN_INTERCEPTOR_OR_DECORATOR;
+ public static String DISPOSER_IN_INTERCEPTOR_OR_DECORATOR;
+ public static String MULTIPLE_DELEGATE;
+ public static String MISSING_DELEGATE;
+ public static String ILLEGAL_INJECTION_POINT_DELEGATE;
+ public static String ILLEGAL_BEAN_DECLARING_DELEGATE;
+ public static String DELEGATE_HAS_ILLEGAL_TYPE;
+ public static String ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING;
+ public static String ILLEGAL_INTERCEPTOR_BINDING_METHOD;
+ public static String CONFLICTING_INTERCEPTOR_BINDINGS;
+ public static String OBSERVER_IN_INTERCEPTOR_OR_DECORATOR;
+ public static String INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE;
+ public static String MISSING_INTERCEPTOR_BINDING;
+
+ public static String ILLEGAL_SPECIALIZING_MANAGED_BEAN;
+ public static String ILLEGAL_SPECIALIZING_SESSION_BEAN;
+ public static String ILLEGAL_SPECIALIZING_PRODUCER;
+ public static String MISSING_TYPE_IN_SPECIALIZING_BEAN;
+ public static String CONFLICTING_NAME_IN_SPECIALIZING_BEAN;
+ public static String INTERCEPTOR_ANNOTATED_SPECIALIZES;
+ public static String DECORATOR_ANNOTATED_SPECIALIZES;
+
+ public static String ILLEGAL_INJECTING_USERTRANSACTION_TYPE;
+ public static String ILLEGAL_INJECTING_INJECTIONPOINT_TYPE;
+ public static String ILLEGAL_QUALIFIER_IN_STEREOTYPE;
+
static {
NLS.initializeMessages(BUNDLE_NAME, CDIValidationMessages.class);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2009-12-29 10:46:22 UTC (rev 19604)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2009-12-29 12:44:49 UTC (rev 19605)
@@ -1 +1,75 @@
-testKey=Test Key
\ No newline at end of file
+testKey=Test Key
+
+STEREOTYPE_DECLARES_NON_EMPTY_NAME=Stereotype declares a non-empty @Named annotation
+RESOURCE_PRODUCER_FIELD_SETS_EL_NAME=Producer field declaration of Java EE resource specifies an EL name
+PARAM_INJECTION_DECLARES_EMPTY_NAME=Injection point other than injected field declares a @Named annotation that does not specify the value member
+INTERCEPTOR_HAS_NAME=Interceptor has a name
+DECORATOR_HAS_NAME=Decorator has a name
+
+ILLEGAL_TYPE_IN_TYPED_DECLARATION=Bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean
+PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD=Producer method return type contains a wildcard type parameter
+PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE=Producer method return type is a type variable
+PRODUCER_FIELD_TYPE_HAS_WILDCARD=Producer field type contains a wildcard type parameter
+PRODUCER_FIELD_TYPE_IS_VARIABLE=Producer field type is a type variable
+PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT=Matching object in the Java EE component environment is not of the same type as the producer field declaration
+INJECTION_TYPE_IS_VARIABLE=Injection point type is a type variable
+STEREOTYPE_IS_ANNOTATED_TYPED=Stereotype is annotated @Typed
+MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER=Array-valued or annotation-valued member of a qualifier type is not annotated @Nonbinding
+MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding
+
+MULTIPLE_SCOPE_TYPE_ANNOTATIONS=Bean class or producer method or field specifies multiple scope type annotations
+MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE=Bean does not explicitly declare a scope when there is no default scope
+STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE=Stereotype declares more than one scope
+ILLEGAL_SCOPE_FOR_MANAGED_BEAN=Managed bean with a public field or a parameterized bean class declares any scope other than @Dependent
+ILLEGAL_SCOPE_FOR_SESSION_BEAN=Session bean specifies an illegal scope (a stateless session bean must belong to the @Dependent pseudo-scope; a singleton bean must belong to either the @ApplicationScoped scope or to the @Dependent pseudo-scope, a stateful session bean may have any scope)
+ILLEGAL_SCOPE_FOR_PRODUCER_METHOD=Producer method with a parameterized return type with a type variable declares any scope other than @Dependent
+ILLEGAL_SCOPE_FOR_PRODUCER_FIELD=Producer field with a parameterized type with a type variable declares any scope other than @Dependent
+ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED=Bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default
+ILLEGAL_SCOPE_FOR_INTERCEPTOR=Interceptor has any scope other than @Dependent
+ILLEGAL_SCOPE_FOR_DECORATOR=Decorator has any scope other than @Dependent
+
+PRODUCER_ANNOTATED_INJECT=Producer method or field is annotated @Inject
+PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED=Producer method has a parameter annotated @Disposes or @Observes
+OBSERVER_ANNOTATED_INJECT=Observer method is annotated @Inject
+OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED=observer method has a parameter annotated @Disposes
+ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN=Non-static method of a session bean class is annotated @Produces, and the method is not a business method of the session bean
+MULTIPLE_DISPOSING_PARAMETERS=Method has more than one parameter annotated @Disposes
+DISPOSER_ANNOTATED_INJECT=Disposer method is annotated @Inject
+ILLEGAL_DISPOSER_IN_SESSION_BEAN=Non-static method of a session bean class has a parameter annotated @Disposes, and the method is not a business method of the session bean
+NO_PRODUCER_MATCHING_DISPOSER=There is no producer method declared by the (same) bean class that is assignable to the disposed parameter of a disposer method
+MULTIPLE_DISPOSERS_FOR_PRODUCER=There are multiple disposer methods for a single producer method
+ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN=Non-static field of a session bean class is annotated @Produces
+MULTIPLE_INJECTION_CONSTRUCTORS=Bean class has more than one constructor annotated @Inject
+CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED=Bean constructor has a parameter annotated @Disposes, or @Observes
+GENERIC_METHOD_ANNOTATED_INJECT=Generic method of a bean is annotated @Inject
+MULTIPLE_OBSERVING_PARAMETERS=Method has more than one parameter annotated @Observes
+ILLEGAL_OBSERVER_IN_SESSION_BEAN=Non-static method of a session bean class has a parameter annotated @Observes, and the method is not a business method of the EJB
+ILLEGAL_CONDITIONAL_OBSERVER=Bean with scope @Dependent has an observer method declared receive=IF_EXISTS
+
+BOTH_INTERCEPTOR_AND_DECORATOR=the bean class of a managed bean is annotated with both the @Interceptor and @Decorator stereotypes
+SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR=Bean class of a session bean is annotated @Interceptor or @Decorator
+PRODUCER_IN_INTERCEPTOR_OR_DECORATOR=Interceptor or decorator has a member annotated @Produces
+DISPOSER_IN_INTERCEPTOR_OR_DECORATOR=Interceptor or decorator has a method annotated @Disposes
+MULTIPLE_DELEGATE=Decorator has more than one delegate injection point
+MISSING_DELEGATE=Decorator does not have a delegate injection point
+ILLEGAL_INJECTION_POINT_DELEGATE=Injection point that is not an injected field, initializer method parameter or bean constructor method parameter is annotated @Delegate
+ILLEGAL_BEAN_DECLARING_DELEGATE=Bean class that is not a decorator has an injection point annotated @Delegate
+DELEGATE_HAS_ILLEGAL_TYPE=Delegate type does not implement or extend a decorated type of the decorator, or specifies different type parameters
+ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING=Interceptor for lifecycle callbacks declares an interceptor binding type that is defined @Target({TYPE, METHOD})
+ILLEGAL_INTERCEPTOR_BINDING_METHOD=Non-static, non-private, final method of a managed bean has a interceptor binding (either method level, or declaring class level)
+CONFLICTING_INTERCEPTOR_BINDINGS=The set of interceptor bindings of a bean or interceptor, including bindings inherited from stereotypes and other interceptor bindings, has two instances of a certain interceptor binding type and the instances have different values of some annotation member
+OBSERVER_IN_INTERCEPTOR_OR_DECORATOR=Interceptor or decorator has a method with a parameter annotated @Observes
+INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE=Interceptor or decorator is an alternative
+MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor does not declare any interceptor binding
+
+ILLEGAL_SPECIALIZING_MANAGED_BEAN=Managed bean class annotated @Specializes does not directly extend the bean class of another managed bean
+ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes does not directly extend the bean class of another session bean
+ILLEGAL_SPECIALIZING_PRODUCER=Method annotated @Specializes is static or does not directly override another producer method
+MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean X specializes Y but does not have some bean type of Y
+CONFLICTING_NAME_IN_SPECIALIZING_BEAN=Bean X specializes Y and Y has a name and X declares a name explicitly, using @Named
+INTERCEPTOR_ANNOTATED_SPECIALIZES=Interceptor is annotated @Specializes
+DECORATOR_ANNOTATED_SPECIALIZES=Decorator is annotated @Specializes
+
+ILLEGAL_INJECTING_USERTRANSACTION_TYPE=Java EE component class has an injection point of type UserTransaction and qualifier @Default, and may not validly make use of the JTA UserTransaction according to the Java EE platform specification
+ILLEGAL_INJECTING_INJECTIONPOINT_TYPE=Java EE component class supporting injection that is not a bean has an injection point of type InjectionPoint and qualifier @Default
+ILLEGAL_QUALIFIER_IN_STEREOTYPE=Stereotype declares any qualifier annotation other than @Named
14 years, 3 months
JBoss Tools SVN: r19604 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-29 05:46:22 -0500 (Tue, 29 Dec 2009)
New Revision: 19604
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 10:39:57 UTC (rev 19603)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 10:46:22 UTC (rev 19604)
@@ -191,12 +191,12 @@
try {
types = cu.getTypes();
//remove java extension.
- String typeName = cu.getElementName().substring(0, cu.getElementName().length() - 5);
+ //String typeName = cu.getElementName().substring(0, cu.getElementName().length() - 5);
for (int j = 0; j < types.length; j++) {
- if (types[j].getElementName().equals(typeName)){
+ //if (types[j].getElementName().equals(typeName)){
filteredElements.add(types[j]);
- break;
- }
+ // break;
+ //}
}
} catch (JavaModelException e) {
e.printStackTrace();
14 years, 3 months
JBoss Tools SVN: r19603 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-29 05:39:57 -0500 (Tue, 29 Dec 2009)
New Revision: 19603
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29 10:30:22 UTC (rev 19602)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29 10:39:57 UTC (rev 19603)
@@ -137,10 +137,12 @@
for (Entry<String, EntityInfo> entry : entities.entrySet()) {
String fullyQualifiedName = entry.getValue().getFullyQualifiedName();
ICompilationUnit icu = Utils.findCompilationUnit(project, fullyQualifiedName);
- CompilationUnit cu = Utils.getCompilationUnit(icu, true);
-
- processor.setEntityInfo(entry.getValue());
- cu.accept(processor);
+ if (icu != null){
+ CompilationUnit cu = Utils.getCompilationUnit(icu, true);
+
+ processor.setEntityInfo(entry.getValue());
+ cu.accept(processor);
+ }
}
Mappings mappings = config.createMappings();
14 years, 3 months
JBoss Tools SVN: r19602 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-29 05:30:22 -0500 (Tue, 29 Dec 2009)
New Revision: 19602
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 10:19:29 UTC (rev 19601)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 10:30:22 UTC (rev 19602)
@@ -342,7 +342,7 @@
//separate by parent project
while (it.hasNext()) {
ICompilationUnit cu = it.next();
- Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject().getElementName());
+ Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject());
if (set == null) {
set = new HashSet<ICompilationUnit>();
mapJP_CUSet.put(cu.getJavaProject(), set);
14 years, 3 months
JBoss Tools SVN: r19601 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-12-29 05:19:29 -0500 (Tue, 29 Dec 2009)
New Revision: 19601
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5330
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-28 17:16:02 UTC (rev 19600)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-12-29 10:19:29 UTC (rev 19601)
@@ -40,15 +40,19 @@
* javaProjectName + "/" + fullyQualifiedName entity name -> EntityInfo
* this collection of processed entities
*/
- protected Map<String, EntityInfo> mapCUs_Info = new TreeMap<String, EntityInfo>();
+ protected Map<String, EntityInfo> mapCUs_Info;
/**
* annotation style preference
*/
protected AnnotStyle annotationStylePreference = AnnotStyle.FIELDS;
+
+ public AllEntitiesInfoCollector() {
+ initCollector();
+ }
public void initCollector() {
// clear collection
- mapCUs_Info.clear();
+ mapCUs_Info = new TreeMap<String, EntityInfo>();
}
/**
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-28 17:16:02 UTC (rev 19600)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-12-29 10:19:29 UTC (rev 19601)
@@ -135,7 +135,7 @@
processor.setEntities(entities);
for (Entry<String, EntityInfo> entry : entities.entrySet()) {
- String fullyQualifiedName = entry.getKey();
+ String fullyQualifiedName = entry.getValue().getFullyQualifiedName();
ICompilationUnit icu = Utils.findCompilationUnit(project, fullyQualifiedName);
CompilationUnit cu = Utils.getCompilationUnit(icu, true);
@@ -276,7 +276,7 @@
rootClass.setLazy(true);
rootClass.setTable(table);
rootClass.setAbstract(entryInfo.isAbstractFlag());//abstract or interface
- rootClasses.put(entry.getKey(), rootClass);
+ rootClasses.put(entryInfo.getFullyQualifiedName(), rootClass);
}
typeVisitor = new TypeVisitor(rootClasses);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-12-28 17:16:02 UTC (rev 19600)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-12-29 10:19:29 UTC (rev 19601)
@@ -185,6 +185,12 @@
this.project = iProject;
}
+ @Override
+ public String toString() {
+ return "TableLine [className=" + className + ", projectName=" //$NON-NLS-1$ //$NON-NLS-2$
+ + projectName + "]"; //$NON-NLS-1$
+ }
+
}
private enum Columns {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-28 17:16:02 UTC (rev 19600)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2009-12-29 10:19:29 UTC (rev 19601)
@@ -26,13 +26,10 @@
import java.util.Map.Entry;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
@@ -246,17 +243,21 @@
try {
- IResource container = entry.getKey().getPackageFragmentRoots().length > 0
+ /* IResource container = entry.getKey().getPackageFragmentRoots().length > 0
? entry.getKey().getPackageFragmentRoots()[0].getResource()
: entry.getKey().getResource();
- IPath temp_path = entry.getKey().getProject().getLocation()
- .append(".settings").append("org.hibernate_tools.temp");
+ IPath temp_path = entry.getKey().getProject().getLocation().append(".settings").append("org.hibernate_tools.temp");
IFolder temp_folder = entry.getKey().getProject().getFolder(new Path(".settings/org.hibernate_tools.temp"));
+ */
+ IResource container = entry.getKey().getPackageFragmentRoots().length > 0
+ ? entry.getKey().getPackageFragmentRoots()[0].getResource()
+ : entry.getKey().getResource();
+
HibernateMappingExporter hce = new HibernateMappingExporter(config,
- temp_folder.getLocation().toFile());
+ container.getLocation().toFile());
hce.setGlobalSettings(hmgs);
//hce.setForEach("entity");
@@ -341,7 +342,7 @@
//separate by parent project
while (it.hasNext()) {
ICompilationUnit cu = it.next();
- Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject());
+ Set<ICompilationUnit> set = mapJP_CUSet.get(cu.getJavaProject().getElementName());
if (set == null) {
set = new HashSet<ICompilationUnit>();
mapJP_CUSet.put(cu.getJavaProject(), set);
14 years, 3 months
JBoss Tools SVN: r19600 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-28 12:16:02 -0500 (Mon, 28 Dec 2009)
New Revision: 19600
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2009-12-28 17:15:26 UTC (rev 19599)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2009-12-28 17:16:02 UTC (rev 19600)
@@ -35,8 +35,74 @@
CDICorePlugin.PLUGIN_ID
);
+ private static SectionDescription SECTION_NAME = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_name,
+ new String[][]{
+ {CDIPreferences.STEREOTYPE_DECLARES_NON_EMPTY_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_label},
+ {CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label},
+ {CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_paramInjectionDeclaresEmptyName_label},
+ {CDIPreferences.INTERCEPTOR_HAS_NAME, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorHasName_label},
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_TYPE = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_type,
+ new String[][]{
+ {CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label},
+ {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label},
+ {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label},
+ {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label},
+ {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label},
+ {CDIPreferences.PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeDoesNotMatchJavaEeObject_label},
+ {CDIPreferences.INJECTION_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_injectionTypeIsVariable_label},
+ {CDIPreferences.STEREOTYPE_IS_ANNOTATED_TYPED, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_stereotypeIsAnnotatedTyped_label},
+ {CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingNonbindingInQualifierTypeMember_label},
+ {CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingNonbindingInInterceptorBindingTypeMember_label},
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_SCOPE = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_scope,
+ new String[][]{
+// {CDIPreferences., CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_}
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_MEMBER = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_member,
+ new String[][]{
+ {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_INTERCEPTOR = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_interceptor_and_decorator,
+ new String[][]{
+ {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_MISCELLANEOUS = new SectionDescription(
+ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_miscellaneous,
+ new String[][]{
+ {CDIPreferences.TEST, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_test_label}
+ },
+ CDICorePlugin.PLUGIN_ID
+ );
+
private static SectionDescription[] ALL_SECTIONS = new SectionDescription[]{
- SECTION_TEST
+ SECTION_TEST,
+ SECTION_NAME,
+ SECTION_TYPE,
+ SECTION_SCOPE,
+ SECTION_MEMBER,
+ SECTION_INTERCEPTOR,
+ SECTION_MISCELLANEOUS
};
private static Key[] getKeys() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2009-12-28 17:15:26 UTC (rev 19599)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2009-12-28 17:16:02 UTC (rev 19600)
@@ -32,6 +32,94 @@
public static String CDIValidatorConfigurationBlock_section_test;
public static String CDIValidatorConfigurationBlock_pb_test_label;
+ // Section Name
+ public static String CDIValidatorConfigurationBlock_section_name;
+ public static String CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_label;
+ public static String CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label;
+ public static String CDIValidatorConfigurationBlock_pb_paramInjectionDeclaresEmptyName_label;
+ public static String CDIValidatorConfigurationBlock_pb_interceptorHasName_label;
+ public static String CDIValidatorConfigurationBlock_pb_decoratorHasName_label;
+
+ // Section Type
+ public static String CDIValidatorConfigurationBlock_section_type;
+ public static String CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeDoesNotMatchJavaEeObject_label;
+ public static String CDIValidatorConfigurationBlock_pb_injectionTypeIsVariable_label;
+ public static String CDIValidatorConfigurationBlock_pb_stereotypeIsAnnotatedTyped_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingNonbindingInQualifierTypeMember_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingNonbindingInInterceptorBindingTypeMember_label;
+
+ // Scope
+ public static String CDIValidatorConfigurationBlock_section_scope;
+ public static String CDIValidatorConfigurationBlock_pb_multipleScopeTypeAnnotations_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDefaultScope_label;
+ public static String CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneScope_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label;
+
+ // Member
+ public static String CDIValidatorConfigurationBlock_section_member;
+ public static String CDIValidatorConfigurationBlock_pb_producerAnnotatedInject_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotated_label;
+ public static String CDIValidatorConfigurationBlock_pb_observerAnnotatedInject_label;
+ public static String CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotated_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_multipleDisposingParameters_label;
+ public static String CDIValidatorConfigurationBlock_pb_disposerAnnotatedInject_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label;
+ public static String CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label;
+ public static String CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label;
+ public static String CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label;
+ public static String CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label;
+
+ // Interceptor & Decorator
+ public static String CDIValidatorConfigurationBlock_section_interceptor_and_decorator;
+ public static String CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label;
+ public static String CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label;
+ public static String CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label;
+ public static String CDIValidatorConfigurationBlock_pb_multipleDelegate_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingDelegate_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalInjectionPointDelegate_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalBeanDeclaringDelegate_label;
+ public static String CDIValidatorConfigurationBlock_pb_delegateHasIllegalType_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalLifecycleCallbackInterceptorBinding_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_label;
+ public static String CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label;
+ public static String CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label;
+ public static String CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label;
+
+ // Specializing
+ public static String CDIValidatorConfigurationBlock_section_specializing;
+ public static String CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label;
+ public static String CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label;
+ public static String CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label;
+
+ // Miscellaneous
+ public static String CDIValidatorConfigurationBlock_section_miscellaneous;
+ public static String CDIValidatorConfigurationBlock_pb_illegalInjectingUserTransactionType_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalInjectingInjectionPointType_label;
+ public static String CDIValidatorConfigurationBlock_pb_illegalQualifierInStereotype_label;
+
+
public static String CDI_VALIDATOR_PREFERENCE_PAGE_CDI_VALIDATOR;
static {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2009-12-28 17:15:26 UTC (rev 19599)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2009-12-28 17:16:02 UTC (rev 19600)
@@ -21,4 +21,92 @@
CDIValidatorConfigurationBlock_section_test=Test
CDIValidatorConfigurationBlock_pb_test_label=Test:
-CDI_VALIDATOR_PREFERENCE_PAGE_CDI_VALIDATOR=CDI Validator
\ No newline at end of file
+##Section Name
+CDIValidatorConfigurationBlock_section_name=Name
+CDIValidatorConfigurationBlock_pb_stereotypeDeclaresNonEmptyName_label=Stereotype has non-empty name:
+CDIValidatorConfigurationBlock_pb_resourceProducerFieldSetsElName_label=Producer field sets EL name:
+CDIValidatorConfigurationBlock_pb_paramInjectionDeclaresEmptyName_label=Empty name at parameter injection:
+CDIValidatorConfigurationBlock_pb_interceptorHasName_label=Interceptor declares name:
+CDIValidatorConfigurationBlock_pb_decoratorHasName_label=Decorator declares name:
+
+##Section Type
+CDIValidatorConfigurationBlock_section_type=Type
+CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label=Illegal type in @Typed:
+CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label=Wildcard in producer method return type:
+CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label=Variable in producer method return type:
+CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label=Wildcard in producer field type:
+CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label=Variable in producer field type:
+CDIValidatorConfigurationBlock_pb_producerFieldTypeDoesNotMatchJavaEeObject_label=Producer field type conflicts Java EE object:
+CDIValidatorConfigurationBlock_pb_injectionTypeIsVariable_label=Injection type is variable:
+CDIValidatorConfigurationBlock_pb_stereotypeIsAnnotatedTyped_label=Stereotype has @Typed:
+CDIValidatorConfigurationBlock_pb_missingNonbindingInQualifierTypeMember_label=Missing @Nonbinding in qualifier type member:
+CDIValidatorConfigurationBlock_pb_missingNonbindingInInterceptorBindingTypeMember_label=Missing @Nonbinding in interceptor binding type member:
+
+##Scope
+CDIValidatorConfigurationBlock_section_scope=Scope
+CDIValidatorConfigurationBlock_pb_multipleScopeTypeAnnotations_label=Multiple scope annotations:
+CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDefaultScope_label=
+CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneScope_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label=
+CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label=
+
+##Member
+CDIValidatorConfigurationBlock_section_member=Members
+CDIValidatorConfigurationBlock_pb_producerAnnotatedInject_label=
+CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotated_label=
+CDIValidatorConfigurationBlock_pb_observerAnnotatedInject_label=
+CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotated_label=
+CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBean_label=
+CDIValidatorConfigurationBlock_pb_multipleDisposingParameters_label=
+CDIValidatorConfigurationBlock_pb_disposerAnnotatedInject_label=
+CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label=
+CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label=
+CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label=
+CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label=
+CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label=
+CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label=
+CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=
+CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label=
+CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label=
+CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label=
+
+##Interceptor & Decorator
+CDIValidatorConfigurationBlock_section_interceptor_and_decorator=Interceptors & Decorators
+CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label=
+CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label=
+CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label=
+CDIValidatorConfigurationBlock_pb_multipleDelegate_label=
+CDIValidatorConfigurationBlock_pb_missingDelegate_label=
+CDIValidatorConfigurationBlock_pb_illegalInjectionPointDelegate_label=
+CDIValidatorConfigurationBlock_pb_illegalBeanDeclaringDelegate_label=
+CDIValidatorConfigurationBlock_pb_delegateHasIllegalType_label=
+CDIValidatorConfigurationBlock_pb_illegalLifecycleCallbackInterceptorBinding_label=
+CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_label=
+CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label=
+CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label=
+CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label=
+CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label=
+
+##Specializing
+CDIValidatorConfigurationBlock_section_specializing=Specializing
+CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label=
+CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label=
+CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label=
+CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label=
+CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label=
+CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label=
+CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label=
+
+##Miscellaneous
+CDIValidatorConfigurationBlock_section_miscellaneous=Miscellaneous
+CDIValidatorConfigurationBlock_pb_illegalInjectingUserTransactionType_label=
+CDIValidatorConfigurationBlock_pb_illegalInjectingInjectionPointType_label=
+CDIValidatorConfigurationBlock_pb_illegalQualifierInStereotype_label=
+
+
+CDI_VALIDATOR_PREFERENCE_PAGE_CDI_VALIDATOR=CDI Validator
14 years, 3 months
JBoss Tools SVN: r19599 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-28 12:15:26 -0500 (Mon, 28 Dec 2009)
New Revision: 19599
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2009-12-28 16:58:05 UTC (rev 19598)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2009-12-28 17:15:26 UTC (rev 19599)
@@ -30,7 +30,196 @@
// Test
public static final String TEST = INSTANCE.createSeverityOption("testKey"); //$NON-NLS-1$
+ //Name group
+
+// - stereotype declares a non-empty @Named annotation (2.7.1.3)
+ public static final String STEREOTYPE_DECLARES_NON_EMPTY_NAME = INSTANCE.createSeverityOption("stereotypeDeclaresNonEmptyName"); //$NON-NLS-1$
+// - producer field declaration specifies an EL name (together with one of
+// @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) (3.5.1)
+ public static final String RESOURCE_PRODUCER_FIELD_SETS_EL_NAME = INSTANCE.createSeverityOption("resourceProducerFieldSetsElName"); //$NON-NLS-1$
+// - injection point other than injected field declares a @Named annotation that
+// does not specify the value member
+ public static final String PARAM_INJECTION_DECLARES_EMPTY_NAME = INSTANCE.createSeverityOption("paramInjectionDeclaresEmptyName"); //$NON-NLS-1$
+// - interceptor or decorator has a name (2.5.3 non-portable)
+ public static final String INTERCEPTOR_HAS_NAME = INSTANCE.createSeverityOption("interceptorHasName"); //$NON-NLS-1$
+ public static final String DECORATOR_HAS_NAME = INSTANCE.createSeverityOption("decoratorHasName"); //$NON-NLS-1$
+ //Type group
+
+// - bean class or producer method or field specifies a @Typed annotation,
+// and the value member specifies a class which does not correspond to a type
+// in the unrestricted set of bean types of a bean (2.2.2)
+ public static final String ILLEGAL_TYPE_IN_TYPED_DECLARATION = INSTANCE.createSeverityOption("illegalTypeInTypedDeclaration"); //$NON-NLS-1$
+// - producer method return type contains a wildcard type parameter (3.3)
+ public static final String PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD = INSTANCE.createSeverityOption("producerMethodReturnTypeHasWildcard"); //$NON-NLS-1$
+// - producer method return type is a type variable (3.3)
+ public static final String PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE = INSTANCE.createSeverityOption("producerMethodReturnTypeIsVariable"); //$NON-NLS-1$
+// - producer field type contains a wildcard type parameter (3.4)
+ public static final String PRODUCER_FIELD_TYPE_HAS_WILDCARD = INSTANCE.createSeverityOption("producerFieldTypeHasWildcard"); //$NON-NLS-1$
+// - producer field type is a type variable
+ public static final String PRODUCER_FIELD_TYPE_IS_VARIABLE = INSTANCE.createSeverityOption("producerFieldTypeIsVariable"); //$NON-NLS-1$
+// - matching object in the Java EE component environment is not of the same type
+// as the producer field declaration (3.5.1)
+ public static final String PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT = INSTANCE.createSeverityOption("producerFieldTypeDoesNotMatchJavaEeObject"); //$NON-NLS-1$
+// - injection point type is a type variable (5.2.2)
+ public static final String INJECTION_TYPE_IS_VARIABLE = INSTANCE.createSeverityOption("injectionTypeIsVariable"); //$NON-NLS-1$
+// - stereotype is annotated @Typed (2.7.1.3 non-portable)
+ public static final String STEREOTYPE_IS_ANNOTATED_TYPED = INSTANCE.createSeverityOption("stereotypeIsAnnotatedTyped"); //$NON-NLS-1$
+// - array-valued or annotation-valued member of a qualifier type is not annotated @Nonbinding (5.2.5 non-portable)
+ public static final String MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER = INSTANCE.createSeverityOption("missingNonbindingInQualifierTypeMember"); //$NON-NLS-1$
+// - array-valued or annotation-valued member of an interceptor binding type
+// is not annotated @Nonbinding (9.5.2 non-portable)
+ public static final String MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER = INSTANCE.createSeverityOption("missingNonbindingInInterceptorBindingTypeMember"); //$NON-NLS-1$
+
+ //Scope group
+
+// - bean class or producer method or field specifies multiple scope type annotations (2.4.3)
+ public static final String MULTIPLE_SCOPE_TYPE_ANNOTATIONS = INSTANCE.createSeverityOption("multipleScopeTypeAnnotations"); //$NON-NLS-1$
+// - bean does not explicitly declare a scope when there is no default scope
+// (there are two different stereotypes declared by the bean that declare different default scopes) (2.4.4)
+ public static final String MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE = INSTANCE.createSeverityOption("missingScopeWhenThereIsNoDefaultScope"); //$NON-NLS-1$
+// - stereotype declares more than one scope (2.7.1.1)
+ public static final String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE = INSTANCE.createSeverityOption("stereotypeDeclaresMoreThanOneScope"); //$NON-NLS-1$
+// - managed bean with a public field declares any scope other than @Dependent (3.1)
+// - managed bean with a parameterized bean class declares any scope other than @Dependent (3.1)
+ public static final String ILLEGAL_SCOPE_FOR_MANAGED_BEAN = INSTANCE.createSeverityOption("illegalScopeForManagedBean"); //$NON-NLS-1$
+// - session bean specifies an illegal scope (a stateless session bean must belong
+// to the @Dependent pseudo-scope; a singleton bean must belong to either the
+// @ApplicationScoped scope or to the @Dependent pseudo-scope, a stateful session
+// bean may have any scope) (3.2)
+// - session bean with a parameterized bean class declares any scope other than @Dependent (3.2)
+ public static final String ILLEGAL_SCOPE_FOR_SESSION_BEAN = INSTANCE.createSeverityOption("illegalScopeForSessionBean"); //$NON-NLS-1$
+// - producer method with a parameterized return type with a type variable declares
+// any scope other than @Dependent (3.3)
+ public static final String ILLEGAL_SCOPE_FOR_PRODUCER_METHOD = INSTANCE.createSeverityOption("illegalScopeForProducerMethod"); //$NON-NLS-1$
+// - producer field with a parameterized type with a type variable declares any
+// scope other than @Dependent (3.4)
+ public static final String ILLEGAL_SCOPE_FOR_PRODUCER_FIELD = INSTANCE.createSeverityOption("illegalScopeForProducerField"); //$NON-NLS-1$
+// - bean that declares any scope other than @Dependent has an injection point of type
+// InjectionPoint and qualifier @Default (5.5.7)
+ public static final String ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED = INSTANCE.createSeverityOption("illegalScopeWhenTypeInjectionPointIsInjected"); //$NON-NLS-1$
+// - interceptor or decorator has any scope other than @Dependent (2.4.1 non-portable)
+ public static final String ILLEGAL_SCOPE_FOR_INTERCEPTOR = INSTANCE.createSeverityOption("illegalScopeForInterceptor"); //$NON-NLS-1$
+ public static final String ILLEGAL_SCOPE_FOR_DECORATOR = INSTANCE.createSeverityOption("illegalScopeForDecorator"); //$NON-NLS-1$
+
+ //Member group
+
+// - producer method is annotated @Inject (3.3.2)
+// - producer field is annotated @Inject (3.4.2) = - injected field is annotated @Produces (3.8.1)
+ public static final String PRODUCER_ANNOTATED_INJECT = INSTANCE.createSeverityOption("producerAnnotatedInject"); //$NON-NLS-1$
+// - producer method has a parameter annotated @Disposes or @Observes (3.3.2)
+ public static final String PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED = INSTANCE.createSeverityOption("producerParameterIllegallyAnnotated"); //$NON-NLS-1$
+// - observer method is annotated [@Produces or] @Inject (10.4.2)
+ public static final String OBSERVER_ANNOTATED_INJECT = INSTANCE.createSeverityOption("observerAnnotatedInject"); //$NON-NLS-1$
+// - has a parameter annotated @Disposes (10.4.2)
+ public static final String OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED = INSTANCE.createSeverityOption("observerParameterIllegallyAnnotated"); //$NON-NLS-1$
+// - non-static method of a session bean class is annotated @Produces, and the method
+// is not a business method of the session bean (3.3.2)
+ public static final String ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN = INSTANCE.createSeverityOption("illegalProducerMethodInSessionBean"); //$NON-NLS-1$
+// - method has more than one parameter annotated @Disposes (3.3.6)
+ public static final String MULTIPLE_DISPOSING_PARAMETERS = INSTANCE.createSeverityOption("multipleDisposingParameters"); //$NON-NLS-1$
+// - disposer method is annotated [@Produces or] @Inject [or has a parameter annotated @Observes] (3.3.6)
+ public static final String DISPOSER_ANNOTATED_INJECT = INSTANCE.createSeverityOption("disposerAnnotatedInject"); //$NON-NLS-1$
+// - non-static method of a session bean class has a parameter annotated @Disposes, and
+// the method is not a business method of the session bean (3.3.6)
+ public static final String ILLEGAL_DISPOSER_IN_SESSION_BEAN = INSTANCE.createSeverityOption("illegalDisposerInSessionBean"); //$NON-NLS-1$
+// - there is no producer method declared by the (same) bean class that is assignable
+// to the disposed parameter of a disposer method (3.3.7)
+ public static final String NO_PRODUCER_MATCHING_DISPOSER = INSTANCE.createSeverityOption("noProducerMatchingDisposer"); //$NON-NLS-1$
+// - there are multiple disposer methods for a single producer method (3.3.7)
+ public static final String MULTIPLE_DISPOSERS_FOR_PRODUCER = INSTANCE.createSeverityOption("multipleDisposersForProducer"); //$NON-NLS-1$
+// - non-static field of a session bean class is annotated @Produces (3.4.2)
+ public static final String ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN = INSTANCE.createSeverityOption("illegalProducerFieldInSessionBean"); //$NON-NLS-1$
+// - bean class has more than one constructor annotated @Inject (3.7.1)
+ public static final String MULTIPLE_INJECTION_CONSTRUCTORS = INSTANCE.createSeverityOption("multipleInjectionConstructors"); //$NON-NLS-1$
+// - bean constructor has a parameter annotated @Disposes, or @Observes (3.7.1)
+ public static final String CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED = INSTANCE.createSeverityOption("constructorParameterIllegallyAnnotated"); //$NON-NLS-1$
+// - generic method of a bean is annotated @Inject (initializer method is a non-abstract,
+// non-static, non-generic method of a bean class) (3.9.1)
+ public static final String GENERIC_METHOD_ANNOTATED_INJECT = INSTANCE.createSeverityOption("genericMethodAnnotatedInject"); //$NON-NLS-1$
+// - method has more than one parameter annotated @Observes (10.4.2)
+ public static final String MULTIPLE_OBSERVING_PARAMETERS = INSTANCE.createSeverityOption("multipleObservingParameters"); //$NON-NLS-1$
+// - non-static method of a session bean class has a parameter annotated @Observes,
+// and the method is not a business method of the EJB (10.4.2)
+ public static final String ILLEGAL_OBSERVER_IN_SESSION_BEAN = INSTANCE.createSeverityOption("illegalObserverInSessionBean"); //$NON-NLS-1$
+// - bean with scope @Dependent has an observer method declared receive=IF_EXISTS (10.4.3)
+ public static final String ILLEGAL_CONDITIONAL_OBSERVER = INSTANCE.createSeverityOption("illegalConditionalObserver"); //$NON-NLS-1$
+
+ //Interceptor & Decorator group
+
+// - the bean class of a managed bean is annotated with both
+// the @Interceptor and @Decorator stereotypes (3.1)
+// - bean class of a session bean is annotated @Interceptor or @Decorator (3.2)
+ public static final String BOTH_INTERCEPTOR_AND_DECORATOR = INSTANCE.createSeverityOption("bothInterceptorAndDecorator"); //$NON-NLS-1$
+// - interceptor or decorator has a method annotated @Produces (3.3.2)
+// - interceptor or decorator has a field annotated @Produces (3.4.2)
+ public static final String PRODUCER_IN_INTERCEPTOR_OR_DECORATOR = INSTANCE.createSeverityOption("producerInInterceptorOrDecorator"); //$NON-NLS-1$
+// - interceptor or decorator has a method annotated @Disposes
+ public static final String DISPOSER_IN_INTERCEPTOR_OR_DECORATOR = INSTANCE.createSeverityOption("disposerInInterceptorOrDecorator"); //$NON-NLS-1$
+// - decorator has more than one delegate injection point, or
+ public static final String MULTIPLE_DELEGATE = INSTANCE.createSeverityOption("multipleDelegate"); //$NON-NLS-1$
+// does not have a delegate injection point (8.1.2)
+ public static final String MISSING_DELEGATE = INSTANCE.createSeverityOption("missingDelegate"); //$NON-NLS-1$
+// - injection point that is not an injected field, initializer method parameter
+// or bean constructor method parameter is annotated @Delegate (8.1.2)
+ public static final String ILLEGAL_INJECTION_POINT_DELEGATE = INSTANCE.createSeverityOption("illegalInjectionPointDelegate"); //$NON-NLS-1$
+// - bean class that is not a decorator has an injection point annotated @Delegate (8.1.2)
+ public static final String ILLEGAL_BEAN_DECLARING_DELEGATE = INSTANCE.createSeverityOption("illegalBeanDeclaringDelegate"); //$NON-NLS-1$
+// - delegate type does not implement or extend a decorated type of the decorator,
+// or specifies different type parameters (8.1.3)
+ public static final String DELEGATE_HAS_ILLEGAL_TYPE = INSTANCE.createSeverityOption("delegateHasIllegalType"); //$NON-NLS-1$
+// - interceptor for lifecycle callbacks declares an interceptor binding type
+// that is defined @Target({TYPE, METHOD}) (9.2)
+ public static final String ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING = INSTANCE.createSeverityOption("illegalLifecycleCallbackInterceptorBinding"); //$NON-NLS-1$
+// - managed bean has a class level interceptor binding and is declared final
+// or has a non-static, non-private, final method (9.3)
+// - non-static, non-private, final method of a managed bean has a method level
+// interceptor binding (9.3)
+ public static final String ILLEGAL_INTERCEPTOR_BINDING_METHOD = INSTANCE.createSeverityOption("illegalInterceptorBindingMethod"); //$NON-NLS-1$
+// - the set of interceptor bindings of a bean or interceptor, including bindings
+// inherited from stereotypes and other interceptor bindings, has two instances
+// of a certain interceptor binding type and the instances have different values
+// of some annotation member (9.5.2)
+ public static final String CONFLICTING_INTERCEPTOR_BINDINGS = INSTANCE.createSeverityOption("conflictingInterceptorBindings"); //$NON-NLS-1$
+// - interceptor or decorator has a method with a parameter annotated @Observes (10.4.2)
+ public static final String OBSERVER_IN_INTERCEPTOR_OR_DECORATOR = INSTANCE.createSeverityOption("observerInInterceptorOrDecorator"); //$NON-NLS-1$
+// - interceptor or decorator is an alternative (2.6.1 non-portable)
+ public static final String INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE = INSTANCE.createSeverityOption("interceptorOrDecoratorIsAlternative"); //$NON-NLS-1$
+// - interceptor declared using @Interceptor does not declare any interceptor binding (9.2 non-portable)
+ public static final String MISSING_INTERCEPTOR_BINDING = INSTANCE.createSeverityOption("missingInterceptorBinding"); //$NON-NLS-1$
+
+ //Specialization
+
+// - managed bean class annotated @Specializes does not directly extend
+// the bean class of another managed bean (3.1.4)
+ public static final String ILLEGAL_SPECIALIZING_MANAGED_BEAN = INSTANCE.createSeverityOption("illegalSpecializingManagedBean"); //$NON-NLS-1$
+// - session bean class annotated @Specializes does not directly extend
+// the bean class of another session bean (3.2.4)
+ public static final String ILLEGAL_SPECIALIZING_SESSION_BEAN = INSTANCE.createSeverityOption("illegalSpecializingSessionBean"); //$NON-NLS-1$
+// - method annotated @Specializes is static or does not directly override another producer method (3.3.3)
+ public static final String ILLEGAL_SPECIALIZING_PRODUCER = INSTANCE.createSeverityOption("illegalSpecializingProducer"); //$NON-NLS-1$
+// - X specializes Y but does not have some bean type of Y (4.3.1)
+ public static final String MISSING_TYPE_IN_SPECIALIZING_BEAN = INSTANCE.createSeverityOption("missingTypeInSpecializingBean"); //$NON-NLS-1$
+// - X specializes Y and Y has a name and X declares a name explicitly, using @Named (4.3.1)
+ public static final String CONFLICTING_NAME_IN_SPECIALIZING_BEAN = INSTANCE.createSeverityOption("conflictingNameInSpecializingBean"); //$NON-NLS-1$
+// - interceptor is annotated @Specializes (4.3.1 non-portable)
+ public static final String INTERCEPTOR_ANNOTATED_SPECIALIZES = INSTANCE.createSeverityOption("interceptorAnnotatedSpecializes"); //$NON-NLS-1$
+// - decorator is annotated @Specializes (4.3.1 non-portable)
+ public static final String DECORATOR_ANNOTATED_SPECIALIZES = INSTANCE.createSeverityOption("decoratorAnnotatedSpecializes"); //$NON-NLS-1$
+
+ //Miscellaneous
+
+// - Java EE component class has an injection point of type UserTransaction
+// and qualifier @Default, and may not validly make use of the JTA UserTransaction
+// according to the Java EE platform specification (3.6)
+ public static final String ILLEGAL_INJECTING_USERTRANSACTION_TYPE = INSTANCE.createSeverityOption("illegalInjectingUserTransactionType"); //$NON-NLS-1$
+// - Java EE component class supporting injection that is not a bean has an injection
+// point of type InjectionPoint and qualifier @Default (5.5.7)
+ public static final String ILLEGAL_INJECTING_INJECTIONPOINT_TYPE = INSTANCE.createSeverityOption("illegalInjectingInjectionPointType"); //$NON-NLS-1$
+// - stereotype declares any qualifier annotation other than @Named (2.7.1.3 non-portable)
+ public static final String ILLEGAL_QUALIFIER_IN_STEREOTYPE = INSTANCE.createSeverityOption("illegalQualifierInStereotype"); //$NON-NLS-1$
+// - bean class is deployed in two different bean archives (12.1 non-portable)
+ // ? is it a definition problem
/**
* @return the only instance of CDIPreferences
*/
14 years, 3 months
JBoss Tools SVN: r19598 - in trunk/as/docs/reference/en/images: quick_start and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-12-28 11:58:05 -0500 (Mon, 28 Dec 2009)
New Revision: 19598
Modified:
trunk/as/docs/reference/en/images/perspective/perspective_25.png
trunk/as/docs/reference/en/images/quick_start/quick_start_8.png
Log:
JBDS-906- updating AS guide basing on the changes found when updating
archiving demo
Modified: trunk/as/docs/reference/en/images/perspective/perspective_25.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/quick_start/quick_start_8.png
===================================================================
(Binary files differ)
14 years, 3 months
JBoss Tools SVN: r19597 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-12-28 10:23:48 -0500 (Mon, 28 Dec 2009)
New Revision: 19597
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5580
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2009-12-28 13:00:01 UTC (rev 19596)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2009-12-28 15:23:48 UTC (rev 19597)
@@ -40,7 +40,7 @@
ELInvocationExpression invocationExpression = JSPExprHyperlinkPartitioner.getInvocationExpression(eStructure.reference, eStructure.expression, offset);
if(invocationExpression != null){
for(ELResolver resolver : context.getElResolvers()){
- ELResolution resolution = resolver.resolve(context, eStructure.expression, invocationExpression.getStartPosition());
+ ELResolution resolution = resolver.resolve(context, invocationExpression, invocationExpression.getStartPosition());
ELSegment segment = resolution.findSegmentByOffset(offset-eStructure.reference.getStartPosition());
if(segment != null){
if(segment instanceof JavaMemberELSegment){
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-28 13:00:01 UTC (rev 19596)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2009-12-28 15:23:48 UTC (rev 19597)
@@ -129,7 +129,7 @@
public boolean decide(ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset){
for(ELResolver resolver : context.getElResolvers()){
- ELResolution resolution = resolver.resolve(context, expression, invocationExpression.getStartPosition());
+ ELResolution resolution = resolver.resolve(context, invocationExpression, invocationExpression.getStartPosition());
ELSegment segment = resolution.findSegmentByOffset(offset);
if(segment != null){
if(segment instanceof JavaMemberELSegment){
14 years, 3 months