[jbosstools-commits] JBoss Tools SVN: r16764 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui: src/org/jboss/tools/hibernate/ui/diagram and 11 other directories.

Author: vyemialyanchyk Date: 2009-07-24 09:26:46 -0400 (Fri, 24 Jul 2009) New Revision: 16764 Added: 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/CollapseAllAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExpandAllAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayoutConstants.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ChangeGuideCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/CreateGuideCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/DeleteGuideCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/MoveGuideCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapesXYLayoutEditPolicy.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramGuide.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRuler.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRulerProvider.java Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/EditorActionContributor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayuotConstants.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/UiPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.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/autolayout/IDiagramInfo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ShapeSetConstraintCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/RoundPolylineConnection.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandeableShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ImageBundle.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ObjectEditorInput.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java Log: https://jira.jboss.org/jira/browse/JBIDE-4017 -> subtasks: https://jira.jboss.org/jira/browse/JBIDE-4619 (ZoomIn and ZoomOut possibility), https://jira.jboss.org/jira/browse/JBIDE-4620 (toggle show/hide all connection types), https://jira.jboss.org/jira/browse/JBIDE-4621 (popup menu for Outline view), https://jira.jboss.org/jira/browse/JBIDE-4643 (add Rulers, add Grid, add Snap to Geometry) Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/plugin.xml 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/plugin.xml 2009-07-24 13:26:46 UTC (rev 16764) @@ -5,7 +5,7 @@ point="org.eclipse.ui.editors"> <editor class="org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer" - contributorClass="org.jboss.tools.hibernate.ui.diagram.editors.EditorActionContributor" + contributorClass="org.jboss.tools.hibernate.ui.diagram.editors.DiagramActionBarContributor" icon="$nl$/icons/hibernate_small_icon.gif" id="org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer" name="Hibernate Diagram Viewer"> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -22,9 +22,12 @@ NLS.initializeMessages(BUNDLE_NAME, DiagramViewerMessages.class); } + public static String ViewMenu_label_text; public static String EditorActionContributor_refresh_visual_mapping; public static String DiagramViewer_diagram_for; public static String AutoLayoutAction_auto_layout; + public static String CollapseAllAction_collapse_all; + public static String ExpandAllAction_expand_all; public static String ExportImageAction_export_as_image; public static String ExportImageAction_bmp_format; public static String ExportImageAction_error; @@ -39,4 +42,7 @@ public static String ShapeSetConstraintCommand_move; public static String PartFactory_canot_create_part_for_model_element; public static String PartFactory_null; + public static String CreateGuideCommand_Label; + public static String DeleteGuideCommand_Label; + public static String MoveGuideCommand_Label; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,6 +1,9 @@ +ViewMenu_label_text=&View EditorActionContributor_refresh_visual_mapping=Refresh Visual Mapping DiagramViewer_diagram_for=Diagram for AutoLayoutAction_auto_layout=Auto layout +CollapseAllAction_collapse_all=Collapse All +ExpandAllAction_expand_all=Expand All ExportImageAction_export_as_image=Export as Image ExportImageAction_bmp_format=Bitmap format (*.bmp) ExportImageAction_error=Error @@ -15,3 +18,6 @@ ShapeSetConstraintCommand_move=move PartFactory_canot_create_part_for_model_element=Can't create part for model element: PartFactory_null=null +CreateGuideCommand_Label=Create Guide +DeleteGuideCommand_Label=Delete Guide +MoveGuideCommand_Label=Move Guide Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/UiPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/UiPlugin.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/UiPlugin.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -22,6 +22,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.osgi.framework.BundleContext; +/** + * + */ public class UiPlugin extends AbstractUIPlugin { public final static String ID = "org.jboss.tools.hibernate.ui"; //$NON-NLS-1$ @@ -65,13 +68,13 @@ return ImageDescriptor.createFromURL(url); } - public static IWorkbenchPage getPage(){ + public static IWorkbenchPage getPage() { IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); return window.getActivePage(); } - public static Shell getShell(){ + public static Shell getShell() { IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); return window.getShell(); Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java (from rev 16533, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/EditorActionContributor.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,103 @@ +/******************************************************************************* + * 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; + +import org.eclipse.gef.editparts.ZoomManager; +import org.eclipse.gef.internal.GEFMessages; +import org.eclipse.gef.ui.actions.ActionBarContributor; +import org.eclipse.gef.ui.actions.GEFActionConstants; +import org.eclipse.gef.ui.actions.RedoRetargetAction; +import org.eclipse.gef.ui.actions.UndoRetargetAction; +import org.eclipse.gef.ui.actions.ZoomComboContributionItem; +import org.eclipse.gef.ui.actions.ZoomInRetargetAction; +import org.eclipse.gef.ui.actions.ZoomOutRetargetAction; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.actions.RetargetAction; +import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.UiPlugin; +import org.jboss.tools.hibernate.ui.view.ImageBundle; + +@SuppressWarnings("restriction") +public class DiagramActionBarContributor extends ActionBarContributor { + + /** + * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions() + */ + protected void buildActions() { + IWorkbenchAction workbenchAction = ActionFactory.REFRESH.create(getPage().getWorkbenchWindow()); + workbenchAction.setImageDescriptor(UiPlugin.getImageDescriptor2(ImageBundle.getString("Explorer.refreshOrmGef"))); //$NON-NLS-1$ + workbenchAction.setToolTipText(DiagramViewerMessages.EditorActionContributor_refresh_visual_mapping); + addAction(workbenchAction); + addRetargetAction(new UndoRetargetAction()); + addRetargetAction(new RedoRetargetAction()); + addRetargetAction(new ZoomInRetargetAction()); + addRetargetAction(new ZoomOutRetargetAction()); + + addRetargetAction(new RetargetAction( + GEFActionConstants.TOGGLE_RULER_VISIBILITY, + GEFMessages.ToggleRulerVisibility_Label, IAction.AS_CHECK_BOX)); + + addRetargetAction(new RetargetAction( + GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY, + GEFMessages.ToggleSnapToGeometry_Label, IAction.AS_CHECK_BOX)); + + addRetargetAction(new RetargetAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY, + GEFMessages.ToggleGrid_Label, IAction.AS_CHECK_BOX)); + } + + /** + * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToToolBar(IToolBarManager) + */ + public void contributeToToolBar(IToolBarManager tbm) { + tbm.add(getAction(ActionFactory.REFRESH.getId())); + tbm.add(getAction(ActionFactory.UNDO.getId())); + tbm.add(getAction(ActionFactory.REDO.getId())); + tbm.add(new Separator()); + //tbm.add(getAction(GEFActionConstants.ZOOM_IN)); + //tbm.add(getAction(GEFActionConstants.ZOOM_OUT)); + String[] zoomStrings = new String[] { + ZoomManager.FIT_ALL, + ZoomManager.FIT_HEIGHT, + ZoomManager.FIT_WIDTH + }; + tbm.add(new ZoomComboContributionItem(getPage(), zoomStrings)); + } + + /** + * @see org.eclipse.gef.ui.actions.ActionBarContributor#declareGlobalActionKeys() + */ + protected void declareGlobalActionKeys() { + addGlobalActionKey(ActionFactory.PRINT.getId()); + addGlobalActionKey(ActionFactory.SELECT_ALL.getId()); + } + + /** + * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToMenu(IMenuManager) + */ + public void contributeToMenu(IMenuManager menubar) { + super.contributeToMenu(menubar); + MenuManager viewMenu = new MenuManager(DiagramViewerMessages.ViewMenu_label_text); + viewMenu.add(getAction(GEFActionConstants.ZOOM_IN)); + viewMenu.add(getAction(GEFActionConstants.ZOOM_OUT)); + viewMenu.add(new Separator()); + viewMenu.add(getAction(GEFActionConstants.TOGGLE_RULER_VISIBILITY)); + viewMenu.add(getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY)); + viewMenu.add(getAction(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY)); + menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu); + } +} \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -19,12 +19,14 @@ import org.eclipse.draw2d.Viewport; import org.eclipse.draw2d.parts.ScrollableThumbnail; import org.eclipse.draw2d.parts.Thumbnail; +import org.eclipse.gef.ContextMenuProvider; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.LayerConstants; import org.eclipse.gef.RootEditPart; import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.gef.editparts.ZoomManager; +import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.gef.ui.parts.ContentOutlinePage; import org.eclipse.gef.ui.parts.SelectionSynchronizer; import org.eclipse.jface.action.Action; @@ -36,12 +38,17 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.PageBook; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.diagram.editors.parts.TreePartFactory; +import org.jboss.tools.hibernate.ui.diagram.editors.popup.PopupMenuProvider; - +/** + * + */ public class DiagramContentOutlinePage extends ContentOutlinePage implements IAdaptable { @@ -68,16 +75,17 @@ static final int ID_OVERVIEW = 1; private Thumbnail thumbnail; + + private ActionRegistry actionRegistry; - IPageSite pSite; - /** * The constructor * * @param viewer */ - public DiagramContentOutlinePage(EditPartViewer viewer) { + public DiagramContentOutlinePage(EditPartViewer viewer, ActionRegistry actionRegistry) { super(viewer); + this.actionRegistry = actionRegistry; } /** @@ -89,7 +97,7 @@ this.graphicalViewer = graphicalViewer; } - public void update(GraphicalViewer graphicalViewer){ + public void update(GraphicalViewer graphicalViewer) { if (this.graphicalViewer != null) { if (this.graphicalViewer != graphicalViewer) { getSelectionSynchronizer().removeViewer(this.graphicalViewer); @@ -132,7 +140,16 @@ */ public void init(IPageSite pageSite) { super.init(pageSite); - this.pSite = pageSite; + ActionRegistry registry = getActionRegistry(); + if (registry == null) { + return; + } + IActionBars bars = pageSite.getActionBars(); + String id = ActionFactory.UNDO.getId(); + bars.setGlobalActionHandler(id, registry.getAction(id)); + id = ActionFactory.REDO.getId(); + bars.setGlobalActionHandler(id, registry.getAction(id)); + bars.updateActionBars(); } /** @@ -142,6 +159,11 @@ protected void configureOutlineViewer() { getViewer().setEditDomain(editor.getDefaultEditDomain()); getViewer().setEditPartFactory(new TreePartFactory()); + ContextMenuProvider provider = new PopupMenuProvider(getViewer(), getActionRegistry()); + getViewer().setContextMenu(provider); + getSite().registerContextMenu( + "org.jboss.tools.hibernate.ui.diagram.editors.popup.outline.contextmenu", //$NON-NLS-1$ + provider, getSite().getSelectionProvider()); IToolBarManager tbm = getSite().getActionBars().getToolBarManager(); showOutlineAction = new Action() { public void run() { @@ -318,4 +340,8 @@ this.editor = editor; } + protected ActionRegistry getActionRegistry() { + return actionRegistry; + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -10,23 +10,40 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.diagram.editors; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.draw2d.PositionConstants; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.MouseWheelHandler; +import org.eclipse.gef.MouseWheelZoomHandler; +import org.eclipse.gef.SnapToGeometry; +import org.eclipse.gef.SnapToGrid; import org.eclipse.gef.dnd.TemplateTransferDropTargetListener; +import org.eclipse.gef.editparts.ZoomManager; import org.eclipse.gef.requests.CreationFactory; import org.eclipse.gef.requests.SimpleFactory; +import org.eclipse.gef.rulers.RulerProvider; import org.eclipse.gef.ui.actions.ActionRegistry; +import org.eclipse.gef.ui.actions.ToggleGridAction; +import org.eclipse.gef.ui.actions.ToggleRulerVisibilityAction; +import org.eclipse.gef.ui.actions.ToggleSnapToGeometryAction; import org.eclipse.gef.ui.actions.WorkbenchPartAction; +import org.eclipse.gef.ui.actions.ZoomInAction; +import org.eclipse.gef.ui.actions.ZoomOutAction; import org.eclipse.gef.ui.parts.GraphicalEditor; +import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer; import org.eclipse.gef.ui.parts.TreeViewer; +import org.eclipse.gef.ui.rulers.RulerComposite; import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.TransferDropTargetListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.actions.ActionFactory; @@ -35,6 +52,8 @@ import org.hibernate.mapping.RootClass; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.CollapseAllAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExpandAllAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenSourceAction; @@ -44,17 +63,25 @@ import org.jboss.tools.hibernate.ui.diagram.editors.parts.OrmEditPart; import org.jboss.tools.hibernate.ui.diagram.editors.parts.OrmEditPartFactory; import org.jboss.tools.hibernate.ui.diagram.editors.popup.PopupMenuProvider; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRulerProvider; import org.jboss.tools.hibernate.ui.view.ObjectEditorInput; +/** + * + */ public class DiagramViewer extends GraphicalEditor { private OrmDiagram ormDiagram = null; + private GEFRootEditPart gefRootEditPart = new GEFRootEditPart(); + private RulerComposite rulerComp; public DiagramViewer() { setEditDomain(new DefaultEditDomain(this)); } public void doSave(IProgressMonitor monitor) { + saveProperties(); ormDiagram.save(); ormDiagram.setDirty(false); } @@ -65,13 +92,43 @@ protected void initializeGraphicalViewer() { final GraphicalViewer viewer = getGraphicalViewer(); viewer.setEditPartFactory(new OrmEditPartFactory()); - viewer.setRootEditPart(new GEFRootEditPart()); + // + List<String> zoomLevels = new ArrayList<String>(3); + zoomLevels.add(ZoomManager.FIT_ALL); + zoomLevels.add(ZoomManager.FIT_WIDTH); + zoomLevels.add(ZoomManager.FIT_HEIGHT); + gefRootEditPart.getZoomManager().setZoomLevelContributions(zoomLevels); + IAction zoomIn = new ZoomInAction(gefRootEditPart.getZoomManager()); + IAction zoomOut = new ZoomOutAction(gefRootEditPart.getZoomManager()); + getActionRegistry().registerAction(zoomIn); + getActionRegistry().registerAction(zoomOut); + // + viewer.setRootEditPart(gefRootEditPart); viewer.addDropTargetListener(createTransferDropTargetListener()); viewer.setContents(ormDiagram); PopupMenuProvider provider = new PopupMenuProvider(viewer, getActionRegistry()); viewer.setContextMenu(provider); getSite().registerContextMenu("FlowDiagramContextmenu", provider, viewer); //$NON-NLS-1$ + // Scroll-wheel Zoom + viewer.setProperty(MouseWheelHandler.KeyGenerator.getKey(SWT.MOD1), + MouseWheelZoomHandler.SINGLETON); + // Ruler properties + DiagramRuler ruler = ormDiagram.getRuler(PositionConstants.WEST); + RulerProvider rulerProvider = null; + if (ruler != null) { + rulerProvider = new DiagramRulerProvider(ruler); + } + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_VERTICAL_RULER, rulerProvider); + ruler = ormDiagram.getRuler(PositionConstants.NORTH); + rulerProvider = null; + if (ruler != null) { + rulerProvider = new DiagramRulerProvider(ruler); + } + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER, rulerProvider); + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_RULER_VISIBILITY, + new Boolean(ormDiagram.getRulerVisibility())); + loadProperties(); } public GraphicalViewer getEditPartViewer() { @@ -80,7 +137,8 @@ protected void createActions() { - getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.REFRESH.getId(),new WorkbenchPartAction(this){ + getEditorSite().getActionBars().setGlobalActionHandler( + ActionFactory.REFRESH.getId(), new WorkbenchPartAction(this) { protected boolean calculateEnabled() { return true; @@ -92,7 +150,10 @@ super.createActions(); - getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PRINT.getId(), getActionRegistry().getAction(ActionFactory.PRINT.getId())); + getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PRINT.getId(), + getActionRegistry().getAction(ActionFactory.PRINT.getId())); + getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), + getActionRegistry().getAction(ActionFactory.SELECT_ALL.getId())); ActionRegistry registry = getActionRegistry(); IAction action; @@ -109,6 +170,18 @@ action = new AutoLayoutAction(this); registry.registerAction(action); + action = new CollapseAllAction(this); + registry.registerAction(action); + + action = new ExpandAllAction(this); + registry.registerAction(action); + + action = new ZoomInAction(gefRootEditPart.getZoomManager()); + registry.registerAction(action); + + action = new ZoomOutAction(gefRootEditPart.getZoomManager()); + registry.registerAction(action); + } private TransferDropTargetListener createTransferDropTargetListener() { @@ -153,20 +226,26 @@ ormDiagram = new OrmDiagram(configuration, rootClasses); } super.setInput(input); + loadProperties(); } + /** + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) + */ @SuppressWarnings("unchecked") public Object getAdapter(Class type) { if (type == IContentOutlinePage.class) { DiagramContentOutlinePage outline = new DiagramContentOutlinePage( - new TreeViewer()); + new TreeViewer(), getActionRegistry()); outline.setGraphicalViewer(getGraphicalViewer()); outline.setSelectionSynchronizer(getSelectionSynchronizer()); outline.setOrmDiagram(ormDiagram); outline.setEditor(this); return outline; } - + if (type == ZoomManager.class) { + return getGraphicalViewer().getProperty(ZoomManager.class.toString()); + } return super.getAdapter(type); } @@ -192,4 +271,86 @@ return getEditDomain(); } + protected void configureGraphicalViewer() { + super.configureGraphicalViewer(); + // + loadProperties(); + // Actions + IAction showRulers = new ToggleRulerVisibilityAction(getGraphicalViewer()); + getActionRegistry().registerAction(showRulers); + + IAction snapAction = new ToggleSnapToGeometryAction(getGraphicalViewer()); + getActionRegistry().registerAction(snapAction); + + IAction showGrid = new ToggleGridAction(getGraphicalViewer()); + getActionRegistry().registerAction(showGrid); + } + + protected boolean loadProperties() { + if (ormDiagram == null || getGraphicalViewer() == null) { + return false; + } + // Ruler properties + DiagramRuler ruler = ormDiagram.getRuler(PositionConstants.WEST); + RulerProvider provider = null; + if (ruler != null) { + provider = new DiagramRulerProvider(ruler); + } + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_VERTICAL_RULER, provider); + ruler = ormDiagram.getRuler(PositionConstants.NORTH); + provider = null; + if (ruler != null) { + provider = new DiagramRulerProvider(ruler); + } + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER, provider); + getGraphicalViewer().setProperty(RulerProvider.PROPERTY_RULER_VISIBILITY, + new Boolean(ormDiagram.getRulerVisibility())); + + // Snap to Geometry property + getGraphicalViewer().setProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED, + new Boolean(ormDiagram.isSnapToGeometryEnabled())); + + // Grid properties + getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, + new Boolean(ormDiagram.isGridEnabled())); + // We keep grid visibility and enablement in sync + getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, + new Boolean(ormDiagram.isGridEnabled())); + + // Zoom + ZoomManager manager = (ZoomManager)getGraphicalViewer() + .getProperty(ZoomManager.class.toString()); + if (manager != null) { + manager.setZoom(ormDiagram.getZoom()); + } + return true; + } + + protected boolean saveProperties() { + if (ormDiagram == null || getGraphicalViewer() == null) { + return false; + } + ormDiagram.setRulerVisibility(((Boolean)getGraphicalViewer() + .getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY)).booleanValue()); + ormDiagram.setGridEnabled(((Boolean)getGraphicalViewer() + .getProperty(SnapToGrid.PROPERTY_GRID_ENABLED)).booleanValue()); + ormDiagram.setSnapToGeometry(((Boolean)getGraphicalViewer() + .getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED)).booleanValue()); + ZoomManager manager = (ZoomManager)getGraphicalViewer() + .getProperty(ZoomManager.class.toString()); + if (manager != null) { + ormDiagram.setZoom(manager.getZoom()); + } + return true; + } + + + /* (non-Javadoc) + * @see org.eclipse.gef.ui.parts.GraphicalEditor#createGraphicalViewer(org.eclipse.swt.widgets.Composite) + */ + protected void createGraphicalViewer(Composite parent) { + rulerComp = new RulerComposite(parent, SWT.NONE); + super.createGraphicalViewer(rulerComp); + rulerComp.setGraphicalViewer((ScrollingGraphicalViewer)getGraphicalViewer()); + } } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/EditorActionContributor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/EditorActionContributor.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/EditorActionContributor.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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; - -import org.eclipse.gef.ui.actions.ActionBarContributor; -import org.eclipse.gef.ui.actions.RedoRetargetAction; -import org.eclipse.gef.ui.actions.UndoRetargetAction; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; -import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; -import org.jboss.tools.hibernate.ui.diagram.UiPlugin; -import org.jboss.tools.hibernate.ui.view.ImageBundle; - -public class EditorActionContributor extends ActionBarContributor { - - protected void buildActions() { - IWorkbenchAction workbenchAction = ActionFactory.REFRESH.create(getPage().getWorkbenchWindow()); - workbenchAction.setImageDescriptor(UiPlugin.getImageDescriptor2(ImageBundle.getString("Explorer.refreshOrmGef"))); //$NON-NLS-1$ - workbenchAction.setToolTipText(DiagramViewerMessages.EditorActionContributor_refresh_visual_mapping); - addAction(workbenchAction); - addRetargetAction(new UndoRetargetAction()); - addRetargetAction(new RedoRetargetAction()); - } - - public void contributeToToolBar(IToolBarManager toolBarManager) { - toolBarManager.add(getAction(ActionFactory.REFRESH.getId())); - toolBarManager.add(getAction(ActionFactory.UNDO.getId())); - toolBarManager.add(getAction(ActionFactory.REDO.getId())); - } - - protected void declareGlobalActionKeys() { - } -} \ No newline at end of file Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/CollapseAllAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/CollapseAllAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/CollapseAllAction.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.action.Action; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * + */ +public class CollapseAllAction extends Action { + + public static final String ACTION_ID = "collapse_all_id"; //$NON-NLS-1$ + + private DiagramViewer editor; + + public CollapseAllAction(DiagramViewer editor) { + this.editor = editor; + setId(ACTION_ID); + setText(DiagramViewerMessages.CollapseAllAction_collapse_all); + //setImageDescriptor(ImageDescriptor.createFromFile( + // DiagramViewer.class, "icons/export.png")); + } + + public void run() { + editor.getViewerContents().collapseAll(); + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExpandAllAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExpandAllAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExpandAllAction.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.action.Action; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; + +/** + * + */ +public class ExpandAllAction extends Action { + + public static final String ACTION_ID = "expand_all_id"; //$NON-NLS-1$ + + private DiagramViewer editor; + + public ExpandAllAction(DiagramViewer editor) { + this.editor = editor; + setId(ACTION_ID); + setText(DiagramViewerMessages.ExpandAllAction_expand_all); + //setImageDescriptor(ImageDescriptor.createFromFile( + // DiagramViewer.class, "icons/export.png")); + } + + public void run() { + editor.getViewerContents().expandAll(); + } +} 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-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -58,7 +58,7 @@ Shape shape = iterator.next(); Object selection = shape.getOrmElement(); if (selection instanceof Property - && ((Property)selection).getPersistentClass() instanceof SpecialRootClass){ + && ((Property)selection).getPersistentClass() instanceof SpecialRootClass) { Property compositSel = ((Property)selection); Property parentProperty = ((SpecialRootClass)compositSel.getPersistentClass()).getProperty(); try { @@ -77,7 +77,7 @@ } Shape shapeParent = null; Object selectionParent = null; - if (selection instanceof Column){ + if (selection instanceof Column) { shapeParent = (Shape)shape.getParent(); selectionParent = shapeParent.getOrmElement(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.diagram.editors.autolayout; +/** + * interface to provide information about whole diagram + */ public interface IDiagramInfo { IItemInfo[] getItems(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -16,7 +16,7 @@ public class AutoLayoutImpl { - LayuotConstants constants = new LayuotConstants(); + LayoutConstants constants = new LayoutConstants(); protected Items items; public AutoLayoutImpl() {} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -14,7 +14,7 @@ import java.util.List; public class Group { - LayuotConstants constants; + LayoutConstants constants; int number; List<Integer> itemList = new ArrayList<Integer>(); Item[] allitems = null; @@ -30,7 +30,7 @@ allitems = items; } - public void setConstants(LayuotConstants constants) { + public void setConstants(LayoutConstants constants) { this.constants = constants; } @@ -229,7 +229,7 @@ for (int i = 0; i < xDeltas.length; i++) { xDeltas[i] = 0; } - // /if(hasSetItems()) return; + // /if (hasSetItems()) return; for (int i = 0; i < items.length; i++) { int c = getItem(i).ix; if (c >= xDeltas.length) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -13,7 +13,7 @@ import java.util.*; public class Groups { - protected LayuotConstants constants; + protected LayoutConstants constants; static int FX = 30, FY = 120; List<Group> groups = new ArrayList<Group>(); Item[] items; @@ -23,7 +23,7 @@ public Groups() { } - public void setConstants(LayuotConstants constants) { + public void setConstants(LayoutConstants constants) { this.constants = constants; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -17,7 +17,7 @@ import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IDiagramInfo; public class Items { - protected LayuotConstants constants; + protected LayoutConstants constants; protected IDiagramInfo process; protected Item[] items; protected Map<String, Item> paths = new HashMap<String, Item>(); @@ -27,7 +27,7 @@ public Items() { } - public void setConstants(LayuotConstants constants) { + public void setConstants(LayoutConstants constants) { this.constants = constants; groups.setConstants(constants); } Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayoutConstants.java (from rev 16533, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayuotConstants.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayoutConstants.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayoutConstants.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2007 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.autolayout.impl; + +public class LayoutConstants { + static int DELTA_X = 200; + static int DELTA_Y = 104; + static int X_INC = 32; + static int Y_INC = 24; + + public int deltaX = DELTA_X; + public int deltaY = DELTA_Y; + public int incX = X_INC; + public int incY = Y_INC; + public int indentX = 24; + public int indentY = 16; + + public void update(String gridStep) { + int step = 0; + try { + step = Integer.parseInt(gridStep); + } catch (NumberFormatException e) { + deltaX = DELTA_X; + deltaY = DELTA_Y; + incX = X_INC; + incY = Y_INC; + } + indentX = (step < 24) ? 24 : step; + indentY = (step < 16) ? 16 : step; + if (step == 16) { + deltaX = 208; + deltaY = 112; + incX = 16; + incY = 32; + indentX = 32; + } else if (step == 24) { + deltaX = 240; + deltaY = 120; + incX = 24; + incY = 24; + } else if (step == 32) { + deltaX = 256; + deltaY = 128; + incX = 32; + incY = 32; + } else if (step == 40) { + deltaX = 240; + deltaY = 120; + incX = 40; + incY = 40; + } else { + deltaX = DELTA_X; + deltaY = DELTA_Y; + incX = X_INC; + incY = Y_INC; + } + } + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayuotConstants.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayuotConstants.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/LayuotConstants.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.autolayout.impl; - -public class LayuotConstants { - static int DELTA_X = 200; - static int DELTA_Y = 104; - static int X_INC = 32; - static int Y_INC = 24; - - public int deltaX = DELTA_X; - public int deltaY = DELTA_Y; - public int incX = X_INC; - public int incY = Y_INC; - public int indentX = 24; - public int indentY = 16; - - public void update(String gridStep) { - int step = 0; - try { - step = Integer.parseInt(gridStep); - } catch (NumberFormatException e) { - deltaX = DELTA_X; - deltaY = DELTA_Y; - incX = X_INC; - incY = Y_INC; - } - indentX = (step < 24) ? 24 : step; - indentY = (step < 16) ? 16 : step; - if (step == 16) { - deltaX = 208; - deltaY = 112; - incX = 16; - incY = 32; - indentX = 32; - } else if (step == 24) { - deltaX = 240; - deltaY = 120; - incX = 24; - incY = 24; - } else if (step == 32) { - deltaX = 256; - deltaY = 128; - incX = 32; - incY = 32; - } else if (step == 40) { - deltaX = 240; - deltaY = 120; - incX = 40; - incY = 40; - } else { - deltaX = DELTA_X; - deltaY = DELTA_Y; - incX = X_INC; - incY = Y_INC; - } - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -69,7 +69,7 @@ int iy2 = items[is[k]].iy; int miny = Math.min(iy, iy2); int maxy = Math.max(iy, iy2); - if(maxy - miny > delta) delta = maxy - miny; + if (maxy - miny > delta) delta = maxy - miny; for (int m = 0; m < occ0.length; m++) { for (int y = miny; y <= maxy; y++) { if (occ[m][y] > 0) { @@ -90,7 +90,9 @@ private int getMaxX() { int ix = 0; for (int i = 0; i < items.length; i++) { - if(items[i].ix > ix) ix = items[i].ix; + if (items[i].ix > ix) { + ix = items[i].ix; + } } return ix; } @@ -98,7 +100,9 @@ private int getMaxY() { int iy = 0; for (int i = 0; i < items.length; i++) { - if(items[i].iy > iy) iy = items[i].iy; + if (items[i].iy > iy) { + iy = items[i].iy; + } } return iy; } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ChangeGuideCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ChangeGuideCommand.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ChangeGuideCommand.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,66 @@ +/******************************************************************************* + * 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.command; + +import org.eclipse.gef.commands.Command; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; + +/** + * + */ +public class ChangeGuideCommand extends Command { + + private OrmShape part; + private DiagramGuide oldGuide, newGuide; + private int oldAlign, newAlign; + private boolean horizontal; + + public ChangeGuideCommand(OrmShape part, boolean horizontalGuide) { + super(); + this.part = part; + horizontal = horizontalGuide; + } + + protected void changeGuide(DiagramGuide oldGuide, DiagramGuide newGuide, int newAlignment) { + if (oldGuide != null && oldGuide != newGuide) { + oldGuide.detachPart(part); + } + // You need to re-attach the part even if the oldGuide and the newGuide are the same + // because the alignment could have changed + if (newGuide != null) { + newGuide.attachPart(part, newAlignment); + } + } + + public void execute() { + // Cache the old values + oldGuide = horizontal ? part.getHorizontalGuide() : part.getVerticalGuide(); + if (oldGuide != null) { + oldAlign = oldGuide.getAlignment(part); + } + redo(); + } + + public void redo() { + changeGuide(oldGuide, newGuide, newAlign); + } + + public void setNewGuide(DiagramGuide guide, int alignment) { + newGuide = guide; + newAlign = alignment; + } + + public void undo() { + changeGuide(newGuide, oldGuide, oldAlign); + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/CreateGuideCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/CreateGuideCommand.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/CreateGuideCommand.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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.command; + +import org.eclipse.gef.commands.Command; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler; + +/** + * + */ +public class CreateGuideCommand extends Command { + + private DiagramGuide guide; + private DiagramRuler parent; + private int position; + + public CreateGuideCommand(DiagramRuler parent, int position) { + super(DiagramViewerMessages.CreateGuideCommand_Label); + this.parent = parent; + this.position = position; + } + + public boolean canUndo() { + return true; + } + + public void execute() { + if (guide == null) { + guide = new DiagramGuide(!parent.isHorizontal()); + } + guide.setPosition(position); + parent.addGuide(guide); + } + + public void undo() { + parent.removeGuide(guide); + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/DeleteGuideCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/DeleteGuideCommand.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/DeleteGuideCommand.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,59 @@ +/******************************************************************************* + * 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.command; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.eclipse.gef.commands.Command; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler; + +/** + * + */ +public class DeleteGuideCommand extends Command { + + private DiagramRuler parent; + private DiagramGuide guide; + private Map<OrmShape, Integer> oldParts; + + public DeleteGuideCommand(DiagramGuide guide, DiagramRuler parent) { + super(DiagramViewerMessages.DeleteGuideCommand_Label); + this.guide = guide; + this.parent = parent; + } + + public boolean canUndo() { + return true; + } + + public void execute() { + oldParts = new HashMap<OrmShape, Integer>(guide.getMap()); + Iterator<OrmShape> iter = oldParts.keySet().iterator(); + while (iter.hasNext()) { + guide.detachPart(iter.next()); + } + parent.removeGuide(guide); + } + + public void undo() { + parent.addGuide(guide); + Iterator<OrmShape> iter = oldParts.keySet().iterator(); + while (iter.hasNext()) { + OrmShape part = iter.next(); + guide.attachPart(part, oldParts.get(part).intValue()); + } + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/MoveGuideCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/MoveGuideCommand.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/MoveGuideCommand.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,65 @@ +/******************************************************************************* + * 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.command; + +import java.util.Iterator; + +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.gef.commands.Command; +import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; + +/** + * + */ +public class MoveGuideCommand extends Command { + + private int pDelta; + private DiagramGuide guide; + + public MoveGuideCommand(DiagramGuide guide, int positionDelta) { + super(DiagramViewerMessages.MoveGuideCommand_Label); + this.guide = guide; + pDelta = positionDelta; + } + + public void execute() { + guide.setPosition(guide.getPosition() + pDelta); + Iterator<OrmShape> iter = guide.getParts().iterator(); + while (iter.hasNext()) { + OrmShape part = iter.next(); + Point location = part.getLocation().getCopy(); + if (guide.isHorizontal()) { + location.y += pDelta; + } else { + location.x += pDelta; + } + part.setLocation(location); + } + } + + public void undo() { + guide.setPosition(guide.getPosition() - pDelta); + Iterator<OrmShape> iter = guide.getParts().iterator(); + while (iter.hasNext()) { + OrmShape part = (OrmShape)iter.next(); + Point location = part.getLocation().getCopy(); + if (guide.isHorizontal()) { + location.y -= pDelta; + } else { + location.x -= pDelta; + } + part.setLocation(location); + } + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ShapeSetConstraintCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ShapeSetConstraintCommand.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ShapeSetConstraintCommand.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.diagram.editors.command; - import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; @@ -18,7 +17,9 @@ import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; - +/** + * + */ public class ShapeSetConstraintCommand extends Command { private final Point newLocation; private Point oldLocation; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/ComponentFigure.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -15,6 +15,10 @@ import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +/** + * + */ +@SuppressWarnings("unchecked") public class ComponentFigure extends Figure { private boolean childsHiden = false; @@ -31,18 +35,19 @@ } public List getChildren() { + List res = super.getChildren(); if (childsHiden) { - return super.getChildren().subList(0,1); + res = res.subList(0, 1); } - return super.getChildren(); + return res; } public void setChildsHiden(boolean childsHiden) { - this.childsHiden = childsHiden; - for (int i = 0; i < getChildren().size(); i++) { - if (getChildren().get(i) instanceof TitleLabel) { - ((TitleLabel)getChildren().get(i)).setHidden(childsHiden); + List children = getChildren(); + for (int i = 0; i < children.size(); i++) { + if (children.get(i) instanceof TitleLabel) { + ((TitleLabel)children.get(i)).setHidden(childsHiden); } } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/RoundPolylineConnection.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/RoundPolylineConnection.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/RoundPolylineConnection.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -12,17 +12,38 @@ import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.PolylineConnection; +import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PointList; +/** + * Round angles of base polyline connection. + * @see PolylineConnection + */ public class RoundPolylineConnection extends PolylineConnection { + + private transient Point beg = new Point(); + private transient Point end = new Point(); + private transient Point eCorner = new Point(); + private transient Point bCorner = new Point(); + + /** + * @see Shape#outlineShape(Graphics) + */ protected void outlineShape(Graphics g) { + // this function draw "right angle" polyline connection + //super.outlineShape(g); + // this function draw rounded polyline connection + outlineRoundedShape(g); + } + + /** + * Outline rounded polyline connection + * @param g + */ + protected void outlineRoundedShape(Graphics g) { PointList points = getPoints(); Point point = points.getPoint(0); - Point beg = new Point(); - Point end = new Point(); - Point eCorner = new Point(); - Point bCorner = new Point(); boolean horiz; beg.x = point.x; beg.y = point.y; @@ -39,11 +60,11 @@ Point point3 = points.getPoint(2); Point point4 = points.getPoint(3); if (point1.x < point4.x) { - point2.x -= delta/2; - point3.x += delta/2; + point2.x -= delta / 2; + point3.x += delta / 2; } else { - point2.x += delta/2; - point3.x -= delta/2; + point2.x += delta / 2; + point3.x -= delta / 2; } g.drawLine(point1, point2); g.drawLine(point2, point3); @@ -56,12 +77,7 @@ point = points.getPoint(i); end.x = point.x; end.y = point.y; - - if (beg.y == end.y) - horiz = true; - else - horiz = false; - + horiz = (beg.y == end.y); eCorner.x = 0; if (i != 1) { if (horiz) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/figures/TitleFigure.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -15,6 +15,10 @@ import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; +/** + * + */ +@SuppressWarnings("unchecked") public class TitleFigure extends Figure { private boolean hiden = false; @@ -31,10 +35,9 @@ } public List getChildren() { - if (hiden) { - return super.getChildren().subList(0,1); - } - return super.getChildren(); + List res = super.getChildren(); + res = hiden ? res.subList(0, 1) : res; + return res; } public void setHidden(boolean hiden) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -30,6 +30,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Point; import org.eclipse.jdt.core.IJavaProject; import org.hibernate.cfg.Configuration; @@ -52,6 +53,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler; import org.jboss.tools.hibernate.ui.view.HibernateUtils; public class OrmDiagram extends ModelElement { @@ -65,8 +67,14 @@ private ConsoleConfiguration consoleConfig; private String[] entityNames; public static final String HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME = "hibernateMapping"; //$NON-NLS-1$ + protected DiagramRuler leftRuler, topRuler; + private boolean rulersVisibility = false; + private boolean snapToGeometry = false; + private boolean gridEnabled = false; + private double zoom = 1.0; public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass ioe) { + createRulers(); this.consoleConfig = consoleConfig; ormElements = new RootClass[1]; ormElements[0] = ioe; @@ -82,6 +90,7 @@ } public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass[] ioe) { + createRulers(); this.consoleConfig = consoleConfig; ormElements = new RootClass[ioe.length]; System.arraycopy(ioe, 0, ormElements, 0, ioe.length); @@ -100,6 +109,11 @@ load(); setDirty(false); } + + protected void createRulers() { + leftRuler = new DiagramRuler(false); + topRuler = new DiagramRuler(true); + } protected class OrmElCompare implements Comparator<RootClass> { @@ -221,7 +235,29 @@ firePropertyChange(REFRESH, null, null); } - private void expandModel(ModelElement element){ + public void collapseAll() { + toggleModelState(this, false); + } + + public void expandAll() { + toggleModelState(this, true); + } + + private void toggleModelState(ModelElement element, final boolean state) { + if (element instanceof OrmShape) { + OrmShape ormShape = ((OrmShape)element); + boolean refresh = state ? ormShape.isHiden() : !ormShape.isHiden(); + if (refresh) { + ormShape.refreshHiden(); + } + } + Iterator<Shape> it = element.getChildrenList().iterator(); + while (it.hasNext()) { + toggleModelState(it.next(), state); + } + } + + private void expandModel(ModelElement element) { if (element.getClass().equals(ExpandeableShape.class)) { processExpand((ExpandeableShape)element); } else if (element.getClass().equals(ComponentShape.class)) { @@ -304,7 +340,7 @@ @SuppressWarnings("unchecked") - private OrmShape getOrCreatePersistentClass(PersistentClass persistentClass, Table componentClassDatabaseTable){ + private OrmShape getOrCreatePersistentClass(PersistentClass persistentClass, Table componentClassDatabaseTable) { OrmShape classShape = null; if (persistentClass == null) { return classShape; @@ -414,7 +450,7 @@ } @SuppressWarnings("unchecked") - private OrmShape getOrCreateDatabaseTable(Table databaseTable){ + private OrmShape getOrCreateDatabaseTable(Table databaseTable) { OrmShape tableShape = null; if (databaseTable != null) { String tableName = HibernateUtils.getTableName(databaseTable); @@ -441,7 +477,7 @@ } @SuppressWarnings("unchecked") - private void createConnections(ExpandeableShape persistentClass, ExpandeableShape dbTable){ + private void createConnections(ExpandeableShape persistentClass, ExpandeableShape dbTable) { Property parentProperty = null; if (persistentClass.getOrmElement() instanceof SpecialRootClass) { parentProperty = ((SpecialRootClass)persistentClass.getOrmElement()).getParentProperty(); @@ -481,7 +517,7 @@ } } - private boolean isConnectionExist(Shape source, Shape target){ + private boolean isConnectionExist(Shape source, Shape target) { Connection conn; if (source != null && source.getSourceConnections() != null) { for (int i = 0; i < source.getSourceConnections().size(); i++) { @@ -541,13 +577,13 @@ shape.firePropertyChange(REFRESH, null, null); s.firePropertyChange(REFRESH, null, null); } - if(!shape.getParent().equals(s)) { + if (!shape.getParent().equals(s)) { shape.setReference(s); } firePropertyChange(REFRESH, null, null); } - public void update(){ + public void update() { firePropertyChange(REFRESH, null, null); } @@ -640,7 +676,7 @@ if (el instanceof Column) { Column col = (Column)el; Shape shape = childShape.getChild(col); - if (shape != null && !isConnectionExist(csChild1, shape)){ + if (shape != null && !isConnectionExist(csChild1, shape)) { new Connection(csChild1, shape); csChild1.firePropertyChange(REFRESH, null, null); shape.firePropertyChange(REFRESH, null, null); @@ -734,7 +770,7 @@ return key; } - public void propertiesInit(Properties properties, ModelElement shape){ + public void propertiesInit(Properties properties, ModelElement shape) { boolean state; if (shape instanceof OrmShape) { final OrmShape ormShape = (OrmShape)shape; @@ -774,8 +810,12 @@ } } - public void save(){ + public void save() { Properties properties = new Properties(); + properties.put("rulersVisibility", "" + rulersVisibility); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("snapToGeometry", "" + snapToGeometry); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("gridEnabled", "" + gridEnabled); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put("zoom", "" + zoom); //$NON-NLS-1$ //$NON-NLS-2$ storeProperties(properties, this); FileOutputStream fos = null; try { @@ -823,7 +863,7 @@ private boolean loadSuccessfull = false; - public void load(){ + public void load() { Properties properties = new Properties(); FileInputStream fis = null; try { @@ -831,6 +871,14 @@ if (file.exists()) { fis = new FileInputStream(file); properties.load(fis); + String str = properties.getProperty("rulersVisibility", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + rulersVisibility = Boolean.valueOf(str).booleanValue(); + str = properties.getProperty("snapToGeometry", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + snapToGeometry = Boolean.valueOf(str).booleanValue(); + str = properties.getProperty("gridEnabled", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + gridEnabled = Boolean.valueOf(str).booleanValue(); + str = properties.getProperty("zoom", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ + zoom = Double.valueOf(str).doubleValue(); propertiesInit(properties, this); loadSuccessfull = true; } @@ -852,7 +900,7 @@ } - private void setState(Properties properties,String key, boolean value) { + private void setState(Properties properties, String key, boolean value) { if (properties.containsKey(key)) { properties.remove(key); properties.put(key, Boolean.valueOf(value).toString()); @@ -896,20 +944,65 @@ } } - public void setPosition(Properties properties, OrmShape shape){ + public void setPosition(Properties properties, OrmShape shape) { Point point = shape.getLocation(); setPoint(properties, getKey(shape), point); } - public Point getPosition(Properties properties, OrmShape shape){ + public Point getPosition(Properties properties, OrmShape shape) { return getPoint(properties, getKey(shape)); } - public boolean getState(Properties properties, Shape shape){ + public boolean getState(Properties properties, Shape shape) { return getState(properties, getKey(shape) + ".state"); //$NON-NLS-1$ } public ConsoleConfiguration getConsoleConfig() { return consoleConfig; } + + public DiagramRuler getRuler(int orientation) { + DiagramRuler result = null; + switch (orientation) { + case PositionConstants.NORTH : + result = topRuler; + break; + case PositionConstants.WEST : + result = leftRuler; + break; + } + return result; + } + + public void setRulerVisibility(boolean newValue) { + rulersVisibility = newValue; + } + + public boolean getRulerVisibility() { + return rulersVisibility; + } + + public void setGridEnabled(boolean isEnabled) { + gridEnabled = isEnabled; + } + + public boolean isGridEnabled() { + return gridEnabled; + } + + public void setSnapToGeometry(boolean isEnabled) { + snapToGeometry = isEnabled; + } + + public boolean isSnapToGeometryEnabled() { + return snapToGeometry; + } + + public void setZoom(double zoom) { + this.zoom = zoom; + } + + public double getZoom() { + return zoom; + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -22,6 +22,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Subclass; import org.hibernate.mapping.Table; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; public class OrmShape extends ExpandeableShape { public static final String SET_HIDEN = "set hiden"; //$NON-NLS-1$ @@ -29,6 +30,8 @@ public static final String LOCATION_PROP = "OrmShape.Location"; //$NON-NLS-1$ private Point location = new Point(0, 0); protected boolean hiden = false; + + private DiagramGuide verticalGuide, horizontalGuide; public OrmShape(Object ioe) { super(ioe); @@ -219,7 +222,7 @@ firePropertyChange(SET_HIDEN, null, Boolean.valueOf(hiden)); } - public void refreshReference(){ + public void refreshReference() { firePropertyChange(SET_HIDEN, null, Boolean.valueOf(hiden)); } @@ -247,4 +250,20 @@ public boolean isHiden() { return hiden; } + + public DiagramGuide getHorizontalGuide() { + return horizontalGuide; + } + + public void setHorizontalGuide(DiagramGuide hGuide) { + horizontalGuide = hGuide; + } + + public DiagramGuide getVerticalGuide() { + return verticalGuide; + } + + public void setVerticalGuide(DiagramGuide vGuide) { + verticalGuide = vGuide; + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -48,17 +48,17 @@ while (iterator.hasNext()) { Property field = iterator.next(); Type type = null; - if (getOrmDiagram() != null){ + if (getOrmDiagram() != null) { ConsoleConfiguration cfg = getOrmDiagram().getConsoleConfig(); final Property fField = field; - type = (Type) cfg.execute(new Command(){ + type = (Type) cfg.execute(new Command() { public Object execute() { return fField.getValue().getType(); }}); } else { try{ type = field.getValue().getType(); - } catch (MappingException e){ + } catch (MappingException e) { //type is not accessible HibernateConsolePlugin.getDefault().logErrorMessage("MappingException: ", e); //$NON-NLS-1$ } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -55,7 +55,8 @@ public void activate() { super.activate(); - if(this.getClass().equals(ComponentShapeEditPart.class) && !((ExpandeableShape)getModel()).isReferenceVisible()){ + if (this.getClass().equals(ComponentShapeEditPart.class) && + !((ExpandeableShape)getModel()).isReferenceVisible()) { ((ComponentShape)getModel()).refHide = true; ((ComponentShape)getModel()).refreshChildsHiden(((OrmDiagram)getViewer().getContents().getModel())); ((ExpandeableShape)getModel()).getOrmDiagram().setDirty(false); @@ -63,7 +64,8 @@ } public void performRequest(Request req) { - if(RequestConstants.REQ_OPEN.equals(req.getType()) && getModel() instanceof ComponentShape) { + if (RequestConstants.REQ_OPEN.equals(req.getType()) && + getModel() instanceof ComponentShape) { ((ComponentShape)getModel()).refreshChildsHiden(((OrmDiagram)getViewer().getContents().getModel())); } } @@ -74,7 +76,7 @@ int i = figure.getPreferredSize().width; ((ComponentFigure)figure).setChildsHiden(((Boolean)evt.getNewValue()).booleanValue()); - if(((Boolean)evt.getNewValue()).booleanValue()) { + if (((Boolean)evt.getNewValue()).booleanValue()) { figure.setSize(i,-1); } else { figure.setSize(-1,-1); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -24,19 +24,19 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.ManhattanConnectionRouter; import org.eclipse.draw2d.MarginBorder; +import org.eclipse.draw2d.XYLayout; import org.eclipse.draw2d.geometry.Point; -import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.CompoundSnapToHelper; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.LayerConstants; -import org.eclipse.gef.Request; -import org.eclipse.gef.commands.Command; -import org.eclipse.gef.editpolicies.NonResizableEditPolicy; -import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; -import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.eclipse.gef.requests.CreateRequest; +import org.eclipse.gef.SnapToGeometry; +import org.eclipse.gef.SnapToGrid; +import org.eclipse.gef.SnapToGuides; +import org.eclipse.gef.SnapToHelper; +import org.eclipse.gef.rulers.RulerProvider; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Component; @@ -47,7 +47,6 @@ import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IItemInfo; import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo; import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IDiagramInfo; -import org.jboss.tools.hibernate.ui.diagram.editors.command.ShapeSetConstraintCommand; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; import org.jboss.tools.hibernate.ui.diagram.editors.model.ModelElement; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; @@ -57,10 +56,14 @@ import org.jboss.tools.hibernate.ui.diagram.editors.model.SpecialRootClass; import org.jboss.tools.hibernate.ui.view.HibernateUtils; +/** + * + */ class DiagramEditPart extends OrmEditPart implements PropertyChangeListener { protected void createEditPolicies() { - installEditPolicy(EditPolicy.LAYOUT_ROLE, new ShapesXYLayoutEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, + new ShapesXYLayoutEditPolicy((XYLayout)getContentPane().getLayoutManager())); } protected IFigure createFigure() { @@ -194,11 +197,12 @@ return 0; } + @SuppressWarnings("unchecked") private int calculateTableLocation() { int j = 0; - IFigure figure; - for (int i = 0; i < getFigure().getChildren().size(); i++) { - figure = (IFigure) getFigure().getChildren().get(i); + List<IFigure> children = getFigure().getChildren(); + for (int i = 0; i < children.size(); i++) { + IFigure figure = children.get(i); if (figure.getPreferredSize().width > j) { j = figure.getPreferredSize().width; } @@ -257,42 +261,6 @@ } } - private static class ShapesXYLayoutEditPolicy extends XYLayoutEditPolicy { - - protected Command createChangeConstraintCommand( - ChangeBoundsRequest request, EditPart child, Object constraint) { - if (child instanceof OrmShapeEditPart - && constraint instanceof Rectangle) { - return new ShapeSetConstraintCommand((OrmShape) child - .getModel(), request, ((Rectangle) constraint) - .getLocation()); - } - return super.createChangeConstraintCommand(request, child, - constraint); - } - - protected Command createAddCommand(EditPart child, Object constraint) { - return null; - } - - protected Command createChangeConstraintCommand(EditPart child, - Object constraint) { - return null; - } - - protected Command getCreateCommand(CreateRequest request) { - return null; - } - - protected Command getDeleteDependantCommand(Request request) { - return null; - } - - protected EditPolicy createChildEditPolicy(EditPart child) { - return new NonResizableEditPolicy(); - } - } - class DiagramInfo implements IDiagramInfo { List<IItemInfo> items = new ArrayList<IItemInfo>(); @@ -385,8 +353,8 @@ .getEditPartRegistry().get(element); if (part != null) { IFigure fig = part.getFigure(); - shape[2] = fig.getPreferredSize().width; - shape[3] = fig.getPreferredSize().height; + shape[2] = fig.getSize().width;//fig.getPreferredSize().width; + shape[3] = fig.getSize().height;//fig.getPreferredSize().height; } else { shape[2] = 6000; shape[3] = 1000; @@ -418,7 +386,7 @@ } - static class LinkInfo implements ILinkInfo { + class LinkInfo implements ILinkInfo { Connection link = null; String id = null; @@ -439,16 +407,14 @@ this.id = id; } - /** - * - */ public String getTargetID() { - if (id != null) + if (id != null) { return id; - if (link.getTarget() != null) + } + if (link.getTarget() != null) { return link.getTarget().toString(); - else - return ""; //$NON-NLS-1$ + } + return ""; //$NON-NLS-1$ } /** @@ -457,4 +423,39 @@ public void setLinkShape(int[] vs) { } } + + + /** + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) + */ + @SuppressWarnings("unchecked") + public Object getAdapter(Class adapter) { + if (adapter == SnapToHelper.class) { + List<SnapToHelper> snapStrategies = new ArrayList<SnapToHelper>(); + Boolean val = (Boolean)getViewer().getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY); + if (val != null && val.booleanValue()) { + snapStrategies.add(new SnapToGuides(this)); + } + val = (Boolean)getViewer().getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED); + if (val != null && val.booleanValue()) { + snapStrategies.add(new SnapToGeometry(this)); + } + val = (Boolean)getViewer().getProperty(SnapToGrid.PROPERTY_GRID_ENABLED); + if (val != null && val.booleanValue()) { + snapStrategies.add(new SnapToGrid(this)); + } + if (snapStrategies.size() == 0) { + return null; + } + if (snapStrategies.size() == 1) { + return snapStrategies.get(0); + } + SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()]; + for (int i = 0; i < snapStrategies.size(); i++) { + ss[i] = (SnapToHelper)snapStrategies.get(i); + } + return new CompoundSnapToHelper(ss); + } + return super.getAdapter(adapter); + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramTreeEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramTreeEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.parts; import java.beans.PropertyChangeEvent; @@ -10,6 +20,9 @@ import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; +/** + * + */ public class DiagramTreeEditPart extends org.eclipse.gef.editparts.AbstractTreeEditPart implements PropertyChangeListener { @@ -46,7 +59,7 @@ return res; } - public void propertyChange(PropertyChangeEvent change){ + public void propertyChange(PropertyChangeEvent change) { refreshVisuals(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandeableShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandeableShapeEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandeableShapeEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -30,7 +30,9 @@ import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; - +/** + * + */ public class ExpandeableShapeEditPart extends ShapeEditPart { protected IFigure createFigure() { if (getModel() instanceof Shape) { @@ -51,7 +53,8 @@ public void activate() { super.activate(); - if(this.getClass().equals(ExpandeableShapeEditPart.class) && !((ExpandeableShape)getModel()).isReferenceVisible()){ + if (this.getClass().equals(ExpandeableShapeEditPart.class) && + !((ExpandeableShape)getModel()).isReferenceVisible()) { ((ExpandeableShape)getModel()).refHide = true; ((ExpandeableShape)getModel()).refreshReferences(getViewer().getContents().getModel()); ((ExpandeableShape)getModel()).getOrmDiagram().setDirty(false); @@ -59,7 +62,7 @@ } public void performRequest(Request req) { - if(RequestConstants.REQ_OPEN.equals(req.getType())) { + if (RequestConstants.REQ_OPEN.equals(req.getType())) { ((ExpandeableShape)getModel()).refreshReferences(getViewer().getContents().getModel()); } } @@ -67,21 +70,23 @@ public void propertyChange(PropertyChangeEvent evt) { String prop = evt.getPropertyName(); if (Shape.SHOW_SELECTION.equals(prop)) { - if(getFigure().getChildren().size() > 0){ - ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getSelectionColor()); - ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); + IFigure updateFigure; + if (getFigure().getChildren().size() > 0) { + updateFigure = (IFigure)getFigure().getChildren().get(0); } else { - getFigure().setBackgroundColor(getSelectionColor()); - getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); + updateFigure = getFigure(); } + updateFigure.setBackgroundColor(getSelectionColor()); + updateFigure.setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); } else if (Shape.HIDE_SELECTION.equals(prop)) { - if(getFigure().getChildren().size() > 0){ - ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getColor()); - ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); + IFigure updateFigure; + if (getFigure().getChildren().size() > 0) { + updateFigure = (IFigure)getFigure().getChildren().get(0); } else { - getFigure().setBackgroundColor(getColor()); - getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); + updateFigure = getFigure(); } + updateFigure.setBackgroundColor(getColor()); + updateFigure.setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); } else if (ExpandeableShape.SHOW_REFERENCES.equals(prop)) { refreshReferences(getCastedModel(), ((ExpandeableShape)getCastedModel()).isReferenceVisible()); ((TitleLabel)getFigure()).setHidden(!((ExpandeableShape)getCastedModel()).isReferenceVisible()); @@ -92,7 +97,7 @@ protected ArrayList<OrmShape> referenceList = new ArrayList<OrmShape>(); - protected void refreshReference(ExpandeableShape shape, boolean visible){ + protected void refreshReference(ExpandeableShape shape, boolean visible) { OrmShape refShape = shape.getReference(); if (refShape == null) { return; @@ -113,7 +118,7 @@ OrmShape tableShape = refShape.getOrmDiagram().getShape(table); OrmEditPart tablePart = (OrmEditPart)getViewer().getEditPartRegistry().get(tableShape); if (tablePart != null) { - if(isTableCanBeInvisible(tablePart, visible)){ + if (isTableCanBeInvisible(tablePart, visible)) { tablePart.getFigure().setVisible(visible); setLinksVisible(tablePart, visible); } @@ -168,7 +173,7 @@ shape.getOrmDiagram().update(); } - private boolean isTableCanBeInvisible(OrmEditPart tablePart, boolean visible){ + private boolean isTableCanBeInvisible(OrmEditPart tablePart, boolean visible) { if (visible) { return true; } @@ -182,7 +187,7 @@ return true; } - private boolean isShapeCanBeInvisible(OrmEditPart source, OrmEditPart target, boolean visible){ + private boolean isShapeCanBeInvisible(OrmEditPart source, OrmEditPart target, boolean visible) { if (visible) { return true; } @@ -249,7 +254,7 @@ return true; } - private boolean validateShape(Shape shape){ + private boolean validateShape(Shape shape) { if (!shape.getClass().equals(OrmShape.class)) { OrmShape ormShape = shape.getOrmShape(); if (ormShape != null) { @@ -259,7 +264,8 @@ } } ExpandeableShape expanableShape = shape.getExtendeableShape(); - if (expanableShape != null && !shape.equals(expanableShape) && !expanableShape.getClass().equals(OrmShape.class)) { + if (expanableShape != null && !shape.equals(expanableShape) && + !expanableShape.getClass().equals(OrmShape.class)) { if (!expanableShape.isReferenceVisible()) { return false; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -37,7 +37,9 @@ import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; - +/** + * + */ public class OrmShapeEditPart extends ExpandeableShapeEditPart{ public void addNotify() { @@ -89,7 +91,7 @@ } public void performRequest(Request req) { - if(RequestConstants.REQ_OPEN.equals(req.getType()) && getModel() instanceof OrmShape) { + if (RequestConstants.REQ_OPEN.equals(req.getType()) && getModel() instanceof OrmShape) { ((OrmShape)getModel()).refreshHiden(); } } @@ -103,7 +105,7 @@ int i = figure.getPreferredSize().width; ((TitleFigure)figure).setHidden(((Boolean)evt.getNewValue()).booleanValue()); ((TitleLabel)figure.getChildren().get(0)).setHidden(((Boolean)evt.getNewValue()).booleanValue()); - if(((Boolean)evt.getNewValue()).booleanValue()) { + if (((Boolean)evt.getNewValue()).booleanValue()) { figure.setSize(i,-1); } else { figure.setSize(-1,-1); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * 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, @@ -48,10 +48,14 @@ import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; import org.jboss.tools.hibernate.ui.view.OrmLabelProvider; +/** + * + */ +public class ShapeEditPart extends OrmEditPart implements PropertyChangeListener, NodeEditPart { -public class ShapeEditPart extends OrmEditPart implements PropertyChangeListener, NodeEditPart { - protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider(); + protected ChopboxAnchorNearestSide sourceAnchor = null; + protected ChopboxAnchorNearestSide targetAnchor = null; public void setModel(Object model) { super.setModel(model); @@ -69,7 +73,6 @@ installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ShapesSelectionEditPolicy()); } - protected IFigure createFigure() { if (getModel() instanceof Shape) { Label label = new Label(); @@ -78,7 +81,7 @@ label.setIcon(ormLabelProvider.getImage(getElement())); label.setLabelAlignment(PositionConstants.LEFT); label.setOpaque(true); - TopLineBorder border = new TopLineBorder(1,2+getCastedModel().getIndent(),1,2); + TopLineBorder border = new TopLineBorder(1, 2 + getCastedModel().getIndent(), 1, 2); border.setColor(getOrmShapeEditPart().getColor()); label.setBorder(border); return label; @@ -103,7 +106,7 @@ } public void performRequest(Request req) { - if(RequestConstants.REQ_OPEN.equals(req.getType())) { + if (RequestConstants.REQ_OPEN.equals(req.getType())) { if (getCastedModel().getOrmElement() instanceof Column) { if (getCastedModel().getTargetConnections().size() > 0) { getCastedModel().getTargetConnections().get(0).getSource().setFocus(); @@ -143,43 +146,118 @@ } public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) { - return getConnectionAnchor(); + if (sourceAnchor == null) { + sourceAnchor = createConnectionAnchor(connection, true); + } else if (sourceAnchor.getConnection() == null) { + sourceAnchor.setConnection(connection); + } + return sourceAnchor; } public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) { - return getConnectionAnchor(); + if (targetAnchor == null) { + targetAnchor = createConnectionAnchor(connection, false); + } else if (targetAnchor.getConnection() == null) { + targetAnchor.setConnection(connection); + } + return targetAnchor; } public ConnectionAnchor getSourceConnectionAnchor(Request request) { - return getConnectionAnchor(); + if (sourceAnchor == null) { + sourceAnchor = createConnectionAnchor(null, true); + } + return sourceAnchor; } public ConnectionAnchor getTargetConnectionAnchor(Request request) { - return getConnectionAnchor(); + if (targetAnchor == null) { + targetAnchor = createConnectionAnchor(null, false); + } + return targetAnchor; } - protected ConnectionAnchor getConnectionAnchor() { - ChopboxAnchor anchor = new ChopboxAnchor(getFigure()){ - public Point getLocation(Point reference) { - Rectangle r = getOwner().getBounds().getCopy(); - getOwner().translateToAbsolute(r); - if (getOwner() instanceof TitleFigure) { - r = ((IFigure)getOwner().getChildren().get(0)).getBounds().getCopy(); - ((IFigure)getOwner().getChildren().get(0)).translateToAbsolute(r); + protected ChopboxAnchorNearestSide createConnectionAnchor(ConnectionEditPart connection, boolean flagSource) { + return new ChopboxAnchorNearestSide(connection, flagSource, getFigure()); + } + + public class ChopboxAnchorNearestSide extends ChopboxAnchor { + + protected ConnectionEditPart base; + protected boolean flagSource; + + public ChopboxAnchorNearestSide(ConnectionEditPart base, boolean flagSource, IFigure owner) { + super(owner); + this.base = base; + this.flagSource = flagSource; + } + + public IFigure getOwner() { + IFigure ownerFigure = super.getOwner(); + if (ownerFigure instanceof TitleFigure && ownerFigure.getChildren().size() > 0) { + ownerFigure = (IFigure)ownerFigure.getChildren().get(0); + } + return ownerFigure; + } + + public Point getLocation(Point reference) { + Rectangle r = Rectangle.SINGLETON; + IFigure ownerFigure = getOwner(); + r.setBounds(ownerFigure.getBounds()); + ownerFigure.translateToAbsolute(r); + Point result = r.getCenter(); + boolean bPreferLeft = (reference.x < result.x); + /** / + // this strategy is necessary for right selection of nearest side + // not tested cause: https://bugs.eclipse.org/bugs/show_bug.cgi?id=284153 + // TODO: test and fix this after eclipse-gef bugfix + IFigure figureSource = null; + IFigure figureTarget = null; + AbstractGraphicalEditPart sepSource = null; + AbstractGraphicalEditPart sepTarget = null; + if (base != null) { + sepSource = (AbstractGraphicalEditPart)base.getSource(); + sepTarget = (AbstractGraphicalEditPart)base.getTarget(); + figureSource = sepSource != null ? sepSource.getFigure() : null; + figureTarget = sepTarget != null ? sepTarget.getFigure() : null; + } + if (figureSource != null && figureTarget != null) { + Rectangle rcSource = figureSource.getBounds(); + figureSource.translateToAbsolute(rcSource); + Rectangle rcTarget = figureTarget.getBounds(); + figureTarget.translateToAbsolute(rcTarget); + int delta1 = Math.abs(rcSource.x - rcTarget.x); + int delta2 = Math.abs(rcSource.x - rcTarget.x - rcTarget.width); + int delta3 = Math.abs(rcSource.x + rcSource.width - rcTarget.x); + int delta4 = Math.abs(rcSource.x + rcSource.width - rcTarget.x - rcTarget.width); + if (delta1 < delta2 && delta1 < delta3 && delta1 < delta4) { + bPreferLeft = true; + } else if (delta4 < delta1 && delta4 < delta2 && delta4 < delta3) { + bPreferLeft = false; + } else if (delta2 < delta1 && delta2 < delta3 && delta2 < delta4) { + bPreferLeft = (flagSource) ? true : false; + } else if (delta3 < delta1 && delta3 < delta2 && delta3 < delta4) { + bPreferLeft = (flagSource) ? false : true; } - OrmShapeEditPart part = getOrmShapeEditPart(); - Point p = r.getCenter(); - if (reference.x < p.x) { - p.x -= part.getFigure().getBounds().width / 2; - } else { - p.x += part.getFigure().getBounds().width / 2; - } - return p; } - }; - return anchor; - } + /**/ + if (bPreferLeft) { + result.x = r.x; + } else { + result.x = r.x + r.width; + } + return result; + } + public ConnectionEditPart getConnection() { + return base; + } + + public void setConnection(ConnectionEditPart connection) { + this.base = connection; + } + }; + protected OrmShapeEditPart getOrmShapeEditPart() { int i = 0; EditPart part = this; Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapesXYLayoutEditPolicy.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapesXYLayoutEditPolicy.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapesXYLayoutEditPolicy.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,155 @@ +/******************************************************************************* + * 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.parts; + +import org.eclipse.draw2d.PositionConstants; +import org.eclipse.draw2d.XYLayout; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.Request; +import org.eclipse.gef.SnapToGuides; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; +import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; +import org.eclipse.gef.rulers.RulerProvider; +import org.jboss.tools.hibernate.ui.diagram.editors.command.ChangeGuideCommand; +import org.jboss.tools.hibernate.ui.diagram.editors.command.ShapeSetConstraintCommand; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; + +/** + * + */ +public class ShapesXYLayoutEditPolicy extends XYLayoutEditPolicy { + + public ShapesXYLayoutEditPolicy(XYLayout layout) { + super(); + setXyLayout(layout); + } + + protected Command chainGuideAttachmentCommand( + Request request, OrmShape part, Command cmd, boolean horizontal) { + + Command result = cmd; + // Attach to guide, if one is given + Integer guidePos = (Integer)request.getExtendedData() + .get(horizontal ? SnapToGuides.KEY_HORIZONTAL_GUIDE + : SnapToGuides.KEY_VERTICAL_GUIDE); + if (guidePos != null) { + int alignment = ((Integer)request.getExtendedData() + .get(horizontal ? SnapToGuides.KEY_HORIZONTAL_ANCHOR + : SnapToGuides.KEY_VERTICAL_ANCHOR)).intValue(); + ChangeGuideCommand cgm = new ChangeGuideCommand(part, horizontal); + cgm.setNewGuide(findGuideAt(guidePos.intValue(), horizontal), alignment); + result = result.chain(cgm); + } + return result; + } + + protected DiagramGuide findGuideAt(int pos, boolean horizontal) { + RulerProvider provider = ((RulerProvider)getHost().getViewer().getProperty( + horizontal ? RulerProvider.PROPERTY_VERTICAL_RULER + : RulerProvider.PROPERTY_HORIZONTAL_RULER)); + return (DiagramGuide)provider.getGuideAt(pos); + } + + protected Command chainGuideDetachmentCommand(Request request, OrmShape part, + Command cmd, boolean horizontal) { + Command result = cmd; + // Detach from guide, if none is given + Integer guidePos = (Integer)request.getExtendedData() + .get(horizontal ? SnapToGuides.KEY_HORIZONTAL_GUIDE + : SnapToGuides.KEY_VERTICAL_GUIDE); + if (guidePos == null) { + result = result.chain(new ChangeGuideCommand(part, horizontal)); + } + return result; + } + + /** + * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#createChangeConstraintCommand(org.eclipse.gef.EditPart, java.lang.Object) + */ + protected Command createChangeConstraintCommand(ChangeBoundsRequest request, EditPart child, + Object constraint) { + if (!(child instanceof OrmShapeEditPart && constraint instanceof Rectangle)) { + return super.createChangeConstraintCommand(request, child, constraint); + } + OrmShape part = (OrmShape)child.getModel(); + Command result = new ShapeSetConstraintCommand(part, request, + ((Rectangle) constraint).getLocation()); + if ((request.getResizeDirection() & PositionConstants.NORTH_SOUTH) != 0) { + Integer guidePos = (Integer)request.getExtendedData() + .get(SnapToGuides.KEY_HORIZONTAL_GUIDE); + if (guidePos != null) { + result = chainGuideAttachmentCommand(request, part, result, true); + } else if (part.getHorizontalGuide() != null) { + // SnapToGuides didn't provide a horizontal guide, but this part is attached + // to a horizontal guide. Now we check to see if the part is attached to + // the guide along the edge being resized. If that is the case, we need to + // detach the part from the guide; otherwise, we leave it alone. + int alignment = part.getHorizontalGuide().getAlignment(part); + int edgeBeingResized = 0; + if ((request.getResizeDirection() & PositionConstants.NORTH) != 0) { + edgeBeingResized = -1; + } else { + edgeBeingResized = 1; + } + if (alignment == edgeBeingResized) { + result = result.chain(new ChangeGuideCommand(part, true)); + } + } + } + if ((request.getResizeDirection() & PositionConstants.EAST_WEST) != 0) { + Integer guidePos = (Integer)request.getExtendedData() + .get(SnapToGuides.KEY_VERTICAL_GUIDE); + if (guidePos != null) { + result = chainGuideAttachmentCommand(request, part, result, false); + } else if (part.getVerticalGuide() != null) { + int alignment = part.getVerticalGuide().getAlignment(part); + int edgeBeingResized = 0; + if ((request.getResizeDirection() & PositionConstants.WEST) != 0) { + edgeBeingResized = -1; + } else { + edgeBeingResized = 1; + } + if (alignment == edgeBeingResized) { + result = result.chain(new ChangeGuideCommand(part, false)); + } + } + } + if (request.getType().equals(REQ_MOVE_CHILDREN) + || request.getType().equals(REQ_ALIGN_CHILDREN)) { + result = chainGuideAttachmentCommand(request, part, result, true); + result = chainGuideAttachmentCommand(request, part, result, false); + result = chainGuideDetachmentCommand(request, part, result, true); + result = chainGuideDetachmentCommand(request, part, result, false); + } + return result; + } + + /** + * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#createChangeConstraintCommand(org.eclipse.gef.EditPart, java.lang.Object) + */ + protected Command createChangeConstraintCommand(EditPart child, Object constraint) { + return null; + } + + protected Command getCreateCommand(CreateRequest request) { + return null; + } + + protected EditPolicy createChildEditPolicy(EditPart child) { + return new NonResizableEditPolicy(); + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007-2009 Exadel, Inc. and 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, @@ -30,12 +30,17 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.CollapseAllAction; +import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExpandAllAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenSourceAction; import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; import org.jboss.tools.hibernate.ui.diagram.editors.parts.OrmEditPart; +/** + * + */ public class PopupMenuProvider extends ContextMenuProvider { private ActionRegistry actionRegistry; @@ -49,10 +54,8 @@ GEFActionConstants.addStandardActionGroups(menu); menu.add(new Separator(GEFActionConstants.MB_ADDITIONS)); - IAction action = null; - - if (getViewer().getSelection() instanceof StructuredSelection){ + if (getViewer().getSelection() instanceof StructuredSelection) { IStructuredSelection selection = (IStructuredSelection) getViewer().getSelection(); if (selection != null && selection.getFirstElement() instanceof OrmEditPart) { Object obj = ((OrmEditPart)selection.getFirstElement()).getModel(); @@ -62,7 +65,7 @@ if (first instanceof PersistentClass || first.getClass() == Property.class || first instanceof Table - || first instanceof Column){ + || first instanceof Column) { action = getActionRegistry().getAction(OpenSourceAction.ACTION_ID); appendToGroup(GEFActionConstants.MB_ADDITIONS, action); createMenuItem(getMenu(), action); @@ -79,6 +82,14 @@ appendToGroup(GEFActionConstants.GROUP_VIEW, action); createMenuItem(getMenu(), action); + action = getActionRegistry().getAction(CollapseAllAction.ACTION_ID); + appendToGroup(GEFActionConstants.GROUP_VIEW, action); + createMenuItem(getMenu(), action); + + action = getActionRegistry().getAction(ExpandAllAction.ACTION_ID); + appendToGroup(GEFActionConstants.GROUP_VIEW, action); + createMenuItem(getMenu(), action); + action = getActionRegistry().getAction(ExportImageAction.ACTION_ID); appendToGroup(GEFActionConstants.MB_ADDITIONS, action); createMenuItem(getMenu(), action); @@ -90,6 +101,9 @@ menu.appendToGroup( GEFActionConstants.GROUP_UNDO, getAction(ActionFactory.REDO.getId())); + menu.appendToGroup( + GEFActionConstants.GROUP_VIEW, // target group id + getAction(ActionFactory.SELECT_ALL.getId())); // action to add } private IAction getAction(String actionId) { Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramGuide.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramGuide.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramGuide.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,207 @@ +/******************************************************************************* + * 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.rulers; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.Hashtable; +import java.util.Map; +import java.util.Set; + +import org.eclipse.gef.EditPart; +import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; + +/** + * Model object representing a guide. + * <p> + * In addition to maintaining information about which parts are attached to the guide, DiagramGuide + * also maintains information about the edge along which those parts are attached. This information + * is useful during resize operations to determine the attachment status of a part. + */ +public class DiagramGuide implements Serializable { + + /** + * Property used to notify listeners when the parts attached to a guide are changed + */ + public static final String PROPERTY_CHILDREN = "subparts changed"; //$NON-NLS-1$ + /** + * Property used to notify listeners when the guide is re-positioned + */ + public static final String PROPERTY_POSITION = "position changed"; //$NON-NLS-1$ + + static final long serialVersionUID = 1; + + protected PropertyChangeSupport listeners = new PropertyChangeSupport(this); + private Map<OrmShape, Integer> map; + private int position; + private boolean horizontal; + + /** + * Empty default constructor + */ + public DiagramGuide() { + // empty constructor + } + + /** + * Constructor + * + * @param isHorizontal + * <code>true</code> if the guide is horizontal (i.e., placed on a vertical ruler) + */ + public DiagramGuide(boolean isHorizontal) { + setHorizontal(isHorizontal); + } + + /** + * @see PropertyChangeSupport#addPropertyChangeListener(java.beans.PropertyChangeListener) + */ + public void addPropertyChangeListener(PropertyChangeListener listener) { + listeners.addPropertyChangeListener(listener); + } + + /** + * Attaches the given part along the given edge to this guide. The OrmShape is also updated + * to reflect this attachment. + * + * @param part + * The part that is to be attached to this guide; if the part is already attached, + * its alignment is updated + * @param alignment + * -1 is left or top; 0, center; 1, right or bottom + */ + // @TODO: use PositionConstants enum here + public void attachPart(OrmShape part, int alignment) { + if (getMap().containsKey(part) && getAlignment(part) == alignment) { + return; + } + getMap().put(part, new Integer(alignment)); + DiagramGuide parent = isHorizontal() ? part.getHorizontalGuide() : part.getVerticalGuide(); + if (parent != null && parent != this) { + parent.detachPart(part); + } + if (isHorizontal()) { + part.setHorizontalGuide(this); + } else { + part.setVerticalGuide(this); + } + listeners.firePropertyChange(PROPERTY_CHILDREN, null, part); + } + + /** + * Detaches the given part from this guide. The OrmShape is also updated to reflect this + * change. + * + * @param part + * the part that is to be detached from this guide + */ + public void detachPart(OrmShape part) { + if (getMap().containsKey(part)) { + getMap().remove(part); + if (isHorizontal()) { + part.setHorizontalGuide(null); + } else { + part.setVerticalGuide(null); + } + listeners.firePropertyChange(PROPERTY_CHILDREN, null, part); + } + } + + /** + * This methods returns the edge along which the given part is attached to this guide. This + * information is used by + * {@link org.jboss.tools.hibernate.ui.diagram.editors.parts.ShapesXYLayoutEditPolicy + * ShapesXYLayoutEditPolicy} to determine whether to attach or detach a part from a guide during + * resize operations. + * + * @param part + * The part whose alignment has to be found + * @return an int representing the edge along which the given part is attached to this guide; 1 + * is bottom or right; 0, center; -1, top or left; -2 if the part is not attached to + * this guide + * @see org.jboss.tools.hibernate.ui.diagram.editors.parts.ShapesXYLayoutEditPolicy#createChangeConstraintCommand(ChangeBoundsRequest, + * EditPart, Object) + */ + public int getAlignment(OrmShape part) { + if (getMap().get(part) != null) { + return getMap().get(part).intValue(); + } + return -2; + } + + /** + * @return The Map containing all the parts attached to this guide, and their alignments; the + * keys are OrmShapes and values are Integers + */ + public Map<OrmShape, Integer> getMap() { + if (map == null) { + map = new Hashtable<OrmShape, Integer>(); + } + return map; + } + + /** + * @return the set of all the parts attached to this guide; a set is used because a part can + * only be attached to a guide along one edge. + */ + public Set<OrmShape> getParts() { + return getMap().keySet(); + } + + /** + * @return the position/location of the guide (in pixels) + */ + public int getPosition() { + return position; + } + + /** + * @return <code>true</code> if the guide is horizontal (i.e., placed on a vertical ruler) + */ + public boolean isHorizontal() { + return horizontal; + } + + /** + * @see PropertyChangeSupport#removePropertyChangeListener(java.beans.PropertyChangeListener) + */ + public void removePropertyChangeListener(PropertyChangeListener listener) { + listeners.removePropertyChangeListener(listener); + } + + /** + * Sets the orientation of the guide + * + * @param isHorizontal + * <code>true</code> if this guide is to be placed on a vertical ruler + */ + public void setHorizontal(boolean isHorizontal) { + horizontal = isHorizontal; + } + + /** + * Sets the location of the guide + * + * @param offset + * The location of the guide (in pixels) + */ + public void setPosition(int offset) { + if (position != offset) { + int oldValue = position; + position = offset; + listeners.firePropertyChange(PROPERTY_POSITION, new Integer(oldValue), new Integer( + position)); + } + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRuler.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRuler.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRuler.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,95 @@ +/******************************************************************************* + * 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.rulers; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.gef.rulers.RulerProvider; + +/** + * + */ +public class DiagramRuler implements Serializable { + + public static final String PROPERTY_CHILDREN = "children changed"; //$NON-NLS-1$ + public static final String PROPERTY_UNIT = "units changed"; //$NON-NLS-1$ + + static final long serialVersionUID = 1; + + protected PropertyChangeSupport listeners = new PropertyChangeSupport(this); + private int unit; + private boolean horizontal; + private List<DiagramGuide> guides = new ArrayList<DiagramGuide>(); + + public DiagramRuler(boolean isHorizontal) { + this(isHorizontal, RulerProvider.UNIT_PIXELS); + } + + public DiagramRuler(boolean isHorizontal, int unit) { + horizontal = isHorizontal; + setUnit(unit); + } + + public void addGuide(DiagramGuide guide) { + if (!guides.contains(guide)) { + guide.setHorizontal(!isHorizontal()); + guides.add(guide); + listeners.firePropertyChange(PROPERTY_CHILDREN, null, guide); + } + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + listeners.addPropertyChangeListener(listener); + } + + // the returned list should not be modified + public List<DiagramGuide> getGuides() { + return guides; + } + + public int getUnit() { + return unit; + } + + public boolean isHidden() { + return false; + } + + public boolean isHorizontal() { + return horizontal; + } + + public void removeGuide(DiagramGuide guide) { + if (guides.remove(guide)) { + listeners.firePropertyChange(PROPERTY_CHILDREN, null, guide); + } + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + listeners.removePropertyChangeListener(listener); + } + + public void setHidden(boolean isHidden) { + } + + public void setUnit(int newUnit) { + if (unit != newUnit) { + int oldUnit = unit; + unit = newUnit; + listeners.firePropertyChange(PROPERTY_UNIT, oldUnit, newUnit); + } + } + +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRulerProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRulerProvider.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/rulers/DiagramRulerProvider.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -0,0 +1,123 @@ +/******************************************************************************* + * 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.rulers; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.rulers.RulerChangeListener; +import org.eclipse.gef.rulers.RulerProvider; +import org.jboss.tools.hibernate.ui.diagram.editors.command.CreateGuideCommand; +import org.jboss.tools.hibernate.ui.diagram.editors.command.DeleteGuideCommand; +import org.jboss.tools.hibernate.ui.diagram.editors.command.MoveGuideCommand; +import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; + +/** + * + */ +public class DiagramRulerProvider extends RulerProvider { + + private DiagramRuler ruler; + private PropertyChangeListener rulerListener = new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals(DiagramRuler.PROPERTY_CHILDREN)) { + DiagramGuide guide = (DiagramGuide)evt.getNewValue(); + if (getGuides().contains(guide)) { + guide.addPropertyChangeListener(guideListener); + } else { + guide.removePropertyChangeListener(guideListener); + } + for (int i = 0; i < listeners.size(); i++) { + ((RulerChangeListener)listeners.get(i)) + .notifyGuideReparented(guide); + } + } else { + for (int i = 0; i < listeners.size(); i++) { + ((RulerChangeListener)listeners.get(i)) + .notifyUnitsChanged(ruler.getUnit()); + } + } + } + }; + private PropertyChangeListener guideListener = new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals(DiagramGuide.PROPERTY_CHILDREN)) { + for (int i = 0; i < listeners.size(); i++) { + ((RulerChangeListener)listeners.get(i)) + .notifyPartAttachmentChanged(evt.getNewValue(), evt.getSource()); + } + } else { + for (int i = 0; i < listeners.size(); i++) { + ((RulerChangeListener)listeners.get(i)) + .notifyGuideMoved(evt.getSource()); + } + } + } + }; + + public DiagramRulerProvider(DiagramRuler ruler) { + this.ruler = ruler; + this.ruler.addPropertyChangeListener(rulerListener); + List<DiagramGuide> guides = getGuides(); + for (int i = 0; i < guides.size(); i++) { + guides.get(i).addPropertyChangeListener(guideListener); + } + } + + public List<OrmShape> getAttachedModelObjects(Object guide) { + return new ArrayList<OrmShape>(((DiagramGuide)guide).getParts()); + } + + public Command getCreateGuideCommand(int position) { + return new CreateGuideCommand(ruler, position); + } + + public Command getDeleteGuideCommand(Object guide) { + return new DeleteGuideCommand((DiagramGuide)guide, ruler); + } + + public Command getMoveGuideCommand(Object guide, int pDelta) { + return new MoveGuideCommand((DiagramGuide)guide, pDelta); + } + + public int[] getGuidePositions() { + List<DiagramGuide> guides = getGuides(); + int[] result = new int[guides.size()]; + for (int i = 0; i < guides.size(); i++) { + result[i] = guides.get(i).getPosition(); + } + return result; + } + + public Object getRuler() { + return ruler; + } + + public int getUnit() { + return ruler.getUnit(); + } + + public void setUnit(int newUnit) { + ruler.setUnit(newUnit); + } + + public int getGuidePosition(Object guide) { + return ((DiagramGuide)guide).getPosition(); + } + + public List<DiagramGuide> getGuides() { + return ruler.getGuides(); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.view; import java.util.Iterator; @@ -7,6 +17,9 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; +/** + * + */ public class HibernateUtils { public static String getTableName(String catalog, String schema, String name) { @@ -46,7 +59,7 @@ } @SuppressWarnings("unchecked") - public static boolean isForeignKey(Column column){ + public static boolean isForeignKey(Column column) { Table table = getTable(column); if (table != null) { Iterator<ForeignKey> iter = table.getForeignKeyIterator(); @@ -61,7 +74,7 @@ } - public static Table getTable(Column column){ + public static Table getTable(Column column) { if (column.getValue() != null) { return column.getValue().getTable(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ImageBundle.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ImageBundle.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ImageBundle.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.view; import java.util.MissingResourceException; @@ -3,4 +13,7 @@ import java.util.ResourceBundle; +/** + * + */ public class ImageBundle { private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.view.image"; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ObjectEditorInput.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ObjectEditorInput.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/ObjectEditorInput.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -15,7 +15,9 @@ import org.eclipse.ui.IPersistableElement; import org.hibernate.console.ConsoleConfiguration; - +/** + * + */ public class ObjectEditorInput implements IEditorInput{ protected Object fObject; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -78,7 +78,7 @@ consoleConfig.build(); consoleConfig.execute( new ExecutionContext.Command() { public Object execute() { - if(consoleConfig.hasConfiguration()) { + if (consoleConfig.hasConfiguration()) { consoleConfig.getConfiguration().buildMappings(); } return consoleConfig; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -33,6 +33,9 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; +/** + * + */ public class OrmLabelProvider extends LabelProvider implements IColorProvider, IFontProvider { private Map<ImageDescriptor, Image> imageCache = new HashMap<ImageDescriptor, Image>(25); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java 2009-07-24 12:22:48 UTC (rev 16763) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/UIViewMessages.java 2009-07-24 13:26:46 UTC (rev 16764) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.view; import org.eclipse.osgi.util.NLS;