Author: max.andersen(a)jboss.com Date: 2007-11-07 10:02:11 -0500 (Wed, 07 Nov 2007) New Revision: 4757 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/reload.gif trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java Log: JBIDE-1122 UI reload hibernate console configuration Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2007-11-07 13:17:57 UTC (rev 4756) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2007-11-07 15:02:11 UTC (rev 4757) @@ -114,5 +114,6 @@ public static final String CHECKBOX_FULL = "images/xpl/complete_tsk.gif"; public static final String CHECKBOX_EMPTY = "images/xpl/incomplete_tsk.gif"; + public static final String RELOAD = "images/reload.gif"; } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2007-11-07 13:17:57 UTC (rev 4756) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2007-11-07 15:02:11 UTC (rev 4757) @@ -71,6 +71,7 @@ declareRegistryImage(FUNCTION, "images/function.gif"); declareRegistryImage(CHECKBOX_EMPTY, "images/xpl/incomplete_tsk.gif"); declareRegistryImage(CHECKBOX_FULL, "images/xpl/complete_tsk.gif"); + declareRegistryImage(RELOAD, "images/reload.gif"); } Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/reload.gif =================================================================== (Binary files differ) Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/reload.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2007-11-07 13:17:57 UTC (rev 4756) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2007-11-07 15:02:11 UTC (rev 4757) @@ -16,9 +16,13 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.HibernateConsoleRuntimeException; +import org.hibernate.console.KnownConfigurations; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.eclipse.console.utils.ClassLoaderHelper; +import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants; import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; import org.w3c.dom.Element; @@ -30,6 +34,7 @@ this.launchConfiguration = configuration; } + private File strToFile(String epath) { if(epath==null) return null; IPath path = new Path(epath); @@ -154,7 +159,10 @@ public void writeStateTo(Element node) { throw new IllegalStateException("Cannot write to xml"); } + + + } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2007-11-07 13:17:57 UTC (rev 4756) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2007-11-07 15:02:11 UTC (rev 4757) @@ -31,7 +31,6 @@ import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.SelectionListenerAction; import org.hibernate.eclipse.console.actions.AddConfigurationAction; -import org.hibernate.eclipse.console.actions.BuildSessionFactoryAction; import org.hibernate.eclipse.console.actions.CriteriaEditorAction; import org.hibernate.eclipse.console.actions.DeleteConfigurationAction; import org.hibernate.eclipse.console.actions.EditConsoleConfiguration; @@ -47,11 +46,12 @@ private Action addConfigurationAction; private SelectionListenerAction deleteConfigurationAction; private SelectionListenerAction refreshAction; - private SelectionListenerAction connectAction; + //private SelectionListenerAction connectAction; + private SelectionListenerAction reloadConfigurationAction; private SelectionListenerAction schemaExportAction; private EditConsoleConfiguration editConfigurationAction; private final StructuredViewer selectionProvider; - private SelectionListenerAction scratchpadAction; + private SelectionListenerAction hqlEditorAction; private CriteriaEditorAction criteriaEditorAction; public ConfigurationsViewActionGroup(IViewPart part, StructuredViewer selectionProvider) { @@ -68,9 +68,12 @@ refreshAction = new RefreshAction(selectionProvider); selectionProvider.addSelectionChangedListener(refreshAction); - - connectAction = new BuildSessionFactoryAction(selectionProvider); - selectionProvider.addSelectionChangedListener(connectAction); + + reloadConfigurationAction = new ReloadConfigurationAction(selectionProvider); + selectionProvider.addSelectionChangedListener(reloadConfigurationAction); + + //connectAction = new BuildSessionFactoryAction(selectionProvider); + //selectionProvider.addSelectionChangedListener(connectAction); /*IMenuManager manager = part.getViewSite().getActionBars().getMenuManager(); manager.add(addConfigurationAction);*/ @@ -80,8 +83,8 @@ editConfigurationAction = new EditConsoleConfiguration(); selectionProvider.addSelectionChangedListener(editConfigurationAction); - scratchpadAction = new HQLScratchpadAction(); - selectionProvider.addSelectionChangedListener(scratchpadAction); + hqlEditorAction = new HQLScratchpadAction(); + selectionProvider.addSelectionChangedListener(hqlEditorAction); criteriaEditorAction = new CriteriaEditorAction(); selectionProvider.addSelectionChangedListener(criteriaEditorAction); @@ -91,20 +94,20 @@ super.dispose(); selectionProvider.removeSelectionChangedListener(deleteConfigurationAction); selectionProvider.removeSelectionChangedListener(refreshAction); - selectionProvider.removeSelectionChangedListener(connectAction); + selectionProvider.removeSelectionChangedListener(reloadConfigurationAction); selectionProvider.removeSelectionChangedListener(schemaExportAction); selectionProvider.removeSelectionChangedListener(editConfigurationAction); - selectionProvider.removeSelectionChangedListener(scratchpadAction); + selectionProvider.removeSelectionChangedListener(hqlEditorAction); selectionProvider.removeSelectionChangedListener(criteriaEditorAction); } public void fillContextMenu(IMenuManager menu) { - menu.add(connectAction); - menu.add(scratchpadAction); + menu.add(hqlEditorAction); menu.add(criteriaEditorAction); menu.add(new Separator() ); menu.add(addConfigurationAction); + menu.add(reloadConfigurationAction); menu.add(editConfigurationAction); menu.add(deleteConfigurationAction); menu.add(new Separator() ); @@ -115,8 +118,9 @@ public void fillActionBars(IActionBars actionBars) { + actionBars.getToolBarManager().add(reloadConfigurationAction); actionBars.getToolBarManager().add(addConfigurationAction); - actionBars.getToolBarManager().add(scratchpadAction); + actionBars.getToolBarManager().add(hqlEditorAction); actionBars.getToolBarManager().add(criteriaEditorAction); } Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java 2007-11-07 15:02:11 UTC (rev 4757) @@ -0,0 +1,49 @@ +package org.hibernate.eclipse.console.views; + +import java.util.Iterator; + +import org.eclipse.jface.viewers.StructuredViewer; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.console.HibernateConsoleRuntimeException; +import org.hibernate.console.ImageConstants; +import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.eclipse.console.actions.ConsoleConfigurationBasedAction; +import org.hibernate.eclipse.console.utils.EclipseImages; + +public class ReloadConfigurationAction extends ConsoleConfigurationBasedAction { + + private StructuredViewer viewer; + + protected ReloadConfigurationAction(StructuredViewer sv) { + super("Rebuild configuration"); + setEnabledWhenNoSessionFactory(true); + viewer = sv; + setImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.RELOAD) ); + } + + protected void doRun() { + for (Iterator i = getSelectedNonResources().iterator(); i.hasNext();) { + try { + Object node = i.next(); + if (node instanceof ConsoleConfiguration) { + ConsoleConfiguration config = (ConsoleConfiguration) node; + config.reset(); + updateState(config); + viewer.refresh(node); + } + } catch (HibernateConsoleRuntimeException he) { + HibernateConsolePlugin.getDefault().showError( + viewer.getControl().getShell(), + "Exception while connecting/starting Hibernate", he); + } catch (UnsupportedClassVersionError ucve) { + HibernateConsolePlugin + .getDefault() + .showError( + viewer.getControl().getShell(), + "Starting Hibernate resulted in a UnsupportedClassVersionError.\nThis can occur if you are running eclipse with JDK 1.4 and your domain classes require JDK 1.5. \n\nResolution: Run eclipse with JDK 1.5.", + ucve); + } + } + } + +}