[jbosstools-commits] JBoss Tools SVN: r35840 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: dgeraskov
Date: 2011-10-20 08:16:25 -0400 (Thu, 20 Oct 2011)
New Revision: 35840

Modified:
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-9559
Revert changes

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java	2011-10-20 12:06:40 UTC (rev 35839)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java	2011-10-20 12:16:25 UTC (rev 35840)
@@ -19,7 +19,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.hibernate.console.ConsoleConfiguration;
 import org.hibernate.console.KnownConfigurations;
 import org.hibernate.eclipse.launch.HibernateLaunchConstants;
 import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject;
@@ -56,7 +55,6 @@
 		ILaunchConfigurationWorkingCopy wc = HibernateJpaPlatformUi.createDefaultLaunchConfig(projectName);
 		if (wc != null) {
 			String concoleConfigurationName = initPage.getConfigurationName();
-			resetConsoleConfiguration(concoleConfigurationName);
 			wc.setAttribute(HibernateLaunchConstants.ATTR_CONSOLE_CONFIGURATION_NAME, concoleConfigurationName);
 			wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir());
 
@@ -80,13 +78,4 @@
 		}
 		return true;
 	}
-	
-	protected void resetConsoleConfiguration(String concoleConfigurationName){
-		if (!initPage.isTemporaryConfiguration()){
-			ConsoleConfiguration cc = KnownConfigurations.getInstance().find(concoleConfigurationName);
-			if (cc.hasConfiguration()){
-				cc.reset();
-			}
-		}
-	}
 }

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java	2011-10-20 12:06:40 UTC (rev 35839)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java	2011-10-20 12:16:25 UTC (rev 35840)
@@ -16,7 +16,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.hibernate.console.ConsoleConfiguration;
 import org.hibernate.console.KnownConfigurations;
 import org.hibernate.eclipse.launch.HibernateLaunchConstants;
 import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject;
@@ -54,8 +53,7 @@
 		ILaunchConfigurationWorkingCopy wc = HibernateJpaPlatformUi.createDefaultLaunchConfig(projectName);
 		if (wc != null) {
 			// SHOULD PRESENT THE CONFIGURATION!!!
-			String concoleConfigurationName = initPage.getConfigurationName();
-			resetConsoleConfiguration(concoleConfigurationName);
+			String concoleConfigurationName = initPage.getConfigurationName();			
 			wc.setAttribute(HibernateLaunchConstants.ATTR_CONSOLE_CONFIGURATION_NAME, concoleConfigurationName);
 
 			wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir());
@@ -84,14 +82,5 @@
 		}
 		return true;
 	}
-	
-	protected void resetConsoleConfiguration(String concoleConfigurationName){
-		if (!initPage.isTemporaryConfiguration()){
-			ConsoleConfiguration cc = KnownConfigurations.getInstance().find(concoleConfigurationName);
-			if (cc.hasConfiguration()){
-				cc.reset();
-			}
-		}
-	}
 
 }