Author: vyemialyanchyk Date: 2008-06-06 12:51:51 -0400 (Fri, 06 Jun 2008) New Revision: 8616 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.properties Removed: 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/ViewPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.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-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/BaseUIPlugin.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.hibernate.ui.view; import org.eclipse.core.runtime.IStatus; @@ -18,11 +18,11 @@ /** * Provides an easy way to log status of events. - * + * * NOTE: It is useful to make the static method getPluginLog() * which provides the interface IPluginLog for using it in your code * in future - * + * * @author Sergey Vasilyev * */ @@ -44,7 +44,7 @@ public void logInfo(String message, Throwable t) { LogHelper.logInfo(this, message, t); } - + public void logInfo(String message) { LogHelper.logInfo(this, message); } @@ -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, Messages.BASEUIPLUGIN_HIBERNATE_CONSOLE, message, s); + ErrorDialog.openError(shell, UIViewMessages.BaseUIPlugin_hibernate_console, message, s); } } \ No newline at end of file Deleted: 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 2008-06-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/Messages.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -1,16 +0,0 @@ -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() { - } -} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java (from rev 8544, 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/UIViewMessages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -0,0 +1,19 @@ +package org.jboss.tools.hibernate.ui.view; + +import org.eclipse.osgi.util.NLS; + +public class UIViewMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.view.UIViewMessages"; //$NON-NLS-1$ + public static String BaseUIPlugin_hibernate_console; + public static String ViewPlugin_canot_load_preference_store_properties; + 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, UIViewMessages.class); + } + + private UIViewMessages() { + } +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.properties (from rev 8544, 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/UIViewMessages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.properties 2008-06-06 16:51:51 UTC (rev 8616) @@ -0,0 +1,6 @@ +BaseUIPlugin_hibernate_console=Hibernate Console +ViewPlugin_canot_load_preference_store_properties=Can't load preference store properties + +OrmLabelProvider_element=element +OrmLabelProvider_orm_element=OrmElement +OrmLabelProvider_unknown_type_of_element_in_tree_of_type=Unknown type of element in tree of type: 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-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -38,20 +38,20 @@ public class ViewPlugin extends BaseUIPlugin { private static ViewPlugin plugin; private ResourceBundle resourceBundle; - + 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_VIEW = false; public static boolean TRACE_WIZARD = false; - + 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"); //$NON-NLS-1$ } catch (MissingResourceException x) { @@ -69,7 +69,7 @@ return ImageDescriptor.getMissingImageDescriptor(); } } - + public void start(BundleContext context) throws Exception { super.start(context); } @@ -94,48 +94,48 @@ public ResourceBundle getResourceBundle() { return resourceBundle; } - + public static Shell getActiveWorkbenchShell() { IWorkbenchWindow window = getActiveWorkbenchWindow(); if (window != null) { return window.getShell(); } return null; - } + } public static IWorkbenchWindow getActiveWorkbenchWindow() { return getDefault().getWorkbench().getActiveWorkbenchWindow(); } - + public static IWorkbenchPage getPage(){ IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); return window.getActivePage(); } - + static { - + 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"); //$NON-NLS-1$ if (value != null && value.equalsIgnoreCase("true")) TRACE_VIEW = true; //$NON-NLS-1$ - + value = Platform.getDebugOption(PLUGIN_ID + "/debug/view/wizard"); //$NON-NLS-1$ if (value != null && value.equalsIgnoreCase("true")) TRACE_WIZARD = true; //$NON-NLS-1$ - + } - + public static void loadPreferenceStoreProperties(Properties properties, String key){ IPreferenceStore preferenceStore = ViewPlugin.getDefault().getPreferenceStore(); String value = preferenceStore.getString(key); if (value.length() != 0){ - ByteArrayInputStream bain = new ByteArrayInputStream(value.getBytes()); + ByteArrayInputStream bain = new ByteArrayInputStream(value.getBytes()); try { properties.load(bain); } catch (IOException e) { - getDefault().logError(Messages.VIEWPLUGIN_CANOT_LOAD_PREFERENCE_STORE_PROPERTIES, e); + getDefault().logError(UIViewMessages.ViewPlugin_canot_load_preference_store_properties, e); } } - } + } } \ No newline at end of file Deleted: 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 2008-06-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/messages.properties 2008-06-06 16:51:51 UTC (rev 8616) @@ -1,2 +0,0 @@ -BASEUIPLUGIN_HIBERNATE_CONSOLE=Hibernate Console -VIEWPLUGIN_CANOT_LOAD_PREFERENCE_STORE_PROPERTIES=Can't load preference store properties Deleted: 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 2008-06-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/Messages.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -1,17 +0,0 @@ -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/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2008-06-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2008-06-06 16:51:51 UTC (rev 8616) @@ -38,6 +38,7 @@ import org.hibernate.mapping.Subclass; import org.hibernate.mapping.Table; import org.hibernate.mapping.UnionSubclass; +import org.jboss.tools.hibernate.ui.view.UIViewMessages; public class OrmLabelProvider extends LabelProvider implements IColorProvider, IFontProvider { @@ -48,12 +49,12 @@ public OrmLabelProvider(OrmModelImageVisitor imageVisitor, OrmModelNameVisitor nameVisitor) { super(); ormModelImageVisitor = imageVisitor; - ormModelNameVisitor = nameVisitor; + ormModelNameVisitor = nameVisitor; } - + public Image getImage(Object element) { ImageDescriptor descriptor = null; - + if (element instanceof RootClass) { descriptor = (ImageDescriptor) ((RootClass) element).accept(ormModelImageVisitor); } else if (element instanceof UnionSubclass) { @@ -83,7 +84,7 @@ } else if (element instanceof SimpleValue) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitSimpleValueMapping((SimpleValue) element); } else { - return null; + return null; } Image image = (Image) imageCache.get(descriptor); @@ -98,42 +99,42 @@ if (element instanceof RootClass) { String name = (String)ormModelNameVisitor.visitPersistentClass((RootClass)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof Table) { String name = (String)ormModelNameVisitor.visitTable((Table)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof Subclass) { String name = (String)ormModelNameVisitor.visitPersistentClass((Subclass)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof Property) { String name = (String)ormModelNameVisitor.visitPersistentField((Property)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof Column) { String name = (String)ormModelNameVisitor.visitDatabaseColumn((Column)element, cfg); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof OneToMany || element instanceof ManyToOne) { - String name = Messages.ORMLABELPROVIDER_ELEMENT; + String name = UIViewMessages.OrmLabelProvider_element; if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } @@ -141,19 +142,19 @@ if (element instanceof DependantValue) { String name = (String)ormModelNameVisitor.visitCollectionKeyMapping((DependantValue)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else if (element instanceof Component) { String name = (String)ormModelNameVisitor.visitComponentMapping((Component)element, null); if (name == null) { - return Messages.ORMLABELPROVIDER_ORM_ELEMENT; + return UIViewMessages.OrmLabelProvider_orm_element; } else { return name; } } else { - return Messages.ORMLABELPROVIDER_ELEMENT; + return UIViewMessages.OrmLabelProvider_element; // throw unknownElement(element); } } else if (element instanceof String){ @@ -161,16 +162,16 @@ } else { throw unknownElement(element); } - + } protected RuntimeException unknownElement(Object element) { if (element != null && element.getClass() != null ) - 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); - + return new RuntimeException(UIViewMessages.OrmLabelProvider_unknown_type_of_element_in_tree_of_type + element.getClass().getName()); + else return new RuntimeException(UIViewMessages.OrmLabelProvider_unknown_type_of_element_in_tree_of_type + element); + } - + public void dispose() { for (Iterator i = imageCache.values().iterator(); i.hasNext();) { ((Image) i.next()).dispose(); @@ -184,7 +185,7 @@ } else if (element instanceof Property) { return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_BLUE); } - + return null; } @@ -197,6 +198,6 @@ return JFaceResources.getFontRegistry().getBold(JFaceResources.getTextFont().getFontData()[0].getName()); }*/ return null; - } + } } \ No newline at end of file Deleted: 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 2008-06-06 16:51:42 UTC (rev 8615) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/messages.properties 2008-06-06 16:51:51 UTC (rev 8616) @@ -1,3 +0,0 @@ -ORMLABELPROVIDER_ELEMENT=element -ORMLABELPROVIDER_ORM_ELEMENT=OrmElement -ORMLABELPROVIDER_UNKNOWN_TYPE_OF_ELEMENT_IN_TREE_OF_TYPE=Unknown type of element in tree of type: