Author: dazarov Date: 2008-08-06 07:54:26 -0400 (Wed, 06 Aug 2008) New Revision: 9566 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-1189 Updated: one click show/hide params on pages Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-08-06 11:52:46 UTC (rev 9565) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-08-06 11:54:26 UTC (rev 9566) @@ -70,6 +70,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.widgets.Composite; @@ -237,7 +238,7 @@ viewer.setRootEditPart(root); - viewer.setEditPartFactory(new GraphicalPartFactory()); + viewer.setEditPartFactory(new GraphicalPartFactory(this)); ContextMenuProvider provider = new PagesContextMenuProvider(viewer, getActionRegistry()); viewer.setContextMenu(provider); @@ -260,8 +261,15 @@ } public void mouseDown(MouseEvent e) { - } + boolean controlFlag = (e.stateMask & SWT.CONTROL) > 0; + EditPart part = getGraphicalViewer().findObjectAt( + new Point(e.x, e.y)); + + if (part instanceof PagesEditPart) + ((PagesEditPart) part).doMouseDown(new Point(e.x, e.y)); + } + public void mouseUp(MouseEvent e) { } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-08-06 11:52:46 UTC (rev 9565) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-08-06 11:54:26 UTC (rev 9566) @@ -12,6 +12,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.seam.ui.pages.editor.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; @@ -22,15 +23,22 @@ public class GraphicalPartFactory implements EditPartFactory { public static final String REQ_INIT_EDIT = "init edit"; //$NON-NLS-1$ + private PagesEditor editor; + + public GraphicalPartFactory(PagesEditor editor){ + this.editor = editor; + } + public EditPart createEditPart(EditPart context, Object model) { EditPart child = null; //System.out.println("createEditPart model - "+model); if (model instanceof PagesModel) child = new PagesDiagramEditPart(); - else if (model instanceof Page) + else if (model instanceof Page){ child = new PageEditPart(); - else if (model instanceof PageException) + ((PageEditPart)child).setEditor(editor); + }else if (model instanceof PageException) child = new ExceptionEditPart(); else if (model instanceof PageWrapper) child = new ParamListEditPart(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-08-06 11:52:46 UTC (rev 9565) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-08-06 11:54:26 UTC (rev 9566) @@ -35,11 +35,13 @@ import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.swt.accessibility.AccessibleControlEvent; import org.eclipse.swt.accessibility.AccessibleEvent; +import org.jboss.tools.common.gef.edit.GEFRootEditPart; import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.dnd.DnDUtil; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; +import org.jboss.tools.seam.ui.pages.editor.PagesEditor; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; @@ -48,6 +50,12 @@ public class PageEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter { private PageFigure fig = null; + + PagesEditor editor; + + public void setEditor(PagesEditor editor){ + this.editor = editor; + } public void doControlUp() { } @@ -60,6 +68,15 @@ public void childAdded(EditPart child, int index) { } + + public void doMouseDown(Point mp) { + Point mouseLocation = mp.scale(1/((GEFRootEditPart)editor.getScrollingGraphicalViewer().getRootEditPart()).getZoomManager().getZoom()).translate(-getPageFigure().getLocation().x, -getPageFigure().getLocation().y); + if(mouseLocation.x < 15 && mouseLocation.y > getPageFigure().getSize().height-15){ + getPageModel().setParamsVisible(!getPageModel().isParamsVisible()); + refresh(); + fig.repaint(); + } + } public void partActivated(EditPart editpart) { } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-08-06 11:52:46 UTC (rev 9565) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-08-06 11:54:26 UTC (rev 9566) @@ -282,4 +282,6 @@ loc.y -= loc.y % 8; } + public void doMouseDown(Point point){ + } }