Author: scabanovich Date: 2010-10-29 09:14:27 -0400 (Fri, 29 Oct 2010) New Revision: 26132 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUIMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages_ja.properties Log: JBIDE-7429 https://jira.jboss.org/browse/JBIDE-7429 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUIMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUIMessages.java 2010-10-29 12:55:18 UTC (rev 26131) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUIMessages.java 2010-10-29 13:14:27 UTC (rev 26132) @@ -1,22 +1,23 @@ package org.jboss.tools.cdi.xml.ui; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class CDIXMLUIMessages { - private static final String BUNDLE_NAME = "org.jboss.tools.seam.xml.ui.messages"; //$NON-NLS-1$ +public class CDIXMLUIMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.cdi.xml.ui.messages"; //$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + public static String CDI_XML_UI_PLUGIN_NO_MESSAGES; + public static String STEREOTYPES; + public static String DECORATORS; + public static String INTERCEPTORS; + public static String ALTERNATIVES; + public static String CLASSES; + public static String INCLUDE_AND_EXCLUDE; + public static String CDI_BEANS_1_0_FILE; private CDIXMLUIMessages() { } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + static { + NLS.initializeMessages(BUNDLE_NAME, CDIXMLUIMessages.class); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java 2010-10-29 12:55:18 UTC (rev 26131) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/CDIXMLUiPlugin.java 2010-10-29 13:14:27 UTC (rev 26132) @@ -49,7 +49,7 @@ } public static void log(Throwable ex) { - INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, CDIXMLUIMessages.getString("SEAM_XML_UI_PLUGIN_NO_MESSAGES"), ex)); //$NON-NLS-1$ + INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, CDIXMLUIMessages.CDI_XML_UI_PLUGIN_NO_MESSAGES, ex)); //$NON-NLS-1$ } public static Shell getShell() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-10-29 12:55:18 UTC (rev 26131) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-10-29 13:14:27 UTC (rev 26132) @@ -11,6 +11,7 @@ package org.jboss.tools.cdi.xml.ui.editor.form; import org.jboss.tools.cdi.xml.beans.model.CDIBeansConstants; +import org.jboss.tools.cdi.xml.ui.CDIXMLUIMessages; import org.jboss.tools.common.model.ui.forms.*; public class CDIBeansFileFormLayoutData implements CDIBeansConstants { @@ -26,7 +27,7 @@ } static IFormData CDI_STEREOTYPE_LIST_DEFINITION = new FormData( - "Stereotypes", //$NON-NLS-1$ + CDIXMLUIMessages.STEREOTYPES, CDIXMLFormLayoutData.EMPTY_DESCRIPTION, new FormAttributeData[]{new FormAttributeData("stereotype", 100)}, //$NON-NLS-1$ new String[]{ENT_CDI_STEREOTYPE}, @@ -34,26 +35,26 @@ ); private final static IFormData[] DECORATORS_DEFINITIONS = new IFormData[] { - getClassListDefinition("Decorators") //$NON-NLS-1$ + getClassListDefinition(CDIXMLUIMessages.DECORATORS) }; private final static IFormData[] INTERCEPTORS_DEFINITIONS = new IFormData[] { - getClassListDefinition("Interceptors") //$NON-NLS-1$ + getClassListDefinition(CDIXMLUIMessages.INTERCEPTORS) }; private final static IFormData[] ALTERNATIVES_DEFINITIONS = new IFormData[] { new FormData( - "Alternatives", //$NON-NLS-1$ + CDIXMLUIMessages.ALTERNATIVES, CDIXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_ALTERNATIVES) ), - getClassListDefinition("Classes"), //$NON-NLS-1$ + getClassListDefinition(CDIXMLUIMessages.CLASSES), CDI_STEREOTYPE_LIST_DEFINITION }; private final static IFormData[] FILE_10_DEFINITIONS = new IFormData[] { new FormData( - "CDI Beans 1.0 File", //$NON-NLS-1$ + CDIXMLUIMessages.CDI_BEANS_1_0_FILE, CDIXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_CDI_BEANS) ), @@ -64,13 +65,13 @@ title, CDIXMLFormLayoutData.EMPTY_DESCRIPTION, new FormAttributeData[]{new FormAttributeData("element type", 20, "Kind"), new FormAttributeData("name", 70), new FormAttributeData("is regular expression", 10, "RegEx")}, //$NON-NLS-1$ - new String[]{"CDIWeldInclude", "CDIWeldExclude"}, + new String[]{"CDIWeldInclude", "CDIWeldExclude"}, //$NON-NLS-1$ //$NON-NLS-2$ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ ); } private final static IFormData[] WELD_SCAN_DEFINITIONS = new IFormData[] { - getIncludeExcludeDefinition("Include/Exclude") //$NON-NLS-1$ + getIncludeExcludeDefinition(CDIXMLUIMessages.INCLUDE_AND_EXCLUDE) }; @@ -87,6 +88,6 @@ ENT_ALTERNATIVES, new String[]{null}, ALTERNATIVES_DEFINITIONS); final static IFormData WELD_SCAN_DEFINITION = new FormData( - "CDIWeldScan", new String[]{null}, WELD_SCAN_DEFINITIONS); + "CDIWeldScan", new String[]{null}, WELD_SCAN_DEFINITIONS); //$NON-NLS-1$ } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages.properties 2010-10-29 12:55:18 UTC (rev 26131) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages.properties 2010-10-29 13:14:27 UTC (rev 26132) @@ -1,25 +1,8 @@ -SEAM_XML_UI_PLUGIN_NO_MESSAGES=No message -SEAM_PROPERTY_FORM_LAYOUT_DATA_VALUES=Values -SEAM_EVENT_FORM_LAYOUT_DATA_ACTIONS=Actions -SEAM_PROPERTY_FORM_LAYOUT_DATA_SEAM_PROPERTY_LIST=Seam Property (List) -SEAM_PROPERTY_FORM_LAYOUT_DATA_ENTRIES=Entries -SEAM_FACTORY_FORM_LAYOUT_DATA_ADVANCED=Advanced -SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_EVENT=Seam EVENT -SEAM_COMPONENT_FORM_LAYOUT_DATA_ADVANCED=Advanced -SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_ACTION=Seam Action -SEAM_PROPERTY_FORM_LAYOUT_DATA_SEAM_PROPERTY_MAP=Seam Property (Map) -SEAM_COMPONENT_FORM_LAYOUT_DATA_PROPERTIES=Properties -SEAM_FACTORY_FORM_LAYOUT_DATA_SEAM_FACTORY=Seam Factory -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT=Seam Component -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_COMPONENTS=Components -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_FACTORIES=Factories -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_EVENTS=Events -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_1_2_FILE=Seam Component 1.2 File -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_0_FILE=Seam Component 2.0 File -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_1_FILE=Seam Component 2.1 File -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_2_FILE=Seam Component 2.2 File -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_11_FILE=Seam Components 1.1 File -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_12_FILE=Seam Components 1.2 File -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_20_FILE=Seam Components 2.0 File -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_21_FILE=Seam Components 2.1 File -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_22_FILE=Seam Components 2.2 File +CDI_XML_UI_PLUGIN_NO_MESSAGES=No message +STEREOTYPES=Stereotypes +DECORATORS=Decorators +INTERCEPTORS=Interceptors +ALTERNATIVES=Alternatives +CLASSES=Classes +CDI_BEANS_1_0_FILE=CDI Beans 1.0 File +INCLUDE_AND_EXCLUDE=Include/Exclude \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages_ja.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages_ja.properties 2010-10-29 12:55:18 UTC (rev 26131) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/messages_ja.properties 2010-10-29 13:14:27 UTC (rev 26132) @@ -1,25 +1 @@ -SEAM_XML_UI_PLUGIN_NO_MESSAGES=\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093 -SEAM_PROPERTY_FORM_LAYOUT_DATA_VALUES=\u5024 -SEAM_EVENT_FORM_LAYOUT_DATA_ACTIONS=\u30A2\u30AF\u30B7\u30E7\u30F3 -SEAM_PROPERTY_FORM_LAYOUT_DATA_SEAM_PROPERTY_LIST=Seam \u30D7\u30ED\u30D1\u30C6\u30A3\u30FC (\u30EA\u30B9\u30C8) -SEAM_PROPERTY_FORM_LAYOUT_DATA_ENTRIES=\u30A8\u30F3\u30C8\u30EA\u30FC -SEAM_FACTORY_FORM_LAYOUT_DATA_ADVANCED=\u62E1\u5F35 -SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_EVENT=Seam \u30A4\u30D9\u30F3\u30C8 -SEAM_COMPONENT_FORM_LAYOUT_DATA_ADVANCED=\u62E1\u5F35 -SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_ACTION=Seam \u30A2\u30AF\u30B7\u30E7\u30F3 -SEAM_PROPERTY_FORM_LAYOUT_DATA_SEAM_PROPERTY_MAP=Seam \u30D7\u30ED\u30D1\u30C6\u30A3\u30FC (\u30DE\u30C3\u30D7) -SEAM_COMPONENT_FORM_LAYOUT_DATA_PROPERTIES=\u30D7\u30ED\u30D1\u30C6\u30A3\u30FC -SEAM_FACTORY_FORM_LAYOUT_DATA_SEAM_FACTORY=Seam \u30D5\u30A1\u30AF\u30C8\u30EA\u30FC -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_COMPONENTS=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_FACTORIES=\u30D5\u30A1\u30AF\u30C8\u30EA\u30FC -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_EVENTS=\u30A4\u30D9\u30F3\u30C8 -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_1_2_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 1.2 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_0_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.0 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_1_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.1 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENT_FORM_LAYOUT_DATA_SEAM_COMPONENT_2_2_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.2 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_11_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 1.1 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_12_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 1.2 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_20_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.0 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_21_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.1 \u30D5\u30A1\u30A4\u30EB -SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_22_FILE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 2.2 \u30D5\u30A1\u30A4\u30EB +CDI_XML_UI_PLUGIN_NO_MESSAGES=\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u3042\u308A\u307E\u305B\u3093