Author: vyemialyanchyk Date: 2009-03-26 11:28:03 -0400 (Thu, 26 Mar 2009) New Revision: 14342 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGenerator.java Log: JBIDE-3968 - code review, add string non extern markers, remove unused packages Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-03-26 15:28:03 UTC (rev 14342) @@ -20,7 +20,8 @@ Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.hibernate.jpt.core.internal, org.jboss.tools.hibernate.jpt.core.internal.context, - org.jboss.tools.hibernate.jpt.core.internal.context.basic + org.jboss.tools.hibernate.jpt.core.internal.context.basic, + org.jboss.tools.hibernate.jpt.core.internal.context.java Bundle-Localization: plugin Bundle-Activator: org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateFactory.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -10,23 +10,10 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal; -import java.util.List; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; -import org.eclipse.jpt.core.JpaDataSource; -import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.core.context.persistence.Persistence; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; -import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants; -import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -10,17 +10,9 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; -import org.hibernate.eclipse.console.HibernateConsoleMessages; -import org.hibernate.eclipse.logging.LoggingHelper; -import org.hibernate.eclipse.logging.xpl.EclipseLogger; -import org.osgi.framework.BundleContext; /** * @author Dmitry Geraskov @@ -30,11 +22,12 @@ public static final String ID = "org.jboss.tools.hibernate.jpt.core"; //$NON-NLS-1$ - private EclipseLogger logger; + private static HibernateJptPlugin inst = null; - private static HibernateJptPlugin inst; - public static HibernateJptPlugin getDefault() { + if (inst == null) { + inst = new HibernateJptPlugin(); + } return inst; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernatePlatform.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -21,7 +21,7 @@ public class HibernatePlatform extends GenericJpaPlatform { - public static String ID = "hibernate"; + public static final String ID = "hibernate"; //$NON-NLS-1$ @Override public String getId() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -11,7 +11,6 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; import java.io.File; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -16,8 +16,8 @@ */ public interface Messages { - String NOT_A_FILE = "NOT_A_FILE"; + String NOT_A_FILE = "NOT_A_FILE"; //$NON-NLS-1$ - String CONFIG_FILE_NOT_FOUND = "CONFIG_FILE_NOT_FOUND"; + String CONFIG_FILE_NOT_FOUND = "CONFIG_FILE_NOT_FOUND"; //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProperties.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProperties.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -22,65 +22,65 @@ String getDefaultConfigurationFile(); String getConfigurationFile(); void setConfigurationFile(String newConfigFile); - static final String CONFIG_FILE_PROPERTY = "confFileProperty"; + static final String CONFIG_FILE_PROPERTY = "confFileProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_CONFIG_FILE = "hibernate.ejb.cfgfile"; - static final String DEFAULT_CONFIG_FILE = ""; + static final String HIBERNATE_CONFIG_FILE = "hibernate.ejb.cfgfile"; //$NON-NLS-1$ + static final String DEFAULT_CONFIG_FILE = ""; //$NON-NLS-1$ String getDefaultDialect(); String getDialect(); void setDialect(String newDialect); - static final String DIALECT_PROPERTY = "dialectProperty"; + static final String DIALECT_PROPERTY = "dialectProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_DIALECT = "hibernate.dialect"; - static final String DEFAULT_DIALECT = ""; + static final String HIBERNATE_DIALECT = "hibernate.dialect"; //$NON-NLS-1$ + static final String DEFAULT_DIALECT = ""; //$NON-NLS-1$ String getDefaultDriver(); String getDriver(); void setDriver(String newDriver); - static final String DRIVER_PROPERTY = "driverProperty"; + static final String DRIVER_PROPERTY = "driverProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_DRIVER = "hibernate.connection.driver_class"; - static final String DEFAULT_DRIVER = ""; + static final String HIBERNATE_DRIVER = "hibernate.connection.driver_class"; //$NON-NLS-1$ + static final String DEFAULT_DRIVER = ""; //$NON-NLS-1$ String getDefaultUrl(); String getUrl(); void setUrl(String newUrl); - static final String URL_PROPERTY = "urlProperty"; + static final String URL_PROPERTY = "urlProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_URL = "hibernate.connection.url"; - static final String DEFAULT_URL = ""; + static final String HIBERNATE_URL = "hibernate.connection.url"; //$NON-NLS-1$ + static final String DEFAULT_URL = ""; //$NON-NLS-1$ String getDefaultSchemaDefault(); String getSchemaDefault(); void setSchemaDefault(String newSchemaDefault); - static final String SCHEMA_DEFAULT_PROPERTY = "schemaDefaultProperty"; + static final String SCHEMA_DEFAULT_PROPERTY = "schemaDefaultProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_SCHEMA_DEFAULT = "hibernate.default_schema"; - static final String DEFAULT_SCHEMA_DEFAULT = ""; + static final String HIBERNATE_SCHEMA_DEFAULT = "hibernate.default_schema"; //$NON-NLS-1$ + static final String DEFAULT_SCHEMA_DEFAULT = ""; //$NON-NLS-1$ String getDefaultCatalogDefault(); String getCatalogDefault(); void setCatalogDefault(String newCatalogDefault); - static final String CATALOG_DEFAULT_PROPERTY = "catalogDefaultProperty"; + static final String CATALOG_DEFAULT_PROPERTY = "catalogDefaultProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_CATALOG = "hibernate.default_catalog"; - static final String DEFAULT_CATALOG_DEFAULT = ""; + static final String HIBERNATE_CATALOG = "hibernate.default_catalog"; //$NON-NLS-1$ + static final String DEFAULT_CATALOG_DEFAULT = ""; //$NON-NLS-1$ String getDefaultUsername(); String getUsername(); void setUsername(String newUsername); - static final String USERNAME_PROPERTY = "usernameProperty"; + static final String USERNAME_PROPERTY = "usernameProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_USERNAME = "hibernate.connection.username"; - static final String DEFAULT_USERNAME = ""; + static final String HIBERNATE_USERNAME = "hibernate.connection.username"; //$NON-NLS-1$ + static final String DEFAULT_USERNAME = ""; //$NON-NLS-1$ String getDefaultPassword(); String getPassword(); void setPassword(String newPassword); - static final String PASSWORD_PROPERTY = "passwordProperty"; + static final String PASSWORD_PROPERTY = "passwordProperty"; //$NON-NLS-1$ // Hibernate key string - static final String HIBERNATE_PASSWORD = "hibernate.connection.password"; - static final String DEFAULT_PASSWORD = ""; + static final String HIBERNATE_PASSWORD = "hibernate.connection.password"; //$NON-NLS-1$ + static final String DEFAULT_PASSWORD = ""; //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hibernate.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -17,15 +17,15 @@ public interface Hibernate { // Hibernate package - String PACKAGE = "org.hibernate.annotations"; - String PACKAGE_ = PACKAGE + "."; + String PACKAGE = "org.hibernate.annotations"; //$NON-NLS-1$ + String PACKAGE_ = PACKAGE + "."; //$NON-NLS-1$ // ********** API ********** // Hibernate annotations - String GENERIC_GENERATOR = PACKAGE_ + "GenericGenerator"; - String GENERIC_GENERATOR__NAME = "name"; - String GENERIC_GENERATOR__STRATEGY = "strategy"; + String GENERIC_GENERATOR = PACKAGE_ + "GenericGenerator"; //$NON-NLS-1$ + String GENERIC_GENERATOR__NAME = "name"; //$NON-NLS-1$ + String GENERIC_GENERATOR__STRATEGY = "strategy"; //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorAnnotation.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorAnnotation.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/GenericGeneratorAnnotation.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -35,7 +35,7 @@ * Set to null to remove the strategy element. */ void setStrategy(String strategy); - String STRATEGY_PROPERTY = "strategyProperty"; + String STRATEGY_PROPERTY = "strategyProperty"; //$NON-NLS-1$ /** * Return the {@link TextRange} for the strategy element. If the strategy element Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGenerator.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGenerator.java 2009-03-26 13:57:27 UTC (rev 14341) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGenerator.java 2009-03-26 15:28:03 UTC (rev 14342) @@ -32,6 +32,6 @@ String getStrategy(); void setSpecifiedStrategy(String value); - String GENERIC_STRATEGY_PROPERTY = "genericStrategyProperty"; + String GENERIC_STRATEGY_PROPERTY = "genericStrategyProperty"; //$NON-NLS-1$ }