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