Author: dazarov Date: 2008-05-28 06:19:46 -0400 (Wed, 28 May 2008) New Revision: 8394 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/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/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.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/PagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-05-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -113,6 +113,7 @@ import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModelListener; import org.jboss.tools.seam.ui.pages.editor.edit.GraphicalPartFactory; +import org.jboss.tools.seam.ui.pages.editor.palette.PagesPaletteViewerPreferences; public class PagesEditor extends GEFEditor implements PagesModelListener{ @@ -120,17 +121,17 @@ protected void createPaletteViewer(Composite parent) { PaletteViewer viewer = new PaletteViewer(); -// JSFPaletteViewerPreferences prefs = new JSFPaletteViewerPreferences( -// this); -// prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_COLUMNS, false); -// prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_LIST, false); -// prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_ICONS, false); -// prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_DETAILS, false); -// prefs.setLayoutSetting(PaletteViewerPreferences.LAYOUT_LIST); + PagesPaletteViewerPreferences prefs = new PagesPaletteViewerPreferences( + this); + prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_COLUMNS, false); + prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_LIST, false); + prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_ICONS, false); + prefs.setUseLargeIcons(PaletteViewerPreferences.LAYOUT_DETAILS, false); + prefs.setLayoutSetting(PaletteViewerPreferences.LAYOUT_LIST); viewer.createControl(parent); setPaletteViewer(viewer); -// setPaletteLayout(prefs, loadPaletteSize()); -// paletteViewer.setPaletteViewerPreferences(prefs); + setPaletteLayout(prefs, loadPaletteSize()); + paletteViewer.setPaletteViewerPreferences(prefs); configurePaletteViewer(); hookPaletteViewer(); @@ -507,7 +508,7 @@ static private boolean switchToSelectionTool = false; - public void setJSFModel(PagesModel diagram) { + public void setPagesModel(PagesModel diagram) { model = diagram; //model.addModelListener(this); //switchToSelectionTool = model.getOptions().switchToSelectionTool(); 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-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -12,6 +12,8 @@ import org.jboss.tools.common.editor.AbstractSectionEditor; import org.eclipse.core.runtime.CoreException; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.layout.GridData; @@ -22,6 +24,7 @@ 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.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; @@ -85,13 +88,11 @@ try { f.autolayout(); gui = new PagesEditor(input); - PagesModel model = PagesFactory.eINSTANCE.createPagesModel(); - gui.setJSFModel(model); + PagesModel model = getFakeModel(); + gui.setPagesModel(model); // model = new JSFModel(f.getParent()); // model.updateLinks(); -// gui.setJSFModel(model); - gui.init((IEditorSite)getSite(), (IEditorInput)input); gui.createPartControl(guiControl); control = guiControl.getChildren()[0]; @@ -106,6 +107,16 @@ SeamUiPagesPlugin.getDefault().logError(ex); } } + + private PagesModel getFakeModel(){ + PagesModel model = PagesFactory.eINSTANCE.createPagesModel(); + Page page = PagesFactory.eINSTANCE.createPage(); + page.setName("page1"); + page.setLocation(new Point(10,10)); + page.setSize(new Dimension(100,100)); + model.getChildren().add(page); + return model; + } public Object getAdapter(Class adapter) { if(adapter == ActionRegistry.class || adapter == org.eclipse.gef.editparts.ZoomManager.class){ 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-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -22,6 +22,7 @@ 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) @@ -31,6 +32,8 @@ if (child != null) child.setModel(model); + + //System.out.println("editPart - "+child); return child; } 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-05-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -149,6 +149,7 @@ protected void refreshVisuals() { Point loc = getPageModel().getLocation(); + size = new Dimension(49, 40); loc.x -= loc.x % 8; loc.y -= loc.y % 8; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-05-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -214,9 +214,9 @@ /** * */ -// protected List getModelChildren() { -// return getPagesModel().getGroupList().getElements(); -// } + protected List getModelChildren() { + return getPagesModel().getChildren(); + } /** * Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java 2008-05-28 09:00:06 UTC (rev 8393) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java 2008-05-28 10:19:46 UTC (rev 8394) @@ -15,7 +15,6 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -28,8 +27,9 @@ import org.eclipse.gef.editpolicies.NonResizableEditPolicy; import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; import org.eclipse.gef.handles.ResizeHandle; -import org.eclipse.gef.internal.ui.palette.editparts.GroupEditPart; import org.eclipse.gef.requests.CreateRequest; +import org.jboss.tools.seam.ui.pages.editor.commands.SetConstraintCommand; +import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; /** * @@ -42,23 +42,21 @@ * */ protected Command createAddCommand(EditPart childEditPart, Object constraint) { -// SetConstraintCommand setConstraint = new SetConstraintCommand(); -// setConstraint.setLocation((Rectangle) constraint); -// setConstraint.setPart((IJSFElement) childEditPart.getModel()); -// setConstraint.setLabel(JSFUIMessages.REPARENTING_JSFSUBPART); -// setConstraint.setDebugLabel("LogicXYEP setConstraint");//$NON-NLS-1$*/ -// return setConstraint; - return null; + SetConstraintCommand setConstraint = new SetConstraintCommand(); + setConstraint.setLocation((Rectangle) constraint); + setConstraint.setPart((PagesElement) childEditPart.getModel()); + setConstraint.setLabel("Reparent"); + setConstraint.setDebugLabel("LogicXYEP setConstraint");//$NON-NLS-1$*/ + return setConstraint; } protected Command createChangeConstraintCommand(EditPart child, Object constraint) { -// SetConstraintCommand locationCommand = new SetConstraintCommand(); -// locationCommand.setShell(child.getViewer().getControl().getShell()); -// locationCommand.setPart((IJSFElement) child.getModel()); -// locationCommand.setLocation((Rectangle) constraint); -// return locationCommand; - return null; + SetConstraintCommand locationCommand = new SetConstraintCommand(); + locationCommand.setShell(child.getViewer().getControl().getShell()); + locationCommand.setPart((PagesElement) child.getModel()); + locationCommand.setLocation((Rectangle) constraint); + return locationCommand; } protected EditPolicy createChildEditPolicy(EditPart child) {