[jbosstools-commits] JBoss Tools SVN: r9071 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages: src/org/jboss/tools/seam/ui/pages/editor and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 4 07:19:52 EDT 2008
Author: scabanovich
Date: 2008-07-04 07:19:52 -0400 (Fri, 04 Jul 2008)
New Revision: 9071
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml 2008-07-04 10:19:53 UTC (rev 9070)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.xml 2008-07-04 11:19:52 UTC (rev 9071)
@@ -22,6 +22,10 @@
<extension point="org.jboss.tools.common.model.classes">
<xclass id="org.jboss.tools.seam.ui.pages.editor.wizard.SelectItemWizard"
class="org.jboss.tools.seam.ui.pages.editor.wizard.SelectItemWizard"/>
+ <xclass id="org.jboss.tools.seam.ui.pages.editor.commands.AddPageOnDiagramHandler"
+ class="org.jboss.tools.seam.ui.pages.editor.commands.AddPageOnDiagramHandler"/>
+ <xclass id="org.jboss.tools.seam.ui.pages.editor.commands.AddExceptionOnDiagramHandler"
+ class="org.jboss.tools.seam.ui.pages.editor.commands.AddExceptionOnDiagramHandler"/>
</extension>
</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-07-04 10:19:53 UTC (rev 9070)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -66,14 +66,17 @@
IStructuredSelection ss = (IStructuredSelection)s;
XModelObject object = SelectionUtil.getTarget(ss.getFirstElement());
if(object != null) {
+ PagesDiagramEditPart part = (PagesDiagramEditPart)getViewer().getRootEditPart().getChildren().get(0);
Properties p = new Properties();
if(lastDownEvent != null) {
Point point = new Point(lastDownEvent.x, lastDownEvent.y);
- ((PagesDiagramEditPart)getViewer().getRootEditPart().getChildren().get(0)).getFigure().translateToRelative(point);
+ part.getFigure().translateToRelative(point);
p.setProperty("mouse.x", "" + point.x);
p.setProperty("mouse.y", "" + point.y);
lastDownEvent = null;
}
+ p.put("diagramEditPart", part);
+
XModelObjectActionList list = new XModelObjectActionList(object.getModelEntity().getActionList(), object, SelectionUtil.getTargets(ss), new Object[]{object, p});
Menu menu = getMenu();
list.createMenu(menu);
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -0,0 +1,29 @@
+package org.jboss.tools.seam.ui.pages.editor.commands;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
+
+public class AddExceptionOnDiagramHandler extends AbstractHandler {
+
+ public AddExceptionOnDiagramHandler() {}
+
+ public boolean isEnabled(XModelObject object) {
+ return object != null && object.isObjectEditable();
+ }
+
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
+ if(!isEnabled(object)) return;
+ PagesDiagramEditPart part = (PagesDiagramEditPart)p.get("diagramEditPart");
+ int x = Integer.parseInt(p.getProperty("mouse.x"));
+ int y = Integer.parseInt(p.getProperty("mouse.y"));
+ System.out.println("x=" + x + " y=" + y + " part=" + part);
+
+// XActionInvoker.invoke("CreateActions.AddExceptionWizard", object, p);
+ }
+
+}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -0,0 +1,29 @@
+package org.jboss.tools.seam.ui.pages.editor.commands;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
+
+public class AddPageOnDiagramHandler extends AbstractHandler {
+
+ public AddPageOnDiagramHandler() {}
+
+ public boolean isEnabled(XModelObject object) {
+ return object != null && object.isObjectEditable();
+ }
+
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
+ if(!isEnabled(object)) return;
+ PagesDiagramEditPart part = (PagesDiagramEditPart)p.get("diagramEditPart");
+ int x = Integer.parseInt(p.getProperty("mouse.x"));
+ int y = Integer.parseInt(p.getProperty("mouse.y"));
+ System.out.println("x=" + x + " y=" + y + " part=" + part);
+
+// XActionInvoker.invoke("CreateActions.AddPageWizard", object, p);
+ }
+
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-07-04 10:19:53 UTC (rev 9070)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -89,8 +89,9 @@
event.y);
Point point = new Point(parentPoint.x, parentPoint.y);
- ((PagesDiagramEditPart) editor.getScrollingGraphicalViewer()
- .getRootEditPart().getChildren().get(0)).getFigure()
+ PagesDiagramEditPart part = (PagesDiagramEditPart) editor.getScrollingGraphicalViewer()
+ .getRootEditPart().getChildren().get(0);
+ part.getFigure()
.translateToRelative(point);
if (TemplateTransfer.getInstance().isSupportedType(
event.currentDataType)) {
@@ -99,6 +100,7 @@
properties.put("mouse.x", "" + point.x);
properties.put("mouse.y", "" + point.y);
}
+ properties.put("diagramEditPart", part);
XActionInvoker
.invoke("CreateActions.AddPage", (XModelObject) editor
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-07-04 10:19:53 UTC (rev 9070)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -81,6 +81,7 @@
properties.put("mouse.x","" + location.x);
properties.put("mouse.y","" + location.y);
}
+ properties.put("diagramEditPart", getDiagramEditPart());
XActionInvoker.invoke("CreateActions.AddException", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties);
}
@@ -113,6 +114,7 @@
properties.put("mouse.x","" + location.x);
properties.put("mouse.y","" + location.y);
}
+ properties.put("diagramEditPart", getDiagramEditPart());
XActionInvoker.invoke("CreateActions.AddPage", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-04 10:19:53 UTC (rev 9070)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-04 11:19:52 UTC (rev 9071)
@@ -133,26 +133,26 @@
Rectangle boundingRect = new Rectangle(22, 1, r.width, r.height);
- //g.fillRectangle(boundingRect);
+ g.fillRectangle(boundingRect);
- if(g instanceof ScaledGraphics) {
- // scaled graphcis does not support gradients ;(
- g.fillRectangle(boundingRect);
- } else {
- Display display = Display.getCurrent();
-
-
- Point topLeft = boundingRect.getTopLeft();
- Point bottomRight = boundingRect.getBottomRight();
-
- Pattern pattern = new Pattern(display, topLeft.x, topLeft.y,
- bottomRight.x, bottomRight.y,
- ColorConstants.white, g.getBackgroundColor());
- g.setBackgroundPattern(pattern);
- g.fillRectangle(boundingRect);
- g.setBackgroundPattern(null);
- pattern.dispose();
- }
+// if(g instanceof ScaledGraphics) {
+// // scaled graphcis does not support gradients ;(
+// g.fillRectangle(boundingRect);
+// } else {
+// Display display = Display.getCurrent();
+//
+//
+// Point topLeft = boundingRect.getTopLeft();
+// Point bottomRight = boundingRect.getBottomRight();
+//
+// Pattern pattern = new Pattern(display, topLeft.x, topLeft.y,
+// bottomRight.x, bottomRight.y,
+// ColorConstants.white, g.getBackgroundColor());
+// g.setBackgroundPattern(pattern);
+// g.fillRectangle(boundingRect);
+// g.setBackgroundPattern(null);
+// pattern.dispose();
+// }
if(page != null){
g.setFont(nodeLabelFont);
More information about the jbosstools-commits
mailing list