[jboss-cvs] jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences ...

[Max Rydahl Andersen]

  User: mandersen
  Date: 06/12/14 06:52:52

  Modified:    hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences   
                        AbstractConsoleConfigurationPreferences.java
                        ConsoleConfigurationPreferences.java
                        StandAloneConsoleConfigurationPreferences.java
  Log:
  HBX-839: Support persistence unit name in eclipse 
  HBX-840: Support namingstrategy in eclipse 
  
  Revision  Changes    Path
  1.8       +13 -4     jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractConsoleConfigurationPreferences.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- AbstractConsoleConfigurationPreferences.java	27 Nov 2006 15:30:18 -0000	1.7
  +++ AbstractConsoleConfigurationPreferences.java	14 Dec 2006 11:52:52 -0000	1.8
  @@ -27,15 +27,12 @@
   import java.util.Properties;
   
   import org.hibernate.console.HibernateConsoleRuntimeException;
  -import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
   import org.hibernate.util.StringHelper;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   
  -import sun.security.action.GetPropertyAction;
  -
   /**
    * @author max
    *
  @@ -53,9 +50,13 @@
   	protected String entityResolverName = null;
   	private boolean useProjectClasspath;
   	private ConfigurationMode configurationMode;
  +	private String persistenceUnitName;
  +	private String namingStrategy;
   	
  -	public AbstractConsoleConfigurationPreferences(String name, ConfigurationMode configurationMode, String projectName, boolean useProjectclassPath, String entityResolver) {
  +	public AbstractConsoleConfigurationPreferences(String name, ConfigurationMode configurationMode, String projectName, boolean useProjectclassPath, String entityResolver, String persistenceUnitName, String namingStrategy) {
   		setName(name);
  +		this.persistenceUnitName = persistenceUnitName;
  +		this.namingStrategy = namingStrategy;
   		this.configurationMode = configurationMode;
   		entityResolverName = entityResolver;
   		this.projectName = projectName;
  @@ -70,6 +71,14 @@
   		return configurationMode;
   	}
   	
  +	public String getPersistenceUnitName() {
  +		return persistenceUnitName;
  +	}
  +	
  +	public String getNamingStrategy() {
  +		return namingStrategy;
  +	}
  +	
   	public void setName(String name) {
   		if(name==null || name.trim().length()==0) {
   			throw new IllegalArgumentException("Name cannot be null or empty");
  
  
  
  1.6       +4 -0      jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConsoleConfigurationPreferences.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ConsoleConfigurationPreferences.java	15 Nov 2006 16:12:06 -0000	1.5
  +++ ConsoleConfigurationPreferences.java	14 Dec 2006 11:52:52 -0000	1.6
  @@ -116,4 +116,8 @@
   	public abstract void setName(String name);
   
   	public abstract String getEntityResolverName();
  +
  +	public abstract String getPersistenceUnitName();
  +	
  +	public abstract String getNamingStrategy();
   }
  \ No newline at end of file
  
  
  
  1.7       +1 -1      jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StandAloneConsoleConfigurationPreferences.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- StandAloneConsoleConfigurationPreferences.java	15 Nov 2006 16:12:06 -0000	1.6
  +++ StandAloneConsoleConfigurationPreferences.java	14 Dec 2006 11:52:52 -0000	1.7
  @@ -45,7 +45,7 @@
   	private File[] customClasspath;	
   
   	public StandAloneConsoleConfigurationPreferences(String name, File xmlconfig, File propertiesFile, File[] mappingFiles, File[] customClasspath) {
  -		super(name, ConfigurationMode.CORE, null, false, null);
  +		super(name, ConfigurationMode.CORE, null, false, null, null, null);
   		this.cfgFile = xmlconfig;
   		this.propertyFilename = propertiesFile;
   		this.mappings = mappingFiles;