Author: scabanovich Date: 2008-10-31 07:15:07 -0400 (Fri, 31 Oct 2008) New Revision: 11395 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.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/ParamEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java Log: JBIDE-3021 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -1,5 +1,7 @@ package org.jboss.tools.seam.ui.pages.editor.ecore.pages; +import org.jboss.tools.seam.ui.pages.editor.edit.PageWrapper; + /** * @author daniel * @@ -40,4 +42,12 @@ * @generated */ void setParamsVisible(boolean value); + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + public PageWrapper getParamList(); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -25,6 +25,7 @@ import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param; +import org.jboss.tools.seam.ui.pages.editor.edit.PageWrapper; /** * <!-- begin-user-doc --> @@ -314,4 +315,20 @@ return ps; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + PageWrapper paramList = new PageWrapper(this); + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated NOT + */ + public PageWrapper getParamList() { + return paramList; + } + } //PageImpl Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -12,4 +12,5 @@ public Page getPage(){ return page; } + } 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-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -239,7 +239,7 @@ if(getPagesModel().getChildren().get(i) instanceof Page){ Page page = (Page)getPagesModel().getChildren().get(i); if(page.getChildren().size() > 0 && page.isParamsVisible()){ - PageWrapper wrapper = new PageWrapper(page); + PageWrapper wrapper = page.getParamList(); list.add(wrapper); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -25,6 +25,7 @@ import org.eclipse.gef.EditPartListener; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.gef.editparts.AbstractEditPart; import org.eclipse.swt.accessibility.AccessibleControlEvent; import org.eclipse.swt.accessibility.AccessibleEvent; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param; @@ -171,6 +172,9 @@ public void notifyChanged(Notification notification) { refresh(); refreshVisuals(); + if(getParent() instanceof ParamListEditPart) { + ((ParamListEditPart)getParent()).refreshSizeAndLocation(); + } } /** * ) Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -123,6 +123,16 @@ } protected void refreshVisuals() { + refreshSizeAndLocation(); + + if(getParent() != null){ + ((PagesDiagramEditPart) ParamListEditPart.this.getParent()) + .setToFront(this); + } + + } + + void refreshSizeAndLocation() { Point loc = getPageWrapperModel().getPage().getLocation().getCopy(); int links = getPageWrapperModel().getPage().getOutputLinks().size(); if(links == 0) @@ -136,11 +146,7 @@ if(getParent() != null){ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), r); - - ((PagesDiagramEditPart) ParamListEditPart.this.getParent()) - .setToFront(this); } - } protected List getModelChildren() {