Author: vyemialyanchyk Date: 2009-07-17 08:42:06 -0400 (Fri, 17 Jul 2009) New Revision: 16645 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditConsoleConfiguration.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/RefreshAction.java 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/ReloadConfigurationAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/SchemaExportAction.java Log: https://jira.jboss.org/jira/browse/JBIDE-4618 - add id for actions and define id for action groups Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -48,6 +48,8 @@ */ public class AddConfigurationAction extends Action { + public static final String ADDCONFIG_ACTIONID = "actionid.addconfig"; //$NON-NLS-1$ + /** Constant used to avoid unnecessary broadcast which is caused by the workaround for having the ClassPathTab not throwing * and exception on unsaved configurations */ public static final String TEMPORARY_CONFIG_FLAG = "_TEMPORARY_CONFIG_"; //$NON-NLS-1$ @@ -58,6 +60,7 @@ this.part = part; setText(HibernateConsoleMessages.AddConfigurationAction_add_config); setImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.ADD) ); + setId(ADDCONFIG_ACTIONID); } public void run() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -37,11 +37,15 @@ import org.hibernate.mapping.Property; public class CriteriaEditorAction extends OpenQueryEditorAction { + + public static final String CRITERIAEDITOR_ACTIONID = "actionid.criteriaeditor"; //$NON-NLS-1$ + public CriteriaEditorAction() { super( HibernateConsoleMessages.CriteriaEditorAction_hibernate_criteria_editor ); setImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.CRITERIA_EDITOR)); setToolTipText(HibernateConsoleMessages.CriteriaEditorAction_open_hibernate_criteria_editor); setEnabled( true ); + setId(CRITERIAEDITOR_ACTIONID); } protected void openQueryEditor(ConsoleConfiguration config, String query) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -27,12 +27,10 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.SelectionListenerAction; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.HibernateConsoleMessages; -import org.hibernate.eclipse.console.utils.ProjectUtils; /** * @author max @@ -40,12 +38,15 @@ */ public class DeleteConfigurationAction extends SelectionListenerAction { + public static final String DELETECONFIG_ACTIONID = "actionid.deleteconfig"; //$NON-NLS-1$ + private StructuredViewer part; public DeleteConfigurationAction(StructuredViewer selectionProvider) { super(HibernateConsoleMessages.DeleteConfigurationAction_delete_config); setEnabled(false); this.part = selectionProvider; + setId(DELETECONFIG_ACTIONID); } public void run() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditConsoleConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditConsoleConfiguration.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditConsoleConfiguration.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -41,6 +41,8 @@ */ public class EditConsoleConfiguration extends ConsoleConfigurationBasedAction { + public static final String EDITCONSOLECONFIG_ACTIONID = "actionid.editconsoleconfig"; //$NON-NLS-1$ + ConsoleConfiguration cfg = null; /** @@ -48,6 +50,7 @@ */ public EditConsoleConfiguration() { super(HibernateConsoleMessages.EditConsoleConfiguration_edit_config); + setId(EDITCONSOLECONFIG_ACTIONID); } public EditConsoleConfiguration(ConsoleConfiguration configuration) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -32,11 +32,15 @@ import org.hibernate.mapping.Property; public class HQLScratchpadAction extends OpenQueryEditorAction { + + public static final String HQLSCRATCHPAD_ACTIONID = "actionid.hqlscratchpad"; //$NON-NLS-1$ + public HQLScratchpadAction() { super( HibernateConsoleMessages.HQLScratchpadAction_hql_editor ); setImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.HQL_EDITOR)); setToolTipText(HibernateConsoleMessages.HQLScratchpadAction_open_hql_editor); setEnabled( true ); + setId(HQLSCRATCHPAD_ACTIONID); } protected void openQueryEditor(ConsoleConfiguration config, String query) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -46,6 +46,8 @@ */ public class OpenMappingAction extends SelectionListenerAction { + public static final String OPENMAPPING_ACTIONID = "actionid.openmapping"; //$NON-NLS-1$ + private final String imageFilePath = "icons/images/mapping.gif"; //$NON-NLS-1$ public OpenMappingAction() { @@ -53,6 +55,7 @@ setToolTipText(HibernateConsoleMessages.OpenMappingAction_open_mapping_file); setEnabled(true); setImageDescriptor(HibernateConsolePlugin.getImageDescriptor(imageFilePath )); + setId(OPENMAPPING_ACTIONID); } public void run() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -41,6 +41,8 @@ @SuppressWarnings("restriction") public class OpenSourceAction extends SelectionListenerAction { + public static final String OPENSOURCE_ACTIONID = "actionid.opensource"; //$NON-NLS-1$ + private String imageFilePath = "icons/images/java.gif"; //$NON-NLS-1$ public OpenSourceAction() { @@ -48,6 +50,7 @@ setToolTipText(HibernateConsoleMessages.OpenSourceAction_open_source_file); setEnabled( true ); setImageDescriptor(HibernateConsolePlugin.getImageDescriptor(imageFilePath)); + setId(OPENSOURCE_ACTIONID); } public void run() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/RefreshAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/RefreshAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/RefreshAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -35,6 +35,8 @@ */ public class RefreshAction extends SelectionListenerAction { + public static final String REFRESH_ACTIONID = "actionid.refresh"; //$NON-NLS-1$ + private final StructuredViewer viewer; private String imageFilePath = "icons/images/refresh_run.gif"; //$NON-NLS-1$ @@ -42,6 +44,7 @@ super(HibernateConsoleMessages.RefreshAction_refresh); this.viewer = viewer; setImageDescriptor(HibernateConsolePlugin.getImageDescriptor(imageFilePath )); + setId(REFRESH_ACTIONID); } public void run() { 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 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -22,6 +22,7 @@ package org.hibernate.eclipse.console.views; import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.IStructuredSelection; @@ -42,8 +43,6 @@ import org.hibernate.eclipse.console.actions.RefreshAction; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.mapping.RootClass; -import org.hibernate.mapping.Subclass; /** * @author max @@ -51,6 +50,31 @@ */ public class ConfigurationsViewActionGroup extends ActionGroup { + /** + * menu group for open primal editors related actions. + * Value: <code>"group.primalEditors"</code> + */ + public static final String GROUP_PRIMAL_EDITORS = "group.primalEditors"; //$NON-NLS-1$ + public static final String GROUP_PRIMAL_EDITORS_LAST = "group.primalEditors.last"; //$NON-NLS-1$ + /** + * menu group for Hibernate Console Configuration related actions. + * Value: <code>"group.consoleConfig"</code> + */ + public static final String GROUP_CONSOLE_CONFIG = "group.consoleConfig"; //$NON-NLS-1$ + public static final String GROUP_CONSOLE_CONFIG_LAST = "group.consoleConfig.last"; //$NON-NLS-1$ + /** + * menu group for addition Hibernate related actions. + * Value: <code>"group.addition"</code> + */ + public static final String GROUP_ADDITION = "group.addition"; //$NON-NLS-1$ + public static final String GROUP_ADDITION_LAST = "group.addition.last"; //$NON-NLS-1$ + /** + * menu group for open other editors related actions. + * Value: <code>"group.otherEditors"</code> + */ + public static final String GROUP_OTHER_EDITORS = "group.otherEditors"; //$NON-NLS-1$ + public static final String GROUP_OTHER_EDITORS_LAST = "group.otherEditors.last"; //$NON-NLS-1$ + private Action addConfigurationAction; private SelectionListenerAction deleteConfigurationAction; private SelectionListenerAction refreshAction; @@ -119,30 +143,39 @@ } public void fillContextMenu(IMenuManager menu) { - if (getContext() == null) return; + if (getContext() == null) { + return; + } IStructuredSelection selection = (IStructuredSelection) getContext().getSelection(); - if (selection == null) return; + if (selection == null) { + return; + } Object first = selection.getFirstElement(); - menu.add(hqlEditorAction); - menu.add(criteriaEditorAction); - menu.add(new Separator() ); - menu.add(addConfigurationAction); - if (first instanceof ConsoleConfiguration){ - menu.add(reloadConfigurationAction); - menu.add(editConfigurationAction); - menu.add(deleteConfigurationAction); + menu.add(new Separator(GROUP_PRIMAL_EDITORS)); + menu.appendToGroup(GROUP_PRIMAL_EDITORS, hqlEditorAction); + menu.appendToGroup(GROUP_PRIMAL_EDITORS, criteriaEditorAction); + menu.add(new GroupMarker(GROUP_PRIMAL_EDITORS_LAST)); + menu.add(new Separator(GROUP_CONSOLE_CONFIG)); + menu.appendToGroup(GROUP_CONSOLE_CONFIG, addConfigurationAction); + if (first instanceof ConsoleConfiguration) { + menu.appendToGroup(GROUP_CONSOLE_CONFIG, reloadConfigurationAction); + menu.appendToGroup(GROUP_CONSOLE_CONFIG, editConfigurationAction); + menu.appendToGroup(GROUP_CONSOLE_CONFIG, deleteConfigurationAction); } - menu.add(new Separator() ); - menu.add(refreshAction); + menu.add(new GroupMarker(GROUP_CONSOLE_CONFIG_LAST)); + menu.add(new Separator(GROUP_ADDITION)); + menu.appendToGroup(GROUP_ADDITION, refreshAction); if (first instanceof ConsoleConfiguration){ - menu.add(schemaExportAction); + menu.appendToGroup(GROUP_ADDITION, schemaExportAction); } - menu.add(new Separator() ); + menu.add(new GroupMarker(GROUP_ADDITION_LAST)); + menu.add(new Separator(GROUP_OTHER_EDITORS)); // TODO: shouldn't these and maybe the others not be defined via menu extension points ? if (first != null && (first instanceof PersistentClass || first.getClass() == Property.class)) { - menu.add(openSourceAction); - menu.add(openMappingAction); + menu.appendToGroup(GROUP_OTHER_EDITORS, openSourceAction); + menu.appendToGroup(GROUP_OTHER_EDITORS, openMappingAction); } + menu.add(new GroupMarker(GROUP_OTHER_EDITORS_LAST)); } public void fillActionBars(IActionBars actionBars) { Modified: 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 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -13,6 +13,8 @@ public class ReloadConfigurationAction extends ConsoleConfigurationBasedAction { + public static final String RELOADCONFIG_ACTIONID = "actionid.reloadconfig"; //$NON-NLS-1$ + private StructuredViewer viewer; protected ReloadConfigurationAction(StructuredViewer sv) { @@ -20,6 +22,7 @@ setEnabledWhenNoSessionFactory(true); viewer = sv; setImageDescriptor(EclipseImages.getImageDescriptor(ImageConstants.RELOAD) ); + setId(RELOADCONFIG_ACTIONID); } protected void doRun() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/SchemaExportAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/SchemaExportAction.java 2009-07-17 09:45:49 UTC (rev 16644) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/SchemaExportAction.java 2009-07-17 12:42:06 UTC (rev 16645) @@ -40,6 +40,8 @@ */ public class SchemaExportAction extends ConsoleConfigurationBasedAction { + public static final String SCHEMAEXPORT_ACTIONID = "actionid.schemaexport"; //$NON-NLS-1$ + private StructuredViewer viewer; /** @@ -47,6 +49,7 @@ */ protected SchemaExportAction(String text) { super( text ); + setId(SCHEMAEXPORT_ACTIONID); } /** @@ -55,6 +58,7 @@ public SchemaExportAction(StructuredViewer selectionProvider) { super( HibernateConsoleMessages.SchemaExportAction_run_schemaexport ); this.viewer = selectionProvider; + setId(SCHEMAEXPORT_ACTIONID); } public void doRun() {