Author: sflanigan Date: 2009-05-28 00:47:10 -0400 (Thu, 28 May 2009) New Revision: 15574 Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/.settings/ trunk/common/plugins/org.jboss.tools.common.meta.ui/.settings/org.eclipse.jdt.core.prefs trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/Messages.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/messages.properties trunk/common/plugins/org.jboss.tools.common.model.ui/.settings/org.eclipse.jdt.core.prefs trunk/common/plugins/org.jboss.tools.common.model/.settings/ trunk/common/plugins/org.jboss.tools.common.model/.settings/org.eclipse.jdt.core.prefs Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaCompoundEditor.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/EditorListAdapter.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/HandlerListAdapter.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/ImplementationListAdapter.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/PropertiesStringFieldEditor.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateKeysGloballyHandler.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MappingHelper.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeDataImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeEditorImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementOrderedImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaEntityDataImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaIconTypeImpl.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaLoaderUtil.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ActionListFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/AttributeFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/EntityFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ExtensionFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/GroupFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/IconFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MappingFormLayoutData.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaConstants.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchPage.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchQuery.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResult.java trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XAttributeDataImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XEntityDataImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-28 04:47:10 UTC (rev 15574) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/Messages.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/Messages.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -0,0 +1,54 @@ +package org.jboss.tools.common.meta.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.common.meta.ui.messages"; //$NON-NLS-1$ + public static String ActionListFormLayoutData_Action; + public static String ActionListFormLayoutData_ActionList; + public static String ActionListFormLayoutData_Advanced; + public static String ActionListFormLayoutData_EntityData; + public static String ActionListFormLayoutData_Items; + public static String AttributeFormLayoutData_Advanced; + public static String AttributeFormLayoutData_Attribute; + public static String AttributeFormLayoutData_AttributeReference; + public static String AttributeFormLayoutData_AttributesFolder; + public static String AttributeFormLayoutData_AttributesList; + public static String AttributeFormLayoutData_Constraint; + public static String AttributeFormLayoutData_ConstraintDefinitions; + public static String AttributeFormLayoutData_Editor; + public static String AttributeFormLayoutData_Items; + public static String EntityFormLayoutData_Advanced; + public static String EntityFormLayoutData_AttributesFolder; + public static String EntityFormLayoutData_ChildrenFolder; + public static String EntityFormLayoutData_ChildrenList; + public static String EntityFormLayoutData_Entity; + public static String ExtensionFormLayoutData_ActionList; + public static String ExtensionFormLayoutData_EntityExtension; + public static String GroupFormLayoutData_Entities; + public static String GroupFormLayoutData_Extensions; + public static String GroupFormLayoutData_MetaGroup; + public static String IconFormLayoutData_IconGroup; + public static String IconFormLayoutData_Icons; + public static String IconFormLayoutData_IconsDefinitions; + public static String IconFormLayoutData_Subgroups; + public static String MappingFormLayoutData_Items; + public static String MappingFormLayoutData_MappingDefinitions; + public static String MappingFormLayoutData_MappingsFolder; + public static String MappingFormLayoutData_MappingsList; + public static String MetaCompoundEditor_PageTitle; + public static String MetaSearchQuery_Label; + public static String MetaSearchResult_Label; + public static String MetaSearchResult_MetaSearchTextToFindNMatches; + public static String MetaSearchResult_Tooltip; + public static String MetaSearchResultPage_Label; + public static String MetaSearchResultPage_MetaAttributeLabel; + public static String MetaSearchResultPage_TextToFindNMatches; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaCompoundEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaCompoundEditor.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/MetaCompoundEditor.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -21,7 +21,7 @@ protected void doCreatePages() { if(isAppropriateNature()) { treeFormPage = createTreeFormPage(); - treeFormPage.setTitle("Meta Editor"); + treeFormPage.setTitle(Messages.MetaCompoundEditor_PageTitle); treeFormPage.initialize(object); addFormPage(treeFormPage); } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/EditorListAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/EditorListAdapter.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/EditorListAdapter.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -36,7 +36,7 @@ protected void loadTags() { MappingHelper h = MappingHelper.getMappingHelper(model); - tags = h.getList("AttributeEditor"); + tags = h.getList("AttributeEditor"); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/HandlerListAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/HandlerListAdapter.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/HandlerListAdapter.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -38,9 +38,9 @@ protected void loadTags() { MappingHelper h = MappingHelper.getMappingHelper(model); - tags = h.getList("Handlers"); + tags = h.getList("Handlers"); //$NON-NLS-1$ for (int i = 0; i < tags.length; i++) { - tags[i] = "%" + tags[i] + "%"; + tags[i] = "%" + tags[i] + "%"; //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/ImplementationListAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/ImplementationListAdapter.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/ImplementationListAdapter.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -38,9 +38,9 @@ protected void loadTags() { MappingHelper h = MappingHelper.getMappingHelper(model); - tags = h.getList("Implementations"); + tags = h.getList("Implementations"); //$NON-NLS-1$ for (int i = 0; i < tags.length; i++) { - tags[i] = "%" + tags[i] + "%"; + tags[i] = "%" + tags[i] + "%"; //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/PropertiesStringFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/PropertiesStringFieldEditor.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/attribute/editor/PropertiesStringFieldEditor.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -48,7 +48,7 @@ public PropertiesStringFieldEditor(IWidgetSettings settings) { super(settings); - object = PreferenceModelUtilities.getPreferenceModel().createModelObject("FilePROPERTIES", null); + object = PreferenceModelUtilities.getPreferenceModel().createModelObject("FilePROPERTIES", null); //$NON-NLS-1$ table = new XChildrenEditorImpl(); table.setObject(object); } @@ -93,15 +93,15 @@ for (int i = 0; i < cs.length; i++) { cs[i].removeFromParent(); } - StringTokenizer st = new StringTokenizer(value, ",;"); + StringTokenizer st = new StringTokenizer(value, ",;"); //$NON-NLS-1$ while(st.hasMoreTokens()) { String t = st.nextToken(); int h = t.indexOf('='); String n = (h < 0) ? t : t.substring(0, h); String v = t.substring(h + 1); - XModelObject p = object.getModel().createModelObject("Property", null); - p.setAttributeValue("name", n); - p.setAttributeValue("value", v); + XModelObject p = object.getModel().createModelObject("Property", null); //$NON-NLS-1$ + p.setAttributeValue("name", n); //$NON-NLS-1$ + p.setAttributeValue("value", v); //$NON-NLS-1$ object.addChild(p); } table.update(); @@ -164,7 +164,7 @@ return new Helper(); } protected String getAddActionPath() { - return "CreateActions.CreateProperty"; + return "CreateActions.CreateProperty"; //$NON-NLS-1$ } public void action(String command) { super.action(command); @@ -180,8 +180,8 @@ StringBuffer sb = new StringBuffer(); XModelObject[] os = object.getChildren(); for (int i = 0; i < os.length; i++) { - String n = os[i].getAttributeValue("name"); - String v = os[i].getAttributeValue("value"); + String n = os[i].getAttributeValue("name"); //$NON-NLS-1$ + String v = os[i].getAttributeValue("value"); //$NON-NLS-1$ if(n.length() == 0 && v.length() == 0) continue; if(sb.length() > 0) sb.append(';'); sb.append(n).append('=').append(v); @@ -190,7 +190,7 @@ } class Helper extends AbstractTableHelper { - String[] HEADER = new String[]{"name", "value"}; + String[] HEADER = new String[]{"name", "value"}; //$NON-NLS-1$ //$NON-NLS-2$ public String[] getHeader() { return HEADER; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateHelpKeysHandler.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -24,19 +24,19 @@ } public void executeHandler(XModelObject object, Properties p) throws XModelException { - defpath = action.getProperty("default"); + defpath = action.getProperty("default"); //$NON-NLS-1$ XModelObject q = findOrCreateProperties(object); - XModelObject[] fs = object.getChildren("FileMETA"); + XModelObject[] fs = object.getChildren("FileMETA"); //$NON-NLS-1$ for (int i = 0; i < fs.length; i++) processFile(fs[i], q); q.setModified(true); } private XModelObject findOrCreateProperties(XModelObject p) { - XModelObject q = p.getChildByPath("keys.properties"); + XModelObject q = p.getChildByPath("keys.properties"); //$NON-NLS-1$ if(q == null) { - q = p.getModel().createModelObject("FilePROPERTIES", new Properties()); - q.setAttributeValue("name", "keys"); - q.setAttributeValue("extension", "properties"); + q = p.getModel().createModelObject("FilePROPERTIES", new Properties()); //$NON-NLS-1$ + q.setAttributeValue("name", "keys"); //$NON-NLS-1$ //$NON-NLS-2$ + q.setAttributeValue("extension", "properties"); //$NON-NLS-1$ //$NON-NLS-2$ p.addChild(q); } return q; @@ -44,21 +44,21 @@ private void validateProperty(XModelObject q, String name, String value) { if(q.getChildByPath(name) != null) return; - XModelObject v = q.getModel().createModelObject("Property", new Properties()); - v.setAttributeValue("name", name); - if(value != null) v.setAttributeValue("value", value); + XModelObject v = q.getModel().createModelObject("Property", new Properties()); //$NON-NLS-1$ + v.setAttributeValue("name", name); //$NON-NLS-1$ + if(value != null) v.setAttributeValue("value", value); //$NON-NLS-1$ q.addChild(v); } private void processFile(XModelObject f, XModelObject q) { - XModelObject[] es = f.getChildren("MetaEntity"); + XModelObject[] es = f.getChildren("MetaEntity"); //$NON-NLS-1$ for (int i = 0; i < es.length; i++) processEntity(es[i], q); - es = f.getChildren("MetaEntityExtension"); + es = f.getChildren("MetaEntityExtension"); //$NON-NLS-1$ for (int i = 0; i < es.length; i++) processEntityExtension(es[i], q); } private void processEntity(XModelObject e, XModelObject q) { - boolean impl = (e.getAttributeValue("implementation").length() > 0); + boolean impl = (e.getAttributeValue("implementation").length() > 0); //$NON-NLS-1$ if(impl) { // validateProperty(q, e.getAttributeValue("name"), defpath); } @@ -71,7 +71,7 @@ private void processActions(XModelObject e, XModelObject q, boolean impl) { XModelObject[] as = collectActions(e); - String pref = e.getAttributeValue("name") + "_"; + String pref = e.getAttributeValue("name") + "_"; //$NON-NLS-1$ //$NON-NLS-2$ for (int i = 0; i < as.length; i++) processAction(pref, as[i], q); if(impl) { // validateProperty(q, pref + "Properties", defpath); @@ -85,82 +85,82 @@ } private void collectActions(XModelObject e, ArrayList l) { - XModelObject[] as = e.getChildren("MetaActionList"); + XModelObject[] as = e.getChildren("MetaActionList"); //$NON-NLS-1$ for (int i = 0; i < as.length; i++) collectActions(as[i], l); - as = e.getChildren("MetaAction"); + as = e.getChildren("MetaAction"); //$NON-NLS-1$ for (int i = 0; i < as.length; i++) l.add(as[i]); } private void processAction(String pref, XModelObject a, XModelObject q) { - String n = a.getAttributeValue("name"); - String dn = a.getAttributeValue("display name"); - if(dn.endsWith("...")) dn = dn.substring(0, dn.length() - 3); - if(n.startsWith("Add") || n.startsWith("Create")) { + String n = a.getAttributeValue("name"); //$NON-NLS-1$ + String dn = a.getAttributeValue("display name"); //$NON-NLS-1$ + if(dn.endsWith("...")) dn = dn.substring(0, dn.length() - 3); //$NON-NLS-1$ + if(n.startsWith("Add") || n.startsWith("Create")) { //$NON-NLS-1$ //$NON-NLS-2$ Properties p = getProperties(a); - String key = p.getProperty("key"); + String key = p.getProperty("key"); //$NON-NLS-1$ if(key == null) { key = pref + n; } String wt = dn; - if(!wt.startsWith("Add") && !wt.startsWith("New")) { - wt = "Add " + wt; + if(!wt.startsWith("Add") && !wt.startsWith("New")) { //$NON-NLS-1$ //$NON-NLS-2$ + wt = "Add " + wt; //$NON-NLS-1$ } - validateProperty(q, key + ".WindowTitle", wt); + validateProperty(q, key + ".WindowTitle", wt); //$NON-NLS-1$ String on = getObjectName(a); if(on == null) on = dn; - validateProperty(q, key + ".Title", on); - } else if(n.equals("Properties")) { + validateProperty(q, key + ".Title", on); //$NON-NLS-1$ + } else if(n.equals("Properties")) { //$NON-NLS-1$ String key = pref + n; // validateProperty(q, key + ".WindowTitle", "Properties"); XModelObject b = a; - while(b != null && b.getModelEntity().getName().toLowerCase().indexOf("entity") < 0) { + while(b != null && b.getModelEntity().getName().toLowerCase().indexOf("entity") < 0) { //$NON-NLS-1$ b = b.getParent(); } String on = (b == null) ? dn : getObjectName2(b); if(on == null) on = dn; - validateProperty(q, key + ".Title", on); - } else if(a.getAttributeValue("wizard").length() > 0) { + validateProperty(q, key + ".Title", on); //$NON-NLS-1$ + } else if(a.getAttributeValue("wizard").length() > 0) { //$NON-NLS-1$ Properties p = getProperties(a); - String key = p.getProperty("key"); + String key = p.getProperty("key"); //$NON-NLS-1$ if(key == null) { key = pref + n; } // validateProperty(q, key, defpath); - validateProperty(q, key + ".WindowTitle", dn); - validateProperty(q, key + ".Title", ""); - validateProperty(q, key + ".Message", ""); - } else if(isSpecialWizard(a.getAttributeValue("handler"))) { + validateProperty(q, key + ".WindowTitle", dn); //$NON-NLS-1$ + validateProperty(q, key + ".Title", ""); //$NON-NLS-1$ //$NON-NLS-2$ + validateProperty(q, key + ".Message", ""); //$NON-NLS-1$ //$NON-NLS-2$ + } else if(isSpecialWizard(a.getAttributeValue("handler"))) { //$NON-NLS-1$ int m = a.getChildren().length; for (int i = 0; i < m; i++) { - String key = pref + n + "_" + i; + String key = pref + n + "_" + i; //$NON-NLS-1$ // validateProperty(q, key, defpath); - validateProperty(q, key + ".WindowTitle", dn); - validateProperty(q, key + ".Title", ""); - validateProperty(q, key + ".Message", ""); + validateProperty(q, key + ".WindowTitle", dn); //$NON-NLS-1$ + validateProperty(q, key + ".Title", ""); //$NON-NLS-1$ //$NON-NLS-2$ + validateProperty(q, key + ".Message", ""); //$NON-NLS-1$ //$NON-NLS-2$ } - } else if(n.indexOf("Edit") >= 0) { + } else if(n.indexOf("Edit") >= 0) { //$NON-NLS-1$ String key = pref + n; // validateProperty(q, key, defpath); - validateProperty(q, key + ".WindowTitle", dn); - validateProperty(q, key + ".Title", ""); - validateProperty(q, key + ".Message", ""); + validateProperty(q, key + ".WindowTitle", dn); //$NON-NLS-1$ + validateProperty(q, key + ".Title", ""); //$NON-NLS-1$ //$NON-NLS-2$ + validateProperty(q, key + ".Message", ""); //$NON-NLS-1$ //$NON-NLS-2$ } } private boolean isSpecialWizard(String s) { - return s.equals("org.jboss.tools.common.meta.action.impl.handlers.DefaultSpecialHandler") - || s.equals("%SpecialWizard%"); + return s.equals("org.jboss.tools.common.meta.action.impl.handlers.DefaultSpecialHandler") //$NON-NLS-1$ + || s.equals("%SpecialWizard%"); //$NON-NLS-1$ } private String getObjectName(XModelObject a) { XModelObject[] cs = a.getChildren(); if(cs == null || cs.length == 0) return null; - String n = cs[0].getAttributeValue("entity name"); + String n = cs[0].getAttributeValue("entity name"); //$NON-NLS-1$ return getObjectName(n); } private String getObjectName2(XModelObject a) { - return getObjectName(a.getAttributeValue("name")); + return getObjectName(a.getAttributeValue("name")); //$NON-NLS-1$ } private String getObjectName(String n) { @@ -179,9 +179,9 @@ private Properties getProperties(XModelObject a) { Properties p = new Properties(); - String ps = a.getAttributeValue("properties"); + String ps = a.getAttributeValue("properties"); //$NON-NLS-1$ if(ps == null || ps.length() == 0) return p; - StringTokenizer st = new StringTokenizer(ps, ";"); + StringTokenizer st = new StringTokenizer(ps, ";"); //$NON-NLS-1$ while(st.hasMoreTokens()) { String t = st.nextToken(); int i = t.indexOf('='); Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateKeysGloballyHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateKeysGloballyHandler.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/GenerateKeysGloballyHandler.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -19,7 +19,7 @@ public class GenerateKeysGloballyHandler extends AbstractHandler { //TODO ask in wizard - String root = "C:/Documents and Settings/glory/RedHat-3.4"; + String root = "C:/Documents and Settings/glory/RedHat-3.4"; //$NON-NLS-1$ public GenerateKeysGloballyHandler() {} @@ -34,11 +34,11 @@ Set<String> allKeys = new HashSet<String>(); for (int i = 0; i < plugins.length; i++) { if(!plugins[i].isDirectory()) continue; - File pxml = new File(plugins[i], "plugin.xml"); + File pxml = new File(plugins[i], "plugin.xml"); //$NON-NLS-1$ if(!pxml.isFile()) continue; - File meta = new File(plugins[i], "resources/meta"); + File meta = new File(plugins[i], "resources/meta"); //$NON-NLS-1$ if(!meta.isDirectory()) continue; - File helpFolder = new File(plugins[i], "resources/help"); + File helpFolder = new File(plugins[i], "resources/help"); //$NON-NLS-1$ if(!helpFolder.isDirectory()) { //TODO create folder @@ -51,18 +51,18 @@ PluginData pluginData = new PluginData(); pluginData.rootFolder = plugins[i]; pluginData.rootObject = parent; - pluginData.metaFolder = parent.getChildByPath("resources/meta"); + pluginData.metaFolder = parent.getChildByPath("resources/meta"); //$NON-NLS-1$ relevantPlugins.add(pluginData); XModelObject[] cs = parent.getChildren(); if(!helpFolder.isDirectory()) { - System.out.println("No help folder"); + System.out.println("No help folder"); //$NON-NLS-1$ } - XModelObject helpFolderObject = parent.getChildByPath("resources/help"); + XModelObject helpFolderObject = parent.getChildByPath("resources/help"); //$NON-NLS-1$ if(helpFolderObject != null) { - XModelObject[] hf = helpFolderObject.getChildren("FilePROPERTIES"); + XModelObject[] hf = helpFolderObject.getChildren("FilePROPERTIES"); //$NON-NLS-1$ for (int j = 0; j < hf.length; j++) { XModelObject[] ps = hf[j].getChildren(); - for (int k = 0; k < ps.length; k++) allKeys.add(ps[k].getAttributeValue("name")); + for (int k = 0; k < ps.length; k++) allKeys.add(ps[k].getAttributeValue("name")); //$NON-NLS-1$ } } } @@ -70,7 +70,7 @@ } - System.out.println("Total keys count = " + allKeys.size()); + System.out.println("Total keys count = " + allKeys.size()); //$NON-NLS-1$ generateAttributeNameKeys(allKeys, relevantPlugins); @@ -79,29 +79,29 @@ private void generateAttributeNameKeys(Set<String> allKeys, List<PluginData> relevantPlugins) throws XModelException { for (PluginData d: relevantPlugins) { - XModelObject[] ms = d.metaFolder.getChildren("FileMETA"); + XModelObject[] ms = d.metaFolder.getChildren("FileMETA"); //$NON-NLS-1$ for (int i = 0; i < ms.length; i++) { - XModelObject version = ms[i].getChildByPath("Version"); - String module = version.getAttributeValue("module"); + XModelObject version = ms[i].getChildByPath("Version"); //$NON-NLS-1$ + String module = version.getAttributeValue("module"); //$NON-NLS-1$ - String attrKeysFileName = "keys-" + module.toLowerCase() + "-attrs"; + String attrKeysFileName = "keys-" + module.toLowerCase() + "-attrs"; //$NON-NLS-1$ //$NON-NLS-2$ XModelObject attrKeys = findOrCreatePropertiesFile(d.rootObject, attrKeysFileName); if(attrKeys == null) { continue; } - XModelObject[] es = ms[i].getChildren("MetaEntity"); + XModelObject[] es = ms[i].getChildren("MetaEntity"); //$NON-NLS-1$ for (int j = 0; j < es.length; j++) { - XModelObject[] as = es[j].getChildByPath("Attributes").getChildren(); + XModelObject[] as = es[j].getChildByPath("Attributes").getChildren(); //$NON-NLS-1$ for (int k = 0; k < as.length; k++) { - if(as[k].getModelEntity().getName().equals("MetaAttribute")) { + if(as[k].getModelEntity().getName().equals("MetaAttribute")) { //$NON-NLS-1$ addAttributeFieldDisplayName(attrKeys, module, allKeys, es[j], as[k]); } } } if(attrKeys.getChildren().length > 0) { - System.out.println(attrKeysFileName + " " + attrKeys.getChildren().length); + System.out.println(attrKeysFileName + " " + attrKeys.getChildren().length); //$NON-NLS-1$ ((FolderImpl)attrKeys.getParent()).saveChild(attrKeys); } } @@ -109,19 +109,19 @@ } private void addAttributeFieldDisplayName(XModelObject attrKeys, String module, Set<String> allKeys, XModelObject ent, XModelObject attr) throws XModelException { - String name = attr.getAttributeValue("name"); - String key_att_1 = ent.getAttributeValue("name") + "_" + name.replace(' ', '_'); + String name = attr.getAttributeValue("name"); //$NON-NLS-1$ + String key_att_1 = ent.getAttributeValue("name") + "_" + name.replace(' ', '_'); //$NON-NLS-1$ //$NON-NLS-2$ if(allKeys.contains(key_att_1)) { // System.out.println("--->" + key_att_1); return; } - key_att_1 = ent.getAttributeValue("name") + "." + name.replace(' ', '_'); + key_att_1 = ent.getAttributeValue("name") + "." + name.replace(' ', '_'); //$NON-NLS-1$ //$NON-NLS-2$ if(allKeys.contains(key_att_1)) { // System.out.println("--->" + key_att_1); return; } - String key_att_2 = module + "." + name.replace(' ', '_').replace(':', '_'); - boolean invisible = "false".equals(attr.getAttributeValue("visibility")); + String key_att_2 = module + "." + name.replace(' ', '_').replace(':', '_'); //$NON-NLS-1$ + boolean invisible = "false".equals(attr.getAttributeValue("visibility")); //$NON-NLS-1$ //$NON-NLS-2$ if(attrKeys.getChildByPath(key_att_2) != null) { if(invisible) { // DefaultRemoveHandler.removeFromParent(attrKeys.getChildByPath(key_att_2)); @@ -129,68 +129,68 @@ return; } if(invisible) return; - XModelObject po = attrKeys.getModel().createModelObject("Property", new Properties()); - po.setAttributeValue("name", key_att_2); - po.setAttributeValue("value", WizardKeys.toDisplayName(name)); + XModelObject po = attrKeys.getModel().createModelObject("Property", new Properties()); //$NON-NLS-1$ + po.setAttributeValue("name", key_att_2); //$NON-NLS-1$ + po.setAttributeValue("value", WizardKeys.toDisplayName(name)); //$NON-NLS-1$ DefaultCreateHandler.addCreatedObject(attrKeys, po, 2); } private void generateMenuNameKeys(Set<String> allKeys, List<PluginData> relevantPlugins) throws XModelException { Set<String> mk = new HashSet<String>(); //Temp for (PluginData d: relevantPlugins) { - XModelObject[] ms = d.metaFolder.getChildren("FileMETA"); + XModelObject[] ms = d.metaFolder.getChildren("FileMETA"); //$NON-NLS-1$ for (int i = 0; i < ms.length; i++) { - XModelObject version = ms[i].getChildByPath("Version"); - String module = version.getAttributeValue("module"); + XModelObject version = ms[i].getChildByPath("Version"); //$NON-NLS-1$ + String module = version.getAttributeValue("module"); //$NON-NLS-1$ - String menuKeysFileName = "keys-" + module.toLowerCase() + "-menu"; + String menuKeysFileName = "keys-" + module.toLowerCase() + "-menu"; //$NON-NLS-1$ //$NON-NLS-2$ XModelObject menuKeys = findOrCreatePropertiesFile(d.rootObject, menuKeysFileName); if(menuKeys == null) { continue; } - XModelObject[] es = ms[i].getChildren("MetaEntity"); + XModelObject[] es = ms[i].getChildren("MetaEntity"); //$NON-NLS-1$ for (int j = 0; j < es.length; j++) { - XModelObject list = es[j].getChildByPath("ActionList"); + XModelObject list = es[j].getChildByPath("ActionList"); //$NON-NLS-1$ if(list != null) { generateMenuNameKeys(allKeys, menuKeys, list, mk); } } if(menuKeys.getChildren().length > 0) { - System.out.println(menuKeysFileName + " " + menuKeys.getChildren().length); + System.out.println(menuKeysFileName + " " + menuKeys.getChildren().length); //$NON-NLS-1$ ((FolderImpl)menuKeys.getParent()).saveChild(menuKeys); } } } - System.out.println("action menu names " + mk.size()); + System.out.println("action menu names " + mk.size()); //$NON-NLS-1$ for (String s: mk) System.out.println(s); } private void generateMenuNameKeys(Set<String> allKeys, XModelObject menuKeys, XModelObject list, Set<String> mk) throws XModelException { - String n = list.getAttributeValue("name"); - String g = list.getAttributeValue("group"); - if("1".equals(g)) { + String n = list.getAttributeValue("name"); //$NON-NLS-1$ + String g = list.getAttributeValue("group"); //$NON-NLS-1$ + if("1".equals(g)) { //$NON-NLS-1$ mk.add(n); } XModelObject[] cs = list.getChildren(); for (int i = 0; i < cs.length; i++) { String entity = cs[i].getModelEntity().getName(); - if("MetaActionList".equals(entity)) { + if("MetaActionList".equals(entity)) { //$NON-NLS-1$ generateMenuNameKeys(allKeys, menuKeys, cs[i], mk); } else { - String na = cs[i].getAttributeValue("name"); + String na = cs[i].getAttributeValue("name"); //$NON-NLS-1$ mk.add(na); } } } private XModelObject findOrCreatePropertiesFile(XModelObject root, String name) { - XModelObject parent = root.getChildByPath("resources/help"); + XModelObject parent = root.getChildByPath("resources/help"); //$NON-NLS-1$ if(parent == null) return null; - XModelObject o = parent.getChildByPath(name + ".properties"); + XModelObject o = parent.getChildByPath(name + ".properties"); //$NON-NLS-1$ if(o == null) { - o = parent.getModel().createModelObject("FilePROPERTIES", new Properties()); - o.setAttributeValue("name", name); + o = parent.getModel().createModelObject("FilePROPERTIES", new Properties()); //$NON-NLS-1$ + o.setAttributeValue("name", name); //$NON-NLS-1$ parent.addChild(o); parent.setModified(true); } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MappingHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MappingHelper.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MappingHelper.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -18,7 +18,7 @@ public class MappingHelper { public static MappingHelper getMappingHelper(XModel model) { - MappingHelper h = (MappingHelper)model.getManager("MappingHelper"); + MappingHelper h = (MappingHelper)model.getManager("MappingHelper"); //$NON-NLS-1$ if(h == null) { h = new MappingHelper(); h.setModel(model); Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeDataImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeDataImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -16,7 +16,7 @@ public MetaAttributeDataImpl() {} public String name() { - return (String)properties.get("AttributeName"); + return (String)properties.get("AttributeName"); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeEditorImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeEditorImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaAttributeEditorImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -16,7 +16,7 @@ public MetaAttributeEditorImpl() {} public String getPathPart() { - return "Editor"; + return "Editor"; //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -18,7 +18,7 @@ public MetaElementImpl() {} public String name() { - return (String)properties.get("name"); + return (String)properties.get("name"); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementOrderedImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementOrderedImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaElementOrderedImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -18,7 +18,7 @@ public MetaElementOrderedImpl() {} public String name() { - return (String)properties.get("name"); + return (String)properties.get("name"); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaEntityDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaEntityDataImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaEntityDataImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -16,7 +16,7 @@ public MetaEntityDataImpl() {} public String name() { - return (String)properties.get("EntityName"); + return (String)properties.get("EntityName"); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaIconTypeImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaIconTypeImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaIconTypeImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -16,6 +16,6 @@ public MetaIconTypeImpl() {} public String name() { - return (String)properties.get("type"); + return (String)properties.get("type"); //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaLoaderUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaLoaderUtil.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/editor/MetaLoaderUtil.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -20,7 +20,7 @@ public MetaLoaderUtil() { Hashtable _singular = new Hashtable(); - _singular.put("kind", "kind"); + _singular.put("kind", "kind"); //$NON-NLS-1$ //$NON-NLS-2$ setup(_singular, false); } @@ -100,9 +100,9 @@ private static String calculateEntity(Element element, String def) { String entity = getModelEntityAttribute(element); if(entity != null) return entity; - if(def.equals("MetaActionList")) { - String k = element.getAttribute("kind"); - if("action".equals(k)) return "MetaAction"; + if(def.equals("MetaActionList")) { //$NON-NLS-1$ + String k = element.getAttribute("kind"); //$NON-NLS-1$ + if("action".equals(k)) return "MetaAction"; //$NON-NLS-1$ //$NON-NLS-2$ } return def; } @@ -114,8 +114,8 @@ boolean needToSave(XModelObject o) { if(o == null) return false; String entity = o.getModelEntity().getName(); - if("MetaAttributeConstraint".equals(entity) - || "MetaAttributeEditor".equals(entity)) { + if("MetaAttributeConstraint".equals(entity) //$NON-NLS-1$ + || "MetaAttributeEditor".equals(entity)) { //$NON-NLS-1$ return (hasSetAttributes(o) || o.getChildren().length > 0 ); @@ -128,11 +128,11 @@ for (int i = 0; i < as.length; i++) { String xml = as[i].getXMLName(); // it would be more safe to check isSavable - if(xml == null || xml.length() == 0 || "NAME".equals(xml)) continue; + if(xml == null || xml.length() == 0 || "NAME".equals(xml)) continue; //$NON-NLS-1$ String v = o.getAttributeValue(as[i].getName()); if(v != null && v.length() > 0 && !v.equals(as[i].getDefaultValue())) return true; } - String finalComment = o.get("#final-comment"); + String finalComment = o.get("#final-comment"); //$NON-NLS-1$ if(finalComment != null && finalComment.length() > 0) return true; return false; } Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ActionListFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ActionListFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ActionListFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -19,16 +20,16 @@ private final static IFormData[] ACTION_LIST_DEFINITIONS = new IFormData[] { new FormData( - "Action List", - "", //"Description + Messages.ActionListFormLayoutData_ActionList, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ACTION_LIST_ENTITY) ), new FormData( - "Items", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, + Messages.ActionListFormLayoutData_Items, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ACTION_LIST_ENTITY, ACTION_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ ) }; @@ -38,20 +39,20 @@ private final static IFormData[] ACTION_DEFINITIONS = new IFormData[] { new FormData( - "Action", - "", //"Description + Messages.ActionListFormLayoutData_Action, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ACTION_ENTITY) ), new FormData( - "Items", - "", //"Description - new FormAttributeData[]{new FormAttributeData("entity name", 70), new FormAttributeData("mandatory", 30)}, + Messages.ActionListFormLayoutData_Items, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("entity name", 70), new FormAttributeData("mandatory", 30)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ENTITY_DATA_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMetaEntityData") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMetaEntityData") //$NON-NLS-1$ ), new FormData( - "Advanced", - "", //"Description + Messages.ActionListFormLayoutData_Advanced, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createAdvancedFormAttributeData(ACTION_ENTITY) ), }; @@ -62,16 +63,16 @@ private final static IFormData[] ENTITY_DATA_DEFINITIONS = new IFormData[] { new FormData( - "Entity Data", - "", //"Description + Messages.ActionListFormLayoutData_EntityData, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ENTITY_DATA_ENTITY) ), new FormData( - "Items", - "", //"Description - new FormAttributeData[]{new FormAttributeData("attribute name", 70), new FormAttributeData("mandatory", 30)}, + Messages.ActionListFormLayoutData_Items, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("attribute name", 70), new FormAttributeData("mandatory", 30)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ATTRIBUTE_DATA_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMetaAttributeData") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMetaAttributeData") //$NON-NLS-1$ ), }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/AttributeFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/AttributeFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/AttributeFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -19,53 +20,53 @@ private final static IFormData[] ATTRIBUTE_DEFINITIONS = new IFormData[] { new FormData( - "Attribute", - "", //"Description + Messages.AttributeFormLayoutData_Attribute, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ATTRIBUTE_ENTITY) ), new FormData( - "Constraint", - "", //"Description - "Constraint", + Messages.AttributeFormLayoutData_Constraint, + "", //"Description //$NON-NLS-1$ + "Constraint", //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ATTRIBUTE_CONSTRAINT_ENTITY) ), new FormData( - "Editor", - "", //"Description - "Editor", + Messages.AttributeFormLayoutData_Editor, + "", //"Description //$NON-NLS-1$ + "Editor", //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ATTRIBUTE_EDITOR_ENTITY) ), new FormData( - "Advanced", - "", //"Description + Messages.AttributeFormLayoutData_Advanced, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createAdvancedFormAttributeData(ATTRIBUTE_ENTITY) ), }; private final static IFormData[] ATTRIBUTE_REF_DEFINITIONS = new IFormData[] { new FormData( - "Attribute Reference", - "", //"Description + Messages.AttributeFormLayoutData_AttributeReference, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ATTRIBUTE_REF_ENTITY) ), }; final static IFormData ATTRIBUTES_FOLDER_DEFINITION = new FormData( - "Attributes", - "", //"Description, - "Attributes", - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.AttributeFormLayoutData_AttributesFolder, + "", //"Description, //$NON-NLS-1$ + "Attributes", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{ATTRIBUTE_ENTITY,ATTRIBUTE_REF_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateAttribute") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateAttribute") //$NON-NLS-1$ ); final static IFormData ATTRIBUTES_LIST_DEFINITION = new FormData( - "Attributes", - "", //"Description, + Messages.AttributeFormLayoutData_AttributesList, + "", //"Description, //$NON-NLS-1$ ATTRIBUTES_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100)}, + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{ATTRIBUTE_ENTITY,ATTRIBUTE_REF_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateAttribute") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateAttribute") //$NON-NLS-1$ ); final static IFormData ATTRIBUTE_DEFINITION = new FormData( @@ -78,16 +79,16 @@ private final static IFormData[] ATTRIBUTE_CONSTRAINT_DEFINITIONS = new IFormData[] { new FormData( - "Constraint", - "", //"Description + Messages.AttributeFormLayoutData_ConstraintDefinitions, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ATTRIBUTE_CONSTRAINT_ENTITY) ), new FormData( - "Items", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.AttributeFormLayoutData_Items, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{CONSTRAINT_ITEM_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateConstraintItem") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateConstraintItem") //$NON-NLS-1$ ), }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/EntityFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/EntityFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/EntityFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -18,42 +19,42 @@ public class EntityFormLayoutData implements MetaConstants { final static IFormData CHILDREN_FOLDER_DEFINITION = new FormData( - "Children", - "", //"Description - "Children", - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.EntityFormLayoutData_ChildrenFolder, + "", //"Description //$NON-NLS-1$ + "Children", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{CHILD_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateChild") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateChild") //$NON-NLS-1$ ); final static IFormData CHILDREN_LIST_DEFINITION = new FormData( - "Children", - "", //"Description + Messages.EntityFormLayoutData_ChildrenList, + "", //"Description //$NON-NLS-1$ CHILDREN_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100)}, + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{CHILD_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateChild") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateChild") //$NON-NLS-1$ ); private final static IFormData[] ENTITY_DEFINITIONS = new IFormData[] { new FormData( - "Entity", - "", //"Description + Messages.EntityFormLayoutData_Entity, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ENTITY_ENTITY) ), CHILDREN_FOLDER_DEFINITION, AttributeFormLayoutData.ATTRIBUTES_FOLDER_DEFINITION, new FormData( - "Action List", - "", //"Description - "ActionList", - new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, + Messages.EntityFormLayoutData_AttributesFolder, + "", //"Description //$NON-NLS-1$ + "ActionList", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ACTION_LIST_ENTITY, ACTION_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ ), new FormData( - "Advanced", - "", //"Description + Messages.EntityFormLayoutData_Advanced, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createAdvancedFormAttributeData(ENTITY_ENTITY) ) }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ExtensionFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ExtensionFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/ExtensionFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -19,18 +20,18 @@ private final static IFormData[] EXTENSION_DEFINITIONS = new IFormData[] { new FormData( - "Entity Extension", - "", //"Description + Messages.ExtensionFormLayoutData_EntityExtension, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(EXTENSION_ENTITY) ), EntityFormLayoutData.CHILDREN_FOLDER_DEFINITION, new FormData( - "Action List", - "", //"Description - "ActionList", - new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, + Messages.ExtensionFormLayoutData_ActionList, + "", //"Description //$NON-NLS-1$ + "ActionList", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 70), new FormAttributeData("element type", 30)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ACTION_LIST_ENTITY, ACTION_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$ ) }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/GroupFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/GroupFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/GroupFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -19,23 +20,23 @@ private final static IFormData[] GROUP_DEFINITIONS = new IFormData[] { new FormData( - "Meta Group", - "", //"Description + Messages.GroupFormLayoutData_MetaGroup, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(GROUP_ENTITY) ), new FormData( - "Entities", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.GroupFormLayoutData_Entities, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{ENTITY_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEntity") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEntity") //$NON-NLS-1$ ), new FormData( - "Extensions", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.GroupFormLayoutData_Extensions, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{EXTENSION_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEntityExtension") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateEntityExtension") //$NON-NLS-1$ ), MappingFormLayoutData.MAPPING_FOLDER_DEFINITION }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/IconFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/IconFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/IconFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -19,23 +20,23 @@ private final static IFormData[] ICON_GROUP_DEFINITIONS = new IFormData[] { new FormData( - "Icon Group", - "", //"Description + Messages.IconFormLayoutData_IconGroup, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(ICON_GROUP_ENTITY) ), new FormData( - "Subgroups", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.IconFormLayoutData_Subgroups, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{ICON_GROUP_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIconGroup") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIconGroup") //$NON-NLS-1$ ), new FormData( - "Icons", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("path", 70)}, + Messages.IconFormLayoutData_Icons, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("path", 70)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{ICON_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIcon") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIcon") //$NON-NLS-1$ ) }; @@ -45,11 +46,11 @@ private final static IFormData[] ICONS_DEFINITIONS = new IFormData[] { new FormData( - "Icon Groups", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.IconFormLayoutData_IconsDefinitions, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{ICON_GROUP_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIconGroup") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateIconGroup") //$NON-NLS-1$ ), }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MappingFormLayoutData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MappingFormLayoutData.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MappingFormLayoutData.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.form; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.forms.FormAttributeData; import org.jboss.tools.common.model.ui.forms.FormData; import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; @@ -18,35 +19,35 @@ public class MappingFormLayoutData implements MetaConstants { final static IFormData MAPPING_FOLDER_DEFINITION = new FormData( - "Mappings", - "", //"Description - "Mappings", - new FormAttributeData[]{new FormAttributeData("name", 100)}, + Messages.MappingFormLayoutData_MappingsFolder, + "", //"Description //$NON-NLS-1$ + "Mappings", //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{MAPPING_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMapping") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMapping") //$NON-NLS-1$ ); final static IFormData MAPPING_LIST_DEFINITION = new FormData( - "Mappings", - "", //"Description + Messages.MappingFormLayoutData_MappingsList, + "", //"Description //$NON-NLS-1$ MAPPINGS_ENTITY, - new FormAttributeData[]{new FormAttributeData("name", 100)}, + new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$ new String[]{MAPPING_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMapping") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateMapping") //$NON-NLS-1$ ); private final static IFormData[] MAPPING_DEFINITIONS = new IFormData[] { new FormData( - "Mapping", - "", //"Description + Messages.MappingFormLayoutData_MappingDefinitions, + "", //"Description //$NON-NLS-1$ FormLayoutDataUtil.createGeneralFormAttributeData(MAPPING_ENTITY) ), new FormData( - "Items", - "", //"Description - new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("value", 70)}, + Messages.MappingFormLayoutData_Items, + "", //"Description //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("name", 30), new FormAttributeData("value", 70)}, //$NON-NLS-1$ //$NON-NLS-2$ new String[]{MAPPING_ITEM_ENTITY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateItem") + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.CreateItem") //$NON-NLS-1$ ) }; Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaConstants.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaConstants.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/form/MetaConstants.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -11,25 +11,25 @@ package org.jboss.tools.common.meta.ui.form; public interface MetaConstants { - String GROUP_ENTITY = "FileMETA"; - String ENTITY_ENTITY = "MetaEntity"; - String EXTENSION_ENTITY = "MetaEntityExtension"; - String CHILDREN_ENTITY = "MetaChildren"; - String CHILD_ENTITY = "MetaChild"; - String ATTRIBUTE_ENTITY = "MetaAttribute"; - String ATTRIBUTE_REF_ENTITY = "MetaAttributeReference"; - String ATTRIBUTES_ENTITY = "MetaAttributes"; - String ACTION_ENTITY = "MetaAction"; - String ACTION_LIST_ENTITY = "MetaActionList"; - String ATTRIBUTE_CONSTRAINT_ENTITY = "MetaAttributeConstraint"; - String CONSTRAINT_ITEM_ENTITY = "MetaConstraintItem"; - String ATTRIBUTE_EDITOR_ENTITY = "MetaAttributeEditor"; - String ENTITY_DATA_ENTITY = "MetaEntityData"; - String ATTRIBUTE_DATA_ENTITY = "MetaAttributeData"; - String MAPPINGS_ENTITY = "MetaMappings"; - String MAPPING_ENTITY = "MetaMapping"; - String MAPPING_ITEM_ENTITY = "MetaMappingItem"; - String ICONS_ENTITY = "MetaIcons"; - String ICON_GROUP_ENTITY = "MetaIconGroup"; - String ICON_ENTITY = "MetaIcon"; + String GROUP_ENTITY = "FileMETA"; //$NON-NLS-1$ + String ENTITY_ENTITY = "MetaEntity"; //$NON-NLS-1$ + String EXTENSION_ENTITY = "MetaEntityExtension"; //$NON-NLS-1$ + String CHILDREN_ENTITY = "MetaChildren"; //$NON-NLS-1$ + String CHILD_ENTITY = "MetaChild"; //$NON-NLS-1$ + String ATTRIBUTE_ENTITY = "MetaAttribute"; //$NON-NLS-1$ + String ATTRIBUTE_REF_ENTITY = "MetaAttributeReference"; //$NON-NLS-1$ + String ATTRIBUTES_ENTITY = "MetaAttributes"; //$NON-NLS-1$ + String ACTION_ENTITY = "MetaAction"; //$NON-NLS-1$ + String ACTION_LIST_ENTITY = "MetaActionList"; //$NON-NLS-1$ + String ATTRIBUTE_CONSTRAINT_ENTITY = "MetaAttributeConstraint"; //$NON-NLS-1$ + String CONSTRAINT_ITEM_ENTITY = "MetaConstraintItem"; //$NON-NLS-1$ + String ATTRIBUTE_EDITOR_ENTITY = "MetaAttributeEditor"; //$NON-NLS-1$ + String ENTITY_DATA_ENTITY = "MetaEntityData"; //$NON-NLS-1$ + String ATTRIBUTE_DATA_ENTITY = "MetaAttributeData"; //$NON-NLS-1$ + String MAPPINGS_ENTITY = "MetaMappings"; //$NON-NLS-1$ + String MAPPING_ENTITY = "MetaMapping"; //$NON-NLS-1$ + String MAPPING_ITEM_ENTITY = "MetaMappingItem"; //$NON-NLS-1$ + String ICONS_ENTITY = "MetaIcons"; //$NON-NLS-1$ + String ICON_GROUP_ENTITY = "MetaIconGroup"; //$NON-NLS-1$ + String ICON_ENTITY = "MetaIcon"; //$NON-NLS-1$ } Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/messages.properties (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/messages.properties 2009-05-28 04:47:10 UTC (rev 15574) @@ -0,0 +1,40 @@ +ActionListFormLayoutData_Action=Action +ActionListFormLayoutData_ActionList=Action List +ActionListFormLayoutData_Advanced=Advanced +ActionListFormLayoutData_EntityData=Entity Data +ActionListFormLayoutData_Items=Items +AttributeFormLayoutData_Advanced=Advanced +AttributeFormLayoutData_Attribute=Attribute +AttributeFormLayoutData_AttributeReference=Attribute Reference +AttributeFormLayoutData_AttributesFolder=Attributes +AttributeFormLayoutData_AttributesList=Attributes +AttributeFormLayoutData_Constraint=Constraint +AttributeFormLayoutData_ConstraintDefinitions=Constraint +AttributeFormLayoutData_Editor=Editor +AttributeFormLayoutData_Items=Items +EntityFormLayoutData_Advanced=Advanced +EntityFormLayoutData_AttributesFolder=Action List +EntityFormLayoutData_ChildrenFolder=Children +EntityFormLayoutData_ChildrenList=Children +EntityFormLayoutData_Entity=Entity +ExtensionFormLayoutData_ActionList=Action List +ExtensionFormLayoutData_EntityExtension=Entity Extension +GroupFormLayoutData_Entities=Entities +GroupFormLayoutData_Extensions=Extensions +GroupFormLayoutData_MetaGroup=Meta Group +IconFormLayoutData_IconGroup=Icon Group +IconFormLayoutData_Icons=Icons +IconFormLayoutData_IconsDefinitions=Icon Groups +IconFormLayoutData_Subgroups=Subgroups +MappingFormLayoutData_Items=Items +MappingFormLayoutData_MappingDefinitions=Mapping +MappingFormLayoutData_MappingsFolder=Mappings +MappingFormLayoutData_MappingsList=Mappings +MetaCompoundEditor_PageTitle=Meta Editor +MetaSearchQuery_Label=Meta Search +MetaSearchResult_Label=Meta Search +MetaSearchResult_MetaSearchTextToFindNMatches=Meta Search - ''{0}'' - {1} matches +MetaSearchResult_Tooltip=Meta Search +MetaSearchResultPage_Label=Meta Search +MetaSearchResultPage_MetaAttributeLabel={0} - entity {1} - {2} +MetaSearchResultPage_TextToFindNMatches="{0}" - {1} matches Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchPage.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchPage.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -58,10 +58,11 @@ } private XEntityData getSearchEntityData() { - String[][] ds = new String[][]{{"SearchValue", "yes"}, - {"text to find", "yes"}, - {"property name", "no"}, - {"ignore case", "no"}}; + // TODO might need to make use of setDisplayName if these strings appear in the UI + String[][] ds = new String[][]{{"SearchValue", "yes"}, //$NON-NLS-1$//$NON-NLS-2$ + {"text to find", "yes"}, //$NON-NLS-1$//$NON-NLS-2$ + {"property name", "no"}, //$NON-NLS-1$//$NON-NLS-2$ + {"ignore case", "no"}}; //$NON-NLS-1$//$NON-NLS-2$ XEntityData d = XEntityDataImpl.create(ds); XAttributeData[] as = d.getAttributeData(); for (int i = 0; i < as.length; i++) { @@ -95,9 +96,9 @@ org.eclipse.search.ui.NewSearchUI.activateSearchResultView(); MetaSearchQuery wsJob = new MetaSearchQuery(); - wsJob.setTextToFind(data.getValue("text to find")); - wsJob.setIgnoreCase("true".equals(data.getValue("ignore case"))); - wsJob.setAttributeMask(data.getValue("property name")); + wsJob.setTextToFind(data.getValue("text to find")); //$NON-NLS-1$ + wsJob.setIgnoreCase("true".equals(data.getValue("ignore case"))); //$NON-NLS-1$ //$NON-NLS-2$ + wsJob.setAttributeMask(data.getValue("property name")); //$NON-NLS-1$ wsJob.setScope(scope); if (forground) { IStatus status= NewSearchUI.runQueryInForeground(getRunnableContext(), wsJob); Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchQuery.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchQuery.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchQuery.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -16,14 +16,15 @@ import org.eclipse.search.ui.*; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; public class MetaSearchQuery implements ISearchQuery { MetaSearchResult result; - String text = "="; + String text = "="; //$NON-NLS-1$ boolean ignoreCase = true; - String attributeMask = "*"; + String attributeMask = "*"; //$NON-NLS-1$ List scope = new ArrayList(); public void setScope(List scope) { @@ -54,7 +55,7 @@ for (int i = 0; i < rs.length; i++) { processResource(rs[i]); } - return new Status(IStatus.OK, "org.jboss.common.meta.ui", 0, "", null); + return new Status(IStatus.OK, "org.jboss.common.meta.ui", 0, "", null); //$NON-NLS-1$//$NON-NLS-2$ } private void processResource(IResource resource) { @@ -65,7 +66,7 @@ if(rs != null) for (int i = 0; i < rs.length; i++) processResource(rs[i]); } else if(resource instanceof IFile) { IFile f = (IFile)resource; - if(!f.getName().endsWith(".meta")) return; + if(!f.getName().endsWith(".meta")) return; //$NON-NLS-1$ XModelObject o = EclipseResourceUtil.getObjectByResource(f); if(o == null) o = EclipseResourceUtil.createObjectForResource(f); if(o == null) return; @@ -78,7 +79,7 @@ for (int i = 0; i < as.length; i++) { if(!as[i].isVisible()) continue; String n = as[i].getName(); - if(!attributeMask.equals("*") && attributeMask.length() > 0 && !attributeMask.equals(n)) continue; + if(!attributeMask.equals("*") && attributeMask.length() > 0 && !attributeMask.equals(n)) continue; //$NON-NLS-1$ String v = o.getAttributeValue(n); if(v == null) continue; if(ignoreCase) { @@ -96,7 +97,7 @@ } public String getLabel() { - return "Meta Search"; + return Messages.MetaSearchQuery_Label; } public boolean canRerun() { Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResult.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResult.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResult.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,9 +10,11 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.search; +import java.text.MessageFormat; import java.util.*; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.search.ui.*; +import org.jboss.tools.common.meta.ui.Messages; public class MetaSearchResult implements ISearchResult { Set listeners = new HashSet(); @@ -35,13 +37,14 @@ public String getLabel() { if(query instanceof MetaSearchQuery) { MetaSearchQuery q = (MetaSearchQuery)query; - return "Meta Search - '" + q.getTextToFind() + "' - " + objects.size() + " matches"; + return MessageFormat.format(Messages.MetaSearchResult_MetaSearchTextToFindNMatches, + q.getTextToFind(), objects.size()); } - return "Meta Search"; + return Messages.MetaSearchResult_Label; } public String getTooltip() { - return "Meta Search"; + return Messages.MetaSearchResult_Tooltip; } public ImageDescriptor getImageDescriptor() { Modified: trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/src/org/jboss/tools/common/meta/ui/search/MetaSearchResultPage.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.meta.ui.search; +import java.text.MessageFormat; + +import org.jboss.tools.common.meta.ui.Messages; import org.jboss.tools.common.model.ui.navigator.NavigatorLabelProvider; import org.eclipse.jface.viewers.*; import org.eclipse.search.ui.*; @@ -75,10 +78,11 @@ ISearchQuery query = search.getQuery(); if(query instanceof MetaSearchQuery) { MetaSearchQuery q = (MetaSearchQuery)query; - return "\"" + q.getTextToFind() + "\"" + " - " + search.getObjects().size() + " matches"; + return MessageFormat.format(Messages.MetaSearchResultPage_TextToFindNMatches, q.getTextToFind(), + search.getObjects().size()); } } - return "Meta Search"; + return Messages.MetaSearchResultPage_Label; } public IPageSite getSite() { @@ -183,15 +187,16 @@ XModelObject o = (XModelObject)element; XModelObject f = o; while(f != null && f.getFileType() == XModelObject.NONE) f = f.getParent(); - String file = f == null ? "" : FileAnyImpl.toFileName(f); + String file = f == null ? "" : FileAnyImpl.toFileName(f); //$NON-NLS-1$ String entity = o.getModelEntity().getName(); - if("MetaEntity".equals(entity)) { - return super.getText(element) + " - " + file; - } else if("MetaAttribute".equals(entity)) { + if("MetaEntity".equals(entity)) { //$NON-NLS-1$ + return super.getText(element) + " - " + file; //$NON-NLS-1$ + } else if("MetaAttribute".equals(entity)) { //$NON-NLS-1$ XModelObject p = o.getParent().getParent(); - return super.getText(element) + " - entity " + p.getPresentationString() + " - " + file; + return MessageFormat.format(Messages.MetaSearchResultPage_MetaAttributeLabel, + super.getText(element), p.getPresentationString(), file); } else { - return super.getText(element) + " - " + file; + return super.getText(element) + " - " + file; //$NON-NLS-1$ } } return super.getText(element); Added: trunk/common/plugins/org.jboss.tools.common.model/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/.settings/org.eclipse.jdt.core.prefs 2009-05-28 04:47:10 UTC (rev 15574) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XAttributeDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XAttributeDataImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XAttributeDataImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -61,12 +61,12 @@ } public void load(Element el) { - attributename = el.getAttribute("AttributeName"); - entityname = ((Element)el.getParentNode()).getAttribute("EntityName"); - String m = el.getAttribute("Mandatory"); - mandatory = "yes".equals(m) || "".equals(m); - m = el.getAttribute("Advanced"); - isAdvanced = "yes".equals(m); + attributename = el.getAttribute("AttributeName"); //$NON-NLS-1$ + entityname = ((Element)el.getParentNode()).getAttribute("EntityName"); //$NON-NLS-1$ + String m = el.getAttribute("Mandatory"); //$NON-NLS-1$ + mandatory = "yes".equals(m) || "".equals(m); //$NON-NLS-1$//$NON-NLS-2$ + m = el.getAttribute("Advanced"); //$NON-NLS-1$ + isAdvanced = "yes".equals(m); //$NON-NLS-1$ } public String getAttributeName() { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XEntityDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XEntityDataImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XEntityDataImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -48,9 +48,9 @@ } public void load(Element el) { - entityname = el.getAttribute("EntityName"); - mandatory = "yes".equals(el.getAttribute("Mandatory")); - Element[] cs = XMetaDataLoader.getChildrenElements(el, "AttributeData"); + entityname = el.getAttribute("EntityName"); //$NON-NLS-1$ + mandatory = "yes".equals(el.getAttribute("Mandatory")); //$NON-NLS-1$ //$NON-NLS-2$ + Element[] cs = XMetaDataLoader.getChildrenElements(el, "AttributeData"); //$NON-NLS-1$ attributes = new XAttributeDataImpl[cs.length]; for (int i = 0; i < cs.length; i++) { attributes[i] = new XAttributeDataImpl(); @@ -65,12 +65,12 @@ public static XEntityDataImpl create(String[][] data) { XEntityDataImpl impl = new XEntityDataImpl(); impl.entityname = data[0][0]; - impl.mandatory = data[0].length > 1 && "yes".equals(data[0][1]); + impl.mandatory = data[0].length > 1 && "yes".equals(data[0][1]); //$NON-NLS-1$ impl.attributes = new XAttributeDataImpl[data.length - 1]; for (int i = 0; i < impl.attributes.length; i++) { impl.attributes[i] = XAttributeDataImpl.create(impl.entityname, data[i + 1][0], - (data[i + 1].length > 1 && "yes".equals(data[i + 1][1]))); + (data[i + 1].length > 1 && "yes".equals(data[i + 1][1]))); //$NON-NLS-1$ } return impl; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XAttributeImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -77,7 +77,7 @@ } public void setDefaultValue(String value) { - m_DefValue = replace(value, "%cr%", "\n"); + m_DefValue = replace(value, "%cr%", "\n"); //$NON-NLS-1$//$NON-NLS-2$ } public boolean isTrimmable() { @@ -125,7 +125,7 @@ } public boolean isFake() { - return "FAKE".equals(m_XMLName); + return "FAKE".equals(m_XMLName); //$NON-NLS-1$ } public void load(Element el){ @@ -144,8 +144,8 @@ setDefaultValue(el.getAttribute(DEFAULT_VALUE)); setXMLName(el.getAttribute(XML_NAME)); loadAdapter(el); - trimmable = !"no".equals(el.getAttribute("TRIM")); - copyable = !"no".equals(el.getAttribute("COPYABLE")); + trimmable = !"no".equals(el.getAttribute("TRIM")); //$NON-NLS-1$//$NON-NLS-2$ + copyable = !"no".equals(el.getAttribute("COPYABLE")); //$NON-NLS-1$//$NON-NLS-2$ loadProperties(el); } @@ -153,27 +153,27 @@ return getName(); } - public static final String LOADER = "loader"; + public static final String LOADER = "loader"; //$NON-NLS-1$ public static final String CONSTRAINT_PREFIX = - "org.jboss.tools.common.meta.constraint.impl.XAttributeConstraint"; + "org.jboss.tools.common.meta.constraint.impl.XAttributeConstraint"; //$NON-NLS-1$ public static final String ATTRIBUTE_PREFIX = - "org.jboss.tools.common.meta.impl.adapters.XAdapter"; + "org.jboss.tools.common.meta.impl.adapters.XAdapter"; //$NON-NLS-1$ public void loadConstraint(Element element) { if(element == null) return; String loader = element.getAttribute(LOADER); if(!XMetaDataLoader.hasAttribute(element, LOADER) || loader.trim().length() == 0) { - loader = ""; + loader = ""; //$NON-NLS-1$ } - if(loader != null && loader.startsWith("%")) { - loader = expand(loader, "AttributeConstraints"); + if(loader != null && loader.startsWith("%")) { //$NON-NLS-1$ + loader = expand(loader, "AttributeConstraints"); //$NON-NLS-1$ } constraint.init(loader, element); } public void loadAdapter(Element element) { String loader = element.getAttribute(LOADER); - if(loader.length() == 0 && getXMLName().length() > 0) loader = "ModelElement"; + if(loader.length() == 0 && getXMLName().length() > 0) loader = "ModelElement"; //$NON-NLS-1$ adapter.init(this, loader, element); loadValueListeners(element); } @@ -239,7 +239,7 @@ adapter = (XAdapter)ModelFeatureFactory.getInstance().createFeatureInstance(clsname); } } catch (ClassCastException e) { - ModelPlugin.getPluginLog().logError("XAttributeImpl:loadAdapter:" + e.getMessage()); + ModelPlugin.getPluginLog().logError("XAttributeImpl:loadAdapter:" + e.getMessage()); //$NON-NLS-1$ } } if(adapter == null) adapter = new XAdapter(); @@ -287,7 +287,7 @@ constraint = (XAttributeConstraint)ModelFeatureFactory.getInstance().createFeatureInstance(clsname); } } catch (ClassCastException e) { - ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" + e.getMessage(), e); + ModelPlugin.getPluginLog().logError("XAttributeImpl:loadConstraint:" + e.getMessage(), e); //$NON-NLS-1$ } if(constraint == null) constraint = new XAttributeConstraintImpl(); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -32,7 +32,7 @@ public final static boolean turnOffDTDCheck = true; public boolean isIncorrect() { - return ("yes".equals(get("isIncorrect"))); + return ("yes".equals(get("isIncorrect"))); //$NON-NLS-1$//$NON-NLS-2$ } public AbstractXMLFileImpl() { @@ -67,16 +67,16 @@ for (int i = 0; i < errors.length; i++) { String er = errors[i]; int q = er.lastIndexOf(':'); - String pos = (q < 0) ? "" : er.substring(q + 1); + String pos = (q < 0) ? "" : er.substring(q + 1); //$NON-NLS-1$ if(q >= 0) er = er.substring(0, q); q = er.lastIndexOf(':'); - String ln = (q < 0) ? "" : er.substring(q + 1), ln1 = ln; + String ln = (q < 0) ? "" : er.substring(q + 1), ln1 = ln; //$NON-NLS-1$ if(q >= 0) er = er.substring(0, q); int iln = -1; try { if(q >= 0 && ln1.length() > 0) { iln = Integer.parseInt(ln1); - ln1 = "" + (iln - 1); + ln1 = "" + (iln - 1); //$NON-NLS-1$ } } catch (NumberFormatException e) { ModelPlugin.getPluginLog().logError(e); @@ -88,17 +88,17 @@ this.errors[i] = ep; } String s = sb.toString(); - if(s.equals(get("errors"))) return; - super.set("incorrectBody", body); - set("errors", s); - setAttributeValue("isIncorrect", (errors.length == 0 && loaderError == null) ? "no" : "yes"); + if(s.equals(get("errors"))) return; //$NON-NLS-1$ + super.set("incorrectBody", body); //$NON-NLS-1$ + set("errors", s); //$NON-NLS-1$ + setAttributeValue("isIncorrect", (errors.length == 0 && loaderError == null) ? "no" : "yes"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ if(!isOverlapped()) markers.update(); } protected boolean isOverlapped() { XModelObject p = getParent(); - while(p != null && !"true".equals(p.get("overlapped"))) p = p.getParent(); + while(p != null && !"true".equals(p.get("overlapped"))) p = p.getParent(); //$NON-NLS-1$ //$NON-NLS-2$ return (p != null); } @@ -109,7 +109,7 @@ } protected String[] getErrors() { if(!isIncorrect()) return new String[0]; - String es = (String)get("errors"); + String es = (String)get("errors"); //$NON-NLS-1$ if(es == null || es.length() == 0) return new String[0]; return errors; } Added: trunk/common/plugins/org.jboss.tools.common.model.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-28 04:47:10 UTC (rev 15574) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -175,7 +175,7 @@ public void initialize(Object model) { this.xmo = (XModelObject)model; if(xmo == null) { - ModelUIPlugin.getPluginLog().logInfo( "Error to create form "+formData.getHeader()+". Model object cannot be null.", new IllegalArgumentException("Parameter cannot be null")); + ModelUIPlugin.getPluginLog().logInfo( "Error to create form "+formData.getHeader()+". Model object cannot be null.", new IllegalArgumentException("Parameter cannot be null")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return; } this.model = xmo.getModel(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -75,9 +75,9 @@ ValueHelper valueHelper = new ValueHelper(); WtpKbConnector wtpKbConnector = valueHelper.getPageConnector(); if(wtpKbConnector == null) return; - Node node = (Node)context.get("node"); - String tagName = "" + context.getProperty("nodeName"); - String attributeName = "" + context.getProperty("attributeName"); + Node node = (Node)context.get("node"); //$NON-NLS-1$ + String tagName = "" + context.getProperty("nodeName"); //$NON-NLS-1$ //$NON-NLS-2$ + String attributeName = "" + context.getProperty("attributeName"); //$NON-NLS-1$ //$NON-NLS-2$ String currentValue = text; String strippedValue = null; String matchString = null; @@ -85,7 +85,7 @@ matchString = currentValue.substring(0, offset); strippedValue = currentValue; - String elProposalPrefix = ""; + String elProposalPrefix = ""; //$NON-NLS-1$ ELParser p = ELParserUtil.getJbossFactory().createParser(); ELModel model = p.parse(matchString); @@ -144,13 +144,13 @@ } if(is1 == null || is1.getCloseInstanceToken() == null) { - replacementString += "}"; + replacementString += "}"; //$NON-NLS-1$ } int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; String displayString = elProposalPrefix == null || elProposalPrefix.length() == 0 ? kbProposal.getReplacementString().substring(2,kbProposal.getReplacementString().length() - 1) : - elProposalPrefix + kbProposal.getReplacementString().substring(2,kbProposal.getReplacementString().length() - 1) + "}" ; + elProposalPrefix + kbProposal.getReplacementString().substring(2,kbProposal.getReplacementString().length() - 1) + "}" ; //$NON-NLS-1$ Image image = kbProposal.hasImage() ? kbProposal.getImage() : Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -19,7 +19,7 @@ public class CssReferencesComposite extends VpeResourceReferencesComposite { protected String getEntity() { - return (file != null) ? "VPECSSReference" : "VPECSSReferenceExt"; + return (file != null) ? "VPECSSReference" : "VPECSSReferenceExt"; //$NON-NLS-1$ //$NON-NLS-2$ } protected ResourceReferencesTableProvider createTableProvider(List dataList) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2009-05-27 23:26:39 UTC (rev 15573) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2009-05-28 04:47:10 UTC (rev 15574) @@ -34,7 +34,7 @@ */ @Override protected String getEntity() { - return "VPEElReference"; + return "VPEElReference"; //$NON-NLS-1$ } /**c