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

[Max Rydahl Andersen]

  User: mandersen
  Date: 06/11/16 12:30:09

  Modified:    hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch 
                        CodeGenerationLaunchDelegate.java
  Log:
  upgrade to latest hibernatetools snapshot + various ui fixes
  
  Revision  Changes    Path
  1.19      +12 -8     jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CodeGenerationLaunchDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- CodeGenerationLaunchDelegate.java	15 Sep 2006 09:20:18 -0000	1.18
  +++ CodeGenerationLaunchDelegate.java	16 Nov 2006 17:30:09 -0000	1.19
  @@ -215,17 +215,13 @@
   			ConsoleConfiguration cc = KnownConfigurations.getInstance().find(attributes.getConsoleConfigurationName());
   			ReverseEngineeringStrategy res = null;
   			
  -			ReverseEngineeringSettings qqsettings = new ReverseEngineeringSettings()
  -									.setDefaultPackageName(attributes.getPackageName())
  -									.setDetectManyToMany( attributes.detectManyToMany() )
  -									.setDetectOptimisticLock( attributes.detectOptimisticLock() );
  -			
  +			ReverseEngineeringSettings qqsettings = null;
   			if (attributes.isReverseEngineer()) {
   				monitor.subTask("reading jdbc metadata");
   						
  -				
  +				//todo: factor this setup of revengstrategy to core				
   				DefaultReverseEngineeringStrategy configurableNamingStrategy = new DefaultReverseEngineeringStrategy();
  -				configurableNamingStrategy.setSettings(qqsettings);
  +				//configurableNamingStrategy.setSettings(qqsettings);
   				
   				res = configurableNamingStrategy;
   				if(revengres!=null) {
  @@ -236,6 +232,14 @@
   					repository.addFile(file);
   					res = repository.getReverseEngineeringStrategy(res);
   				}
  +				
  +
  +				 qqsettings = new ReverseEngineeringSettings(res)
  +				.setDefaultPackageName(attributes.getPackageName())
  +				.setDetectManyToMany( attributes.detectManyToMany() )
  +				.setDetectOptimisticLock( attributes.detectOptimisticLock() );
  +
  +				configurableNamingStrategy.setSettings( qqsettings );
   				res.setSettings(qqsettings);
   			}
   			final Configuration cfg = buildConfiguration(attributes.isReverseEngineer(), attributes.getRevengStrategy(), cc, res, attributes.isPreferBasicCompositeIds(), qqsettings);