9:05 a.m.
Author: scabanovich
Date: 2009-04-03 10:05:53 -0400 (Fri, 03 Apr 2009)
New Revision: 14495
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/Messages.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/Messages.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/TemplateComponent.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/messages.properties
Log:
JBIDE-4044
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-04-03 13:54:37
UTC (rev 14494)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-04-03 14:05:53
UTC (rev 14495)
@@ -348,8 +348,6 @@
class="org.jboss.tools.common.core.resources.XModelObjectEditorInputFactory"/>
<xclass
id="org.jboss.tools.common.editor.DeleteFileUnderEditingSpecialWizard"
class="org.jboss.tools.common.editor.DeleteFileUnderEditingSpecialWizard"/>
- <xclass id="org.jboss.tools.common.editor.ObjectMultiPageEditorMessages"
- class="org.jboss.tools.common.editor.ObjectMultiPageEditorMessages"/>
<xclass id="org.jboss.tools.common.editor.OpenEditorWizard"
class="org.jboss.tools.common.editor.OpenEditorWizard"/>
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/Messages.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/Messages.java 2009-04-03
13:54:37 UTC (rev 14494)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/Messages.java 2009-04-03
14:05:53 UTC (rev 14495)
@@ -16,10 +16,11 @@
private static final String BUNDLE_NAME =
"org.jboss.tools.common.core.jdt.messages";
+ public static String FavoritesClassController_defaultClasses;
+
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
- public static String FavoritesClassController_defaultClasses;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/Messages.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/Messages.java 2009-04-03
13:54:37 UTC (rev 14494)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/Messages.java 2009-04-03
14:05:53 UTC (rev 14495)
@@ -4,6 +4,7 @@
public class Messages extends NLS {
private static final String BUNDLE_NAME =
"org.jboss.tools.common.model.ui.templates.preferences.messages"; //$NON-NLS-1$
+ public static String CHECKBOX_LABEL;
public static String ClassTemplateComponent_ADD;
public static String ClassTemplateComponent_COLUMN_INTERFACES;
public static String ClassTemplateComponent_EDIT;
@@ -11,6 +12,7 @@
public static String ClassTemplateComponent_LABEL_INTERFACES;
public static String ClassTemplateComponent_REMOVE;
public static String ClassTemplateComponent_XPATH;
+ public static String ClassTemplateComponent_LIST_OF_TEMPLATE_GROUPS;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/TemplateComponent.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/TemplateComponent.java 2009-04-03
13:54:37 UTC (rev 14494)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/TemplateComponent.java 2009-04-03
14:05:53 UTC (rev 14495)
@@ -24,8 +24,6 @@
public class TemplateComponent {
- private static final String RESOURCE_BUNDLE=
"org.jboss.tools.common.model.ui.templates.preferences.messages";
- private static ResourceBundle resourceBundle=
ResourceBundle.getBundle(RESOURCE_BUNDLE);
private MetaConfiguration configuration;
// private XModel model;
boolean isGlobal = true;
@@ -59,7 +57,7 @@
Control[] control;
// checkbox
if(!isGlobal) { //.getString CHECKBOX_LABEL
-
allowOverrideEditor.setLabelText(resourceBundle.getString("CHECKBOX_LABEL"));
+ allowOverrideEditor.setLabelText(Messages.CHECKBOX_LABEL);
allowOverrideAdapter.setValue("" + MetaClassTemplateHelper.instance.
isProjectOverrideTemplates());
control = getControls(composite, allowOverrideEditor);
control[0].dispose(); // dispose empty label
@@ -69,7 +67,7 @@
}
// list of templates
- templateGroupsEditor.setLabelText("List of template groups.");
+
templateGroupsEditor.setLabelText(Messages.ClassTemplateComponent_LIST_OF_TEMPLATE_GROUPS);
control = getControls(composite, templateGroupsEditor);
control[0].dispose(); // dispose empty label
gd = new GridData(GridData.FILL_HORIZONTAL);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/messages.properties
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/messages.properties 2009-04-03
13:54:37 UTC (rev 14494)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/preferences/messages.properties 2009-04-03
14:05:53 UTC (rev 14495)
@@ -6,3 +6,4 @@
ClassTemplateComponent_LABEL_INTERFACES=Interfaces
ClassTemplateComponent_REMOVE=Remove
ClassTemplateComponent_XPATH=XPath
+ClassTemplateComponent_LIST_OF_TEMPLATE_GROUPS=List of template groups.