[jboss-cvs] jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards ...
Max Rydahl Andersen
mandersen at jboss.com
Tue Feb 20 08:21:50 EST 2007
User: mandersen
Date: 07/02/20 08:21:50
Modified: hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards
NewConfigurationWizard.java
ConsoleConfigurationWizardPage.java
ConsoleConfigurationCreationWizard.java
NewConfigurationWizardPage.java
TableFilterWizardPage.java UpDownListComposite.java
Log:
HBX-889 sort console configuration lists in ui
HBX-637 Provide ability to import/export console configs
HBX-863 Hibernate Code Generation toolbar group is appearing in all Eclipse perspectives.
Revision Changes Path
1.13 +1 -1 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewConfigurationWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
1.29 +17 -13 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConsoleConfigurationWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ConsoleConfigurationWizardPage.java 18 Jan 2007 17:32:42 -0000 1.28
+++ ConsoleConfigurationWizardPage.java 20 Feb 2007 13:21:50 -0000 1.29
@@ -53,6 +53,7 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -99,7 +100,6 @@
private EclipseConsoleConfiguration oldConfiguaration = null;
- //private Button enableAnnotations;
Button coreMode;
Button jpaMode;
Button annotationsMode;
@@ -164,7 +164,7 @@
item.setControl( composite );
item.setText( "Mappings" );
- initialize();
+ initialize(selection);
dialogChanged();
setControl(folder);
}
@@ -479,18 +479,13 @@
}
- /**
- * Tests if the current workbench selection is a suitable
- * container to use.
- * @throws
- */
- private void initialize() {
+ public void initialize(ISelection currentSelection) {
try {
Visitor v = new Visitor();
// use selection to build configuration from it...
- if (selection!=null && selection.isEmpty()==false && selection instanceof IStructuredSelection) {
- IStructuredSelection ssel = (IStructuredSelection)selection;
+ if (currentSelection!=null && currentSelection.isEmpty()==false && currentSelection instanceof IStructuredSelection) {
+ IStructuredSelection ssel = (IStructuredSelection)currentSelection;
if (ssel.size()>1) return;
Object obj = ssel.getFirstElement();
@@ -529,15 +524,20 @@
configurationNameText.setText(v.javaProject.getElementName() );
projectNameText.setText(v.javaProject.getElementName());
}
- if (v.propertyFile!=null) propertyFileText.setText(v.propertyFile.toOSString() );
- if (v.configFile!=null) configurationFileText.setText(v.configFile.toOSString() );
+ if (v.propertyFile!=null) {
+ propertyFileText.setText(v.propertyFile.toOSString() );
+ }
+
+ if (v.configFile!=null) {
+ configurationFileText.setText(v.configFile.toOSString() );
+ }
if (v.persistencexml!=null) {
jpaMode.setSelection( true );
coreMode.setSelection( false );
annotationsMode.setSelection( false );
}
- if (!v.mappings.isEmpty() ) mappingFilesViewer.add(v.mappings.toArray(), false);
+ if (!v.mappings.isEmpty() && v.configFile==null && v.persistencexml==null) mappingFilesViewer.add(v.mappings.toArray(), false);
if (!v.classpath.isEmpty() ) classPathViewer.add(v.classpath.toArray(), false);
useProjectClassPath.setSelection( true );
//if(v.javaProject!=null) {
@@ -789,7 +789,11 @@
}
public void setConfigurationFilePath(IPath containerFullPath) {
+ if(!configurationFileWillBeCreated) {
+ initialize( new StructuredSelection(containerFullPath) );
+ }
configurationFileText.setText(containerFullPath.toPortableString());
+
configurationFileWillBeCreated = true;
configurationFileText.setEnabled(false);
confbutton.setEnabled(false);
1.16 +71 -14 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConsoleConfigurationCreationWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ConsoleConfigurationCreationWizard.java 18 Jan 2007 17:32:42 -0000 1.15
+++ ConsoleConfigurationCreationWizard.java 20 Feb 2007 13:21:50 -0000 1.16
@@ -22,6 +22,8 @@
package org.hibernate.eclipse.console.wizards;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -29,7 +31,15 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelection;
@@ -51,6 +61,7 @@
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
import org.hibernate.eclipse.nature.HibernateNature;
import org.hibernate.util.StringHelper;
@@ -144,22 +155,58 @@
monitor.beginTask("Configuring Hibernate Console", IProgressMonitor.UNKNOWN);
- ConsoleConfigurationPreferences ccp = new EclipseConsoleConfigurationPreferences(
- configName, cmode, projectName, useProjectClasspath,
- entityResolver, cfgFile, propertyFilename, mappings, classpaths,
- persistenceUnitName, namingStrategy);
+ //ConsoleConfigurationPreferences ccp = createOldConsoleConfiguration( configName, cmode, projectName, useProjectClasspath, entityResolver, propertyFilename, cfgFile, mappings, classpaths, persistenceUnitName, namingStrategy );
+ if(oldConfig!=null) {
+ KnownConfigurations.getInstance().removeConfiguration( oldConfig );
+ }
- final ConsoleConfiguration cfg = new EclipseConsoleConfiguration(ccp);
+ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType" );
+ String launchName = launchManager.generateUniqueLaunchConfigurationNameFrom(configName);
+ ILaunchConfigurationWorkingCopy wc = launchConfigurationType.newInstance(null, launchName);
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.CONFIGURATION_FACTORY, cmode.toString());
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.PROJECT_NAME, projectName );
- if(oldConfig!=null) {
- oldConfig.reset(); // reset it no matter what.
- KnownConfigurations.getInstance().removeConfiguration(oldConfig);
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.PROPERTY_FILE, safePathName(propertyFilename) );
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.CFG_XML_FILE, safePathName(cfgFile) );
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.PERSISTENCE_UNIT_NAME, persistenceUnitName );
+
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, namingStrategy );
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.ENTITY_RESOLVER, entityResolver );
+
+ IRuntimeClasspathEntry[] projectEntries = new IRuntimeClasspathEntry[0];
+ if(useProjectClasspath) {
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
+ projectEntries = JavaRuntime.computeUnresolvedRuntimeClasspath(wc);
+
+ }
+
+ if(classpaths.length>0) {
+ List user = new ArrayList();
+ for (int i = 0; i < projectEntries.length; i++) {
+ user.add( projectEntries[i].getMemento() );
+ }
+ for (int i = 0; i < classpaths.length; i++) {
+ IPath entry = classpaths[i];
+ IRuntimeClasspathEntry userEntry = JavaRuntime.newArchiveRuntimeClasspathEntry( entry );
+ user.add( userEntry.getMemento() );
+ }
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, user);
+ } else {
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, (String)null);
+ }
+
+ List mappingFiles = new ArrayList();
+ for (int i = 0; i < mappings.length; i++) {
+ mappingFiles.add(mappings[i].toPortableString());
}
- KnownConfigurations.getInstance().addConfiguration(cfg, true);
+ wc.setAttribute( IConsoleConfigurationLaunchConstants.FILE_MAPPINGS, mappingFiles );
+
+ wc.doSave();
- // force save changes to console config
- ResourcesPlugin.getWorkspace().save( false, monitor );
Display.getDefault().syncExec(new Runnable() {
public void run() {
if(StringHelper.isNotEmpty( projectName )) {
@@ -194,6 +241,16 @@
monitor.worked(1);
}
+ private static String safePathName(IPath propertyFilename) {
+ if(propertyFilename==null) {
+ return null;
+ } else {
+ return propertyFilename.toOSString();
+ }
+ }
+
+
+
/**
* We will accept the selection in the workbench to see if
1.9 +3 -3 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewConfigurationWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewConfigurationWizardPage.java 7 Jul 2006 13:51:10 -0000 1.8
+++ NewConfigurationWizardPage.java 20 Feb 2007 13:21:50 -0000 1.9
@@ -231,7 +231,6 @@
createConsoleConfiguration.setText("Create a console configuration");
createConsoleConfiguration.addSelectionListener(selectionListener);
-
initialize();
dialogChanged();
@@ -417,6 +416,7 @@
public boolean isCreateConsoleConfigurationEnabled() {
return createConsoleConfiguration.getSelection();
}
+
public String getDefaultCatalog() {
return nullIfEmpty(defaultCatalogText.getText());
}
1.8 +1 -1 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TableFilterWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterWizardPage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TableFilterWizardPage.java 7 Jul 2006 13:51:10 -0000 1.7
+++ TableFilterWizardPage.java 20 Feb 2007 13:21:50 -0000 1.8
@@ -61,7 +61,7 @@
consoleConfigurationName = new ComboDialogField(SWT.READ_ONLY);
consoleConfigurationName.setLabelText("Console &configuration:");
- ConsoleConfiguration[] cfg = KnownConfigurations.getInstance().getConfigurations();
+ ConsoleConfiguration[] cfg = KnownConfigurations.getInstance().getConfigurationsSortedByName();
String[] names = new String[cfg.length];
for (int i = 0; i < cfg.length; i++) {
ConsoleConfiguration configuration = cfg[i];
1.9 +4 -0 jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UpDownListComposite.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- UpDownListComposite.java 23 Oct 2006 13:22:55 -0000 1.8
+++ UpDownListComposite.java 20 Feb 2007 13:21:50 -0000 1.9
@@ -338,4 +338,8 @@
public Table getTable() {
return tableView.getTable();
}
+
+ public void clear() {
+ tableView.getTable().removeAll();
+ }
}
More information about the jboss-cvs-commits
mailing list