Author: dazarov Date: 2008-05-27 11:41:44 -0400 (Tue, 27 May 2008) New Revision: 8373 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.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/PagesEditPart.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-05-27 14:02:11 UTC (rev 8372) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-05-27 15:41:44 UTC (rev 8373) @@ -36,7 +36,7 @@ protected void doCreatePages() { if (isAppropriateNature() || true /* JBIDE-541 */) { //TODO restore -// createGuiPage(); + createGuiPage(); treeFormPage = createTreeFormPage(); //TODO use constant treeFormPage.setTitle("Seam Pages Editor"); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-05-27 14:02:11 UTC (rev 8372) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-05-27 15:41:44 UTC (rev 8373) @@ -22,9 +22,11 @@ import org.jboss.tools.jst.web.model.WebProcess; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; +import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; +import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; public class SeamPagesGuiEditor extends AbstractSectionEditor { - private FakePageEditor gui = null; + private PagesEditor gui = null; private IModelObjectEditorInput input; private boolean isInitialized = false; private XModelObject installedProcess = null; @@ -42,7 +44,7 @@ super.dispose(); } - public FakePageEditor getGUI(){ + public PagesEditor getGUI(){ return gui; } @@ -82,7 +84,9 @@ if(f == null) return; try { f.autolayout(); - gui = new FakePageEditor(input); + gui = new PagesEditor(input); + PagesModel model = PagesFactory.eINSTANCE.createPagesModel(); + gui.setJSFModel(model); // model = new JSFModel(f.getParent()); // model.updateLinks(); 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-05-27 14:02:11 UTC (rev 8372) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-05-27 15:41:44 UTC (rev 8373) @@ -12,6 +12,9 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +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; public class GraphicalPartFactory implements EditPartFactory { @@ -19,14 +22,12 @@ public EditPart createEditPart(EditPart context, Object model) { EditPart child = null; -// if (model instanceof ILink) -// child = new LinkEditPart(); -// else if (model instanceof IPage) -// child = new PageEditPart(); -// else if (model instanceof IGroup) -// child = new GroupEditPart(); -// else if (model instanceof IJSFModel) -// child = new JSFDiagramEditPart(); + if (model instanceof PagesModel) + child = new PagesDiagramEditPart(); + else if (model instanceof Page) + child = new PageEditPart(); + else if (model instanceof Link) + child = new LinkEditPart(); if (child != null) child.setModel(model); 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-05-27 14:02:11 UTC (rev 8372) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-05-27 15:41:44 UTC (rev 8373) @@ -22,6 +22,7 @@ import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.*; +import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; abstract public class PagesEditPart extends org.eclipse.gef.editparts.AbstractGraphicalEditPart implements @@ -40,44 +41,19 @@ return; super.activate(); } - + /** * - * @param cf + * @return */ - public void doDoubleClick(boolean cf) { } + protected NodeFigure getNodeFigure() { + return (NodeFigure) getFigure(); + } + /** * - * @param cf */ - public void doMouseUp(boolean cf) { } - - /** - * - * @param cf - */ - public void doMouseDown(boolean cf) { } - - /** - * - * @param cf - */ - public void doMouseHover(boolean cf) { } - - /** - * - */ - public void doControlUp() { } - - /** - * - */ - public void doControlDown() { } - - /** - * - */ protected void createEditPolicies() { // installEditPolicy(EditPolicy.COMPONENT_ROLE, new JSFElementEditPolicy()); // installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,