[jbosstools-commits] JBoss Tools SVN: r8544 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view: views and 1 other directory.

Author: vyemialyanchyk Date: 2008-06-04 10:29:48 -0400 (Wed, 04 Jun 2008) New Revision: 8544 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/messages.properties Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/BaseUIPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/StatusFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ContentProviderVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/BaseUIPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/BaseUIPlugin.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/BaseUIPlugin.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -65,6 +65,6 @@ logError(message, t); Shell shell = Display.getDefault().getActiveShell(); IStatus s = StatusFactory.getInstance(IStatus.ERROR, this.getBundle().getSymbolicName(), message, t); - ErrorDialog.openError(shell, "Hibernate Console", message, s); + ErrorDialog.openError(shell, Messages.BASEUIPLUGIN_HIBERNATE_CONSOLE, message, s); } } \ No newline at end of file Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/Messages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/Messages.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -0,0 +1,16 @@ +package org.jboss.tools.hibernate.ui.view; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.view.messages"; //$NON-NLS-1$ + public static String BASEUIPLUGIN_HIBERNATE_CONSOLE; + public static String VIEWPLUGIN_CANOT_LOAD_PREFERENCE_STORE_PROPERTIES; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/StatusFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/StatusFactory.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/StatusFactory.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -16,8 +16,8 @@ public class StatusFactory { public final static int UNDEFINED_ERROR = 0; public final static String UNSPECIFIED_MESSAGE = null; - public final static String EMPTY_MESSAGE = ""; - public final static String EMPTY_PLUGIN = ""; + public final static String EMPTY_MESSAGE = ""; //$NON-NLS-1$ + public final static String EMPTY_PLUGIN = ""; //$NON-NLS-1$ public static IStatus getInstance(int severity, String pluginId, int code, String message, Throwable t) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -39,30 +39,30 @@ private static ViewPlugin plugin; private ResourceBundle resourceBundle; - public static final ResourceBundle BUNDLE_IMAGE = ResourceBundle.getBundle(ViewPlugin.class.getPackage().getName() + ".image"); + public static final ResourceBundle BUNDLE_IMAGE = ResourceBundle.getBundle(ViewPlugin.class.getPackage().getName() + ".image"); //$NON-NLS-1$ public static boolean TRACE = false; public static boolean TRACE_VIEW = false; public static boolean TRACE_WIZARD = false; - public static final String PLUGIN_ID = "org.jboss.tools.hibernate.view"; - public static final String autoMappingSettingPrefPage = "autoMappingSettingPrefPage"; + public static final String PLUGIN_ID = "org.jboss.tools.hibernate.view"; //$NON-NLS-1$ + public static final String autoMappingSettingPrefPage = "autoMappingSettingPrefPage"; //$NON-NLS-1$ public ViewPlugin() { super(); plugin = this; try { - resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".EditPluginResources"); + resourceBundle = ResourceBundle.getBundle(PLUGIN_ID + ".EditPluginResources"); //$NON-NLS-1$ } catch (MissingResourceException x) { resourceBundle = null; } } public static ImageDescriptor getImageDescriptor(String name) { - String iconPath = "images/"; + String iconPath = "images/"; //$NON-NLS-1$ try { - URL installURL = getDefault().getBundle().getEntry("/");; + URL installURL = getDefault().getBundle().getEntry("/");; //$NON-NLS-1$ URL url = new URL(installURL, iconPath + name); return ImageDescriptor.createFromURL(url); } catch (MalformedURLException e) { @@ -115,14 +115,14 @@ static { - String value = Platform.getDebugOption(PLUGIN_ID + "/debug"); - if (value != null && value.equalsIgnoreCase("true")) TRACE = true; + String value = Platform.getDebugOption(PLUGIN_ID + "/debug"); //$NON-NLS-1$ + if (value != null && value.equalsIgnoreCase("true")) TRACE = true; //$NON-NLS-1$ - value = Platform.getDebugOption(PLUGIN_ID + "/debug/view"); - if (value != null && value.equalsIgnoreCase("true")) TRACE_VIEW = true; + value = Platform.getDebugOption(PLUGIN_ID + "/debug/view"); //$NON-NLS-1$ + if (value != null && value.equalsIgnoreCase("true")) TRACE_VIEW = true; //$NON-NLS-1$ - value = Platform.getDebugOption(PLUGIN_ID + "/debug/view/wizard"); - if (value != null && value.equalsIgnoreCase("true")) TRACE_WIZARD = true; + value = Platform.getDebugOption(PLUGIN_ID + "/debug/view/wizard"); //$NON-NLS-1$ + if (value != null && value.equalsIgnoreCase("true")) TRACE_WIZARD = true; //$NON-NLS-1$ } @@ -134,7 +134,7 @@ try { properties.load(bain); } catch (IOException e) { - getDefault().logError("Can't load preference store propertyes", e); + getDefault().logError(Messages.VIEWPLUGIN_CANOT_LOAD_PREFERENCE_STORE_PROPERTIES, e); } } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/messages.properties 2008-06-04 14:29:48 UTC (rev 8544) @@ -0,0 +1,2 @@ +BASEUIPLUGIN_HIBERNATE_CONSOLE=Hibernate Console +VIEWPLUGIN_CANOT_LOAD_PREFERENCE_STORE_PROPERTIES=Can't load preference store properties Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ContentProviderVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ContentProviderVisitor.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ContentProviderVisitor.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -19,7 +19,7 @@ private static final Object[] nullChildren = new Object[0]; - private ResourceBundle BUNDLE = ResourceBundle.getBundle(ContentProviderVisitor.class.getPackage().getName() + ".views"); + private ResourceBundle BUNDLE = ResourceBundle.getBundle(ContentProviderVisitor.class.getPackage().getName() + ".views"); //$NON-NLS-1$ public Object visitDatabaseColumn(Column column, Object argument) { return null; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -5,13 +5,12 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.RootClass; import org.hibernate.mapping.Table; public class HibernateUtils { public static String getTableName(String catalog, String schema, String name) { - return (catalog != null ? catalog + "." : "") + (schema != null ? schema + "." : "") + name; + return (catalog != null ? catalog + "." : "") + (schema != null ? schema + "." : "") + name; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } public static String getTableName(Table table) { @@ -20,7 +19,7 @@ public static String getPersistentClassName(PersistentClass rootClass) { if (rootClass == null) { - return ""; + return ""; //$NON-NLS-1$ } else { return rootClass.getEntityName() != null ? rootClass.getEntityName() : rootClass.getClassName(); } @@ -28,9 +27,9 @@ public static String getPersistentClassName(String className) { if (className == null) { - return ""; - } else if (className.indexOf(".") < 0) { - return "default." + className; + return ""; //$NON-NLS-1$ + } else if (className.indexOf(".") < 0) { //$NON-NLS-1$ + return "default." + className; //$NON-NLS-1$ } return className; } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/Messages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/Messages.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -0,0 +1,17 @@ +package org.jboss.tools.hibernate.ui.view.views; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.view.views.messages"; //$NON-NLS-1$ + public static String ORMLABELPROVIDER_ELEMENT; + public static String ORMLABELPROVIDER_ORM_ELEMENT; + public static String ORMLABELPROVIDER_UNKNOWN_TYPE_OF_ELEMENT_IN_TREE_OF_TYPE; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -50,7 +50,7 @@ public String getName() { - return ""; + return ""; //$NON-NLS-1$ } @@ -60,7 +60,7 @@ public String getToolTipText() { - return ""; + return ""; //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -84,12 +84,12 @@ } RootClass[] rcArr = new RootClass[setPC.size()]; - String id = ""; + String id = ""; //$NON-NLS-1$ PersistentClass persClass = null; int i = 0; for (Iterator it = setPC.iterator(); it.hasNext(); ) { persClass = (PersistentClass)it.next(); - id += "@" + persClass.toString(); + id += "@" + persClass.toString(); //$NON-NLS-1$ rcArr[i++] = persClass.getRootClass(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -168,7 +168,7 @@ } private String saveSelection() { - String selectionElementQualifiedName = ""; + String selectionElementQualifiedName = ""; //$NON-NLS-1$ ISelection selection = viewer.getSelection(); if (!selection.isEmpty()) { TreeItem[] selectionTreeItems = viewer.getTree().getSelection(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -98,42 +98,42 @@ if (element instanceof RootClass) { String name = (String)ormModelNameVisitor.visitPersistentClass((RootClass)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof Table) { String name = (String)ormModelNameVisitor.visitTable((Table)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof Subclass) { String name = (String)ormModelNameVisitor.visitPersistentClass((Subclass)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof Property) { String name = (String)ormModelNameVisitor.visitPersistentField((Property)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof Column) { String name = (String)ormModelNameVisitor.visitDatabaseColumn((Column)element, cfg); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof OneToMany || element instanceof ManyToOne) { - String name = "element"; + String name = Messages.ORMLABELPROVIDER_ELEMENT; if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } @@ -141,19 +141,19 @@ if (element instanceof DependantValue) { String name = (String)ormModelNameVisitor.visitCollectionKeyMapping((DependantValue)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else if (element instanceof Component) { String name = (String)ormModelNameVisitor.visitComponentMapping((Component)element, null); if (name == null) { - return "OrmElement"; + return Messages.ORMLABELPROVIDER_ORM_ELEMENT; } else { return name; } } else { - return "element"; + return Messages.ORMLABELPROVIDER_ELEMENT; // throw unknownElement(element); } } else if (element instanceof String){ @@ -166,8 +166,8 @@ protected RuntimeException unknownElement(Object element) { if (element != null && element.getClass() != null ) - return new RuntimeException("Unknown type of element in tree of type: " + element.getClass().getName()); - else return new RuntimeException("Unknown type of element in tree of type: " + element); + return new RuntimeException(Messages.ORMLABELPROVIDER_UNKNOWN_TYPE_OF_ELEMENT_IN_TREE_OF_TYPE + element.getClass().getName()); + else return new RuntimeException(Messages.ORMLABELPROVIDER_UNKNOWN_TYPE_OF_ELEMENT_IN_TREE_OF_TYPE + element); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -53,13 +53,13 @@ public Object visitDatabaseColumn(Column column) { if (column.isUnique()) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); + .getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); //$NON-NLS-1$ } else if (HibernateUtils.isPrimaryKey(column) && HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)) { return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); + .getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); //$NON-NLS-1$ } else if (HibernateUtils.isPrimaryKey(column)) { return ViewPlugin .getImageDescriptor(BUNDLE @@ -80,30 +80,30 @@ if (field.getPersistentClass() != null && field.getPersistentClass().getVersion() == field) { return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldSimple_version")); + .getString("OrmModelImageVisitor.PersistentFieldSimple_version")); //$NON-NLS-1$ } if (field.getPersistentClass() != null && field.getPersistentClass().getIdentifierProperty() == field) { return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldSimple_id")); + .getString("OrmModelImageVisitor.PersistentFieldSimple_id")); //$NON-NLS-1$ } if (field.getValue() != null) { if (field.getValue() instanceof OneToMany) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); + .getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); //$NON-NLS-1$ else if (field.getValue() instanceof OneToOne) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldOne-to-one")); + .getString("OrmModelImageVisitor.PersistentFieldOne-to-one")); //$NON-NLS-1$ else if (field.getValue() instanceof ManyToOne) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); + .getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); //$NON-NLS-1$ else if (field.getValue() instanceof Any) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldAny")); + .getString("OrmModelImageVisitor.PersistentFieldAny")); //$NON-NLS-1$ try { if (field.getType() != null @@ -111,77 +111,77 @@ if (field.getValue() instanceof PrimitiveArray) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_primitive_array")); + .getString("OrmModelImageVisitor.Collection_primitive_array")); //$NON-NLS-1$ else if (field.getValue() instanceof Array) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_array")); + .getString("OrmModelImageVisitor.Collection_array")); //$NON-NLS-1$ else if (field.getValue() instanceof List) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_list")); + .getString("OrmModelImageVisitor.Collection_list")); //$NON-NLS-1$ else if (field.getValue() instanceof Set) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_set")); + .getString("OrmModelImageVisitor.Collection_set")); //$NON-NLS-1$ else if (field.getValue() instanceof Map) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_map")); + .getString("OrmModelImageVisitor.Collection_map")); //$NON-NLS-1$ else if (field.getValue() instanceof Bag) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_bag")); + .getString("OrmModelImageVisitor.Collection_bag")); //$NON-NLS-1$ else if (field.getValue() instanceof IdentifierBag) return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection_idbag")); + .getString("OrmModelImageVisitor.Collection_idbag")); //$NON-NLS-1$ else return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.Collection")); + .getString("OrmModelImageVisitor.Collection")); //$NON-NLS-1$ } } catch (Exception e) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); + .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ } } - if("parent".equals(field.getName())) + if("parent".equals(field.getName())) //$NON-NLS-1$ return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldParent")); + .getString("OrmModelImageVisitor.PersistentFieldParent")); //$NON-NLS-1$ } return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldSimple")); + .getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ } public Object visitManyToOneMapping(ManyToOne field) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); + .getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); //$NON-NLS-1$ } public Object visitOneToManyMapping(OneToMany field) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); + .getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); //$NON-NLS-1$ } public Object visitSimpleValueMapping(SimpleValue field) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldSimple")); + .getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ } public Object visitAnyMapping(Any field) { return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldMany-to-any")); + .getString("OrmModelImageVisitor.PersistentFieldMany-to-any")); //$NON-NLS-1$ } public Object visitComponentMapping(Component mapping) { if (mapping != null) { return ViewPlugin .getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldComponent")); + .getString("OrmModelImageVisitor.PersistentFieldComponent")); //$NON-NLS-1$ } return ViewPlugin.getImageDescriptor(BUNDLE - .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); + .getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ } public Object visitComponentKeyMapping(DependantValue mapping) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -35,12 +35,12 @@ public class OrmModelNameVisitor /*implements IOrmModelVisitor*/ { - static private String SPACE = " "; - static private String POINTER = " -> "; + static private String SPACE = " "; //$NON-NLS-1$ + static private String POINTER = " -> "; //$NON-NLS-1$ private ResourceBundle BUNDLE = ResourceBundle .getBundle(OrmModelNameVisitor.class.getPackage().getName() - + ".views"); + + ".views"); //$NON-NLS-1$ public OrmModelNameVisitor() { super(); @@ -57,14 +57,14 @@ name.append(column.getName()); if (type != null) { - name.append(" ["); - name.append(type != null ? type.toUpperCase() : ""); - name.append(column.isNullable() ? " Nullable" : ""); + name.append(" ["); //$NON-NLS-1$ + name.append(type != null ? type.toUpperCase() : ""); //$NON-NLS-1$ + name.append(column.isNullable() ? " Nullable" : ""); //$NON-NLS-1$ //$NON-NLS-2$ name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); + && HibernateUtils.isPrimaryKey(column) ? " PK" : ""); //$NON-NLS-1$ //$NON-NLS-2$ name.append(HibernateUtils.getTable(column) != null - && HibernateUtils.isForeignKey(column) ? " FK" : ""); - name.append("]"); + && HibernateUtils.isForeignKey(column) ? " FK" : ""); //$NON-NLS-1$ //$NON-NLS-2$ + name.append("]"); //$NON-NLS-1$ } return name.toString(); @@ -183,8 +183,8 @@ public Object visitPersistentField(Property field, Object argument) { StringBuffer name = new StringBuffer(); name.append(field.getName()); - name.append(" "); - name.append(BUNDLE.getString("OrmModelNameVisitor.Colon")); + name.append(" "); //$NON-NLS-1$ + name.append(BUNDLE.getString("OrmModelNameVisitor.Colon")); //$NON-NLS-1$ String typeString = null; try { @@ -209,7 +209,7 @@ if (value != null){ typeName = (String) value.accept(new TypeNameValueVisitor(false)); if (typeName!=null) { - return field.getName() + " : " + typeName; + return field.getName() + " : " + typeName; //$NON-NLS-1$ } } return field.getName(); @@ -217,28 +217,28 @@ private String correctTypeString(String str) { String ret = str; - while (ret.startsWith("[")) { - ret = ret.substring(1).concat("[]"); + while (ret.startsWith("[")) { //$NON-NLS-1$ + ret = ret.substring(1).concat("[]"); //$NON-NLS-1$ } switch (ret.toCharArray()[0]) { - case 'Z': ret = "boolean".concat(ret.substring(1));break; - case 'B': ret = "byte".concat(ret.substring(1));break; - case 'C': ret = "char".concat(ret.substring(1));break; + case 'Z': ret = "boolean".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'B': ret = "byte".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'C': ret = "char".concat(ret.substring(1));break; //$NON-NLS-1$ case 'L': ret = ret.substring(1);break; - case 'D': ret = "double".concat(ret.substring(1));break; - case 'F': ret = "float".concat(ret.substring(1));break; - case 'I': ret = "int".concat(ret.substring(1));break; - case 'J': ret = "long".concat(ret.substring(1));break; - case 'S': ret = "short".concat(ret.substring(1));break; + case 'D': ret = "double".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'F': ret = "float".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'I': ret = "int".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'J': ret = "long".concat(ret.substring(1));break; //$NON-NLS-1$ + case 'S': ret = "short".concat(ret.substring(1));break; //$NON-NLS-1$ } return ret; } public Object visitCollectionKeyMapping(DependantValue mapping, Object argument) { - return "key"; + return "key"; //$NON-NLS-1$ } public Object visitComponentMapping(Component mapping, Object argument) { - return "element"; + return "element"; //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java 2008-06-04 14:24:17 UTC (rev 8543) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java 2008-06-04 14:29:48 UTC (rev 8544) @@ -21,8 +21,7 @@ public class ViewsAction { static ActionOrmTree openEditorAction; - static private ResourceBundle BUNDLE_IMAGE = ViewPlugin.BUNDLE_IMAGE; - static private ResourceBundle BUNDLE = ResourceBundle.getBundle(ViewsAction.class.getPackage().getName() + ".views"); + static private ResourceBundle BUNDLE = ResourceBundle.getBundle(ViewsAction.class.getPackage().getName() + ".views"); //$NON-NLS-1$ static { openEditorAction = new ActionOrmTree() { @@ -34,13 +33,13 @@ hashMap.put(this.getViewer().getTree().getSelection()[0].getData(), input); } try { - IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor"); + IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor"); //$NON-NLS-1$ } catch (PartInitException e) { ViewPlugin.getDefault().logError(e); } } }; - openEditorAction.setText(BUNDLE.getString("Explorer.OpenEditorActionName")); - openEditorAction.setToolTipText(BUNDLE.getString("Explorer.OpenEditorActionToolTipText")); + openEditorAction.setText(BUNDLE.getString("Explorer.OpenEditorActionName")); //$NON-NLS-1$ + openEditorAction.setToolTipText(BUNDLE.getString("Explorer.OpenEditorActionToolTipText")); //$NON-NLS-1$ } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/messages.properties 2008-06-04 14:29:48 UTC (rev 8544) @@ -0,0 +1,3 @@ +ORMLABELPROVIDER_ELEMENT=element +ORMLABELPROVIDER_ORM_ELEMENT=OrmElement +ORMLABELPROVIDER_UNKNOWN_TYPE_OF_ELEMENT_IN_TREE_OF_TYPE=Unknown type of element in tree of type: