Author: scabanovich Date: 2009-04-06 11:42:17 -0400 (Mon, 06 Apr 2009) New Revision: 14522 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.properties Log: JBIDE-4044 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java 2009-04-06 15:32:12 UTC (rev 14521) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditor.java 2009-04-06 15:42:17 UTC (rev 14522) @@ -356,14 +356,12 @@ List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); ToolEntry tool = new SelectionToolEntry(); - tool.setDescription(TilesEditorMessages - .getString("TilesDiagram.select")); //$NON-NLS-1$ + tool.setDescription(TilesEditorMessages.TilesDiagram_select); entries.add(tool); root.setDefaultEntry(tool); tool = new MarqueeToolEntry(); - tool.setDescription(TilesEditorMessages - .getString("TilesDiagram.marquee")); //$NON-NLS-1$ + tool.setDescription(TilesEditorMessages.TilesDiagram_marquee); entries.add(tool); PaletteSeparator sep = new PaletteSeparator("separator"); //$NON-NLS-1$ @@ -372,10 +370,8 @@ entries.add(sep); //$NON-NLS-1$ connectionCreationTool = new GEFConnectionCreationToolEntry( - TilesEditorMessages - .getString("TilesDiagram.create-new-connection"), //$NON-NLS-1$ - TilesEditorMessages - .getString("TilesDiagram.create-new-connection"), //$NON-NLS-1$ + TilesEditorMessages.TilesDiagram_create_new_connection, + TilesEditorMessages.TilesDiagram_create_new_connection, null, ImageDescriptor.createFromFile(TilesEditor.class, "icons/new_transition.gif"),//$NON-NLS-1$ null//$NON-NLS-1$ @@ -390,10 +386,8 @@ entries.add(sep); CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - TilesEditorMessages - .getString("TilesDiagram.defenition-template"), //$NON-NLS-1$ - TilesEditorMessages - .getString("TilesDiagram.defenition-template"), //$NON-NLS-1$ + TilesEditorMessages.TilesDiagram_defenition_template, + TilesEditorMessages.TilesDiagram_defenition_template, TemplateConstants.TEMPLATE_DEFINITION, new SimpleFactory( String.class), ImageDescriptor.createFromFile( TilesEditor.class, "icons/new_definition.gif"), //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java 2009-04-06 15:32:12 UTC (rev 14521) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.java 2009-04-06 15:42:17 UTC (rev 14522) @@ -13,6 +13,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin; /** @@ -23,22 +24,20 @@ */ public class TilesEditorMessages { - private static final String RESOURCE_BUNDLE= "org.jboss.tools.jst.web.tiles.ui.editor.TilesEditorMessages"; + private static final String BUNDLE_NAME= "org.jboss.tools.jst.web.tiles.ui.editor.TilesEditorMessages"; + + public static String TilesDiagram_select; + + public static String TilesDiagram_marquee; + + public static String TilesDiagram_create_new_connection; + + public static String TilesDiagram_defenition_template; - private static ResourceBundle resourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE); - private TilesEditorMessages() {} - - public static String getString(String key) { - try { - return resourceBundle.getString(key); - } catch (MissingResourceException e) { - TilesUIPlugin.getPluginLog().logError(e); - return "%" + key + "%"; - } + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, TilesEditorMessages.class); } - - public static ResourceBundle getResourceBundle() { - return resourceBundle; - } + } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.properties 2009-04-06 15:32:12 UTC (rev 14521) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesEditorMessages.properties 2009-04-06 15:42:17 UTC (rev 14522) @@ -1,174 +1,8 @@ ##### # TilesDiagram ##### -TilesDiagram.select = Select -TilesDiagram.marquee = Marquee -TilesDiagram.create-new-connection = Create New Connection -TilesDiagram.defenition-template = Definition Template +TilesDiagram_select = Select +TilesDiagram_marquee = Marquee +TilesDiagram_create_new_connection = Create New Connection +TilesDiagram_defenition_template = Definition Template -##### -# TilesConfigDescriptionForm -##### - -TilesConfigDescriptionForm.description = Description description description -TilesConfigDescriptionForm.header = Tiles Config Description - -TilesConfigDescriptionForm.name.label = Name -TilesConfigDescriptionForm.name.attribute = name - -TilesConfigDescriptionForm.encoding.label = Encoding -TilesConfigDescriptionForm.encoding.attribute = encoding - -##### -# TilesDefinitionsForm -##### - -TilesDefinitionsForm.description = Description description description -TilesDefinitionsForm.header = Definitions - -##### -# BasicDefinitionForm -##### - -BasicDefinitionForm.description = Description description description -BasicDefinitionForm.header = Basic - -BasicDefinitionForm.name.label = Name -BasicDefinitionForm.name.attribute = name - -BasicDefinitionForm.extends.label = Extends -BasicDefinitionForm.extends.attribute = extends - -BasicDefinitionForm.path.label = Path -BasicDefinitionForm.path.attribute = path - -BasicDefinitionForm.controllerClass.label = Controller Class -BasicDefinitionForm.controllerClass.attribute = controllerClass - -BasicDefinitionForm.controllerUrl.label = Controller URL -BasicDefinitionForm.controllerUrl.attribute = controllerUrl - -##### -# AdvancedDefinitionForm -##### - -AdvancedDefinitionForm.description = Description description description -AdvancedDefinitionForm.header = Advanced - -AdvancedDefinitionForm.id.label = Id -AdvancedDefinitionForm.id.attribute = id - -AdvancedDefinitionForm.displayname.label = Display Name -AdvancedDefinitionForm.displayname.attribute = display-name - -AdvancedDefinitionForm.description.label = Description -AdvancedDefinitionForm.description.attribute = description - -AdvancedDefinitionForm.role.label = Role -AdvancedDefinitionForm.role.attribute = role - -AdvancedDefinitionForm.smallicon.label = Small Icon -AdvancedDefinitionForm.smallicon.attribute = small-icon - -AdvancedDefinitionForm.largeicon.label = Large Icon -AdvancedDefinitionForm.largeicon.attribute = large-icon - -##### -# DeprecatedDefinitionForm -##### - -DeprecatedDefinitionForm.description = Description description description -DeprecatedDefinitionForm.header = Deprecated - -DeprecatedDefinitionForm.page.label = Page -DeprecatedDefinitionForm.page.attribute = page - -DeprecatedDefinitionForm.template.label = Template -DeprecatedDefinitionForm.template.attribute = template - -##### -# PutsForm -##### - -PutsForm.description = Description description description -PutsForm.header = Put - -##### -# PutListsForm -##### - -PutListsForm.description = Description description description -PutListsForm.header = Put List - -##### -# BasicPutForm -##### - -BasicPutForm.description = Description description description -BasicPutForm.header = Basic - -BasicPutForm.name.label = Name -BasicPutForm.name.attribute = name - -BasicPutForm.type.label = Type -BasicPutForm.type.attribute = type - -BasicPutForm.value.label = Value -BasicPutForm.value.attribute = value - -BasicPutForm.content.label = Content -BasicPutForm.content.attribute = save value as 'content' attr - -##### -# AdvancedPutForm -##### - -AdvancedPutForm.description = Description description description -AdvancedPutForm.header = Advanced - -AdvancedPutForm.id.label = Id -AdvancedPutForm.id.attribute = id - -##### -# DeprecatedPutForm -##### - -DeprecatedPutForm.description = Description description description -DeprecatedPutForm.header = Deprecated - -DeprecatedPutForm.direct.label = Direct -DeprecatedPutForm.direct.attribute = direct - -##### -# PutListForm -##### - -PutListForm.description = Description description description -PutListForm.header = Attributes - -PutListForm.name.label = Name -PutListForm.name.attribute = name - -PutListForm.id.label = Id -PutListForm.id.attribute = id - -##### -# AddForm -##### - -AddForm.description = Description description description -AddForm.header = Add - -##### -# ItemForm -##### - -ItemForm.description = Description description description -ItemForm.header = Item - -##### -# BeanForm -##### - -BeanForm.description = Description description description -BeanForm.header = Bean \ No newline at end of file