Author: vyemialyanchyk Date: 2009-08-12 11:59:31 -0400 (Wed, 12 Aug 2009) New Revision: 17062 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java Log: https://jira.jboss.org/jira/browse/JBIDE-4754 - NPE fix for focus in other view Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -32,6 +32,7 @@ import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleConnectionsAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.DiagramBaseRetargetAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeExpandStateAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVisibleStateAction; import org.jboss.tools.hibernate.ui.view.ImageBundle; @@ -48,11 +49,27 @@ workbenchAction.setToolTipText(DiagramViewerMessages.EditorActionContributor_refresh_visual_mapping); addAction(workbenchAction); // - addAction(new AutoLayoutAction(null)); + addRetargetAction(new DiagramBaseRetargetAction( + AutoLayoutAction.ACTION_ID, + DiagramViewerMessages.AutoLayoutAction_auto_layout, + DiagramViewerMessages.AutoLayoutAction_auto_layout, + AutoLayoutAction.img)); // - addAction(new ToggleConnectionsAction(null)); - addAction(new ToggleShapeExpandStateAction(null)); - addAction(new ToggleShapeVisibleStateAction(null)); + addRetargetAction(new DiagramBaseRetargetAction( + ToggleConnectionsAction.ACTION_ID, + DiagramViewerMessages.ToggleConnectionsAction_toggle_connections, + DiagramViewerMessages.ToggleConnectionsAction_toggle_connections, + ToggleConnectionsAction.img)); + addRetargetAction(new DiagramBaseRetargetAction( + ToggleShapeExpandStateAction.ACTION_ID, + DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state, + DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state, + ToggleShapeExpandStateAction.img)); + addRetargetAction(new DiagramBaseRetargetAction( + ToggleShapeVisibleStateAction.ACTION_ID, + DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_state, + DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_state, + ToggleShapeVisibleStateAction.img)); // addRetargetAction(new UndoRetargetAction()); addRetargetAction(new RedoRetargetAction()); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -20,7 +20,7 @@ public class AutoLayoutAction extends DiagramBaseAction { public static final String ACTION_ID = "auto_layout_id"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/autolayout.png"); //$NON-NLS-1$ public AutoLayoutAction(DiagramViewer editor) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -13,6 +13,8 @@ import org.eclipse.jface.action.Action; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.views.contentoutline.ContentOutline; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramContentOutlinePage; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; /** @@ -35,6 +37,12 @@ IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart(); if (part instanceof DiagramViewer) { res = (DiagramViewer)part; + } else if (part instanceof ContentOutline) { + ContentOutline co = (ContentOutline)part; + if (co.getCurrentPage() instanceof DiagramContentOutlinePage) { + DiagramContentOutlinePage dcop = (DiagramContentOutlinePage)co.getCurrentPage(); + res = dcop.getEditor(); + } } } return res; Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseRetargetAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.diagram.editors.actions; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.actions.RetargetAction; + +/** + * @author Vitali Yemialyanchyk + */ +public class DiagramBaseRetargetAction extends RetargetAction { + + public DiagramBaseRetargetAction(final String actionId, final String text, + final String toolTipText, final ImageDescriptor imgDescriptor) { + super(actionId, text); + setToolTipText(toolTipText); + setImageDescriptor(imgDescriptor); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -40,7 +40,7 @@ DiagramViewerMessages.ExportImageAction_jpg_format, DiagramViewerMessages.ExportImageAction_bmp_format }; private FileDialog saveDialog = null; - private static final ImageDescriptor img = + public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/export.png"); //$NON-NLS-1$ public ExportImageAction(DiagramViewer editor) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -37,7 +37,7 @@ */ public class OpenMappingAction extends SelectionAction { public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.diagram.editors.actions.open.mapping"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = UiPlugin.getImageDescriptor("icons/mapping.gif"); //$NON-NLS-1$ public OpenMappingAction(IWorkbenchPart part) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -29,7 +29,7 @@ */ public class OpenSourceAction extends SelectionAction { public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.diagram.editors.actions.open.source"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = UiPlugin.getImageDescriptor("icons/java.gif"); //$NON-NLS-1$ public OpenSourceAction(IWorkbenchPart part) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -20,7 +20,7 @@ public class ToggleConnectionsAction extends DiagramBaseAction { public static final String ACTION_ID = "toggleConnectionsId"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleconnections.png"); //$NON-NLS-1$ public ToggleConnectionsAction(DiagramViewer editor) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -32,7 +32,7 @@ public class ToggleShapeExpandStateAction extends DiagramBaseAction { public static final String ACTION_ID = "toggleShapeExpandStateId"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapeexpandstate.png"); //$NON-NLS-1$ public ToggleShapeExpandStateAction(DiagramViewer editor) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2009-08-12 15:53:11 UTC (rev 17061) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2009-08-12 15:59:31 UTC (rev 17062) @@ -34,7 +34,7 @@ public class ToggleShapeVisibleStateAction extends DiagramBaseAction { public static final String ACTION_ID = "toggleShapeVisibleStateId"; //$NON-NLS-1$ - private static final ImageDescriptor img = + public static final ImageDescriptor img = ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapevisiblestate.png"); //$NON-NLS-1$ public ToggleShapeVisibleStateAction(DiagramViewer editor) {