JBoss Tools SVN: r9075 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 08:19:13 -0400 (Fri, 04 Jul 2008)
New Revision: 9075
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-07-04 12:11:36 UTC (rev 9074)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-07-04 12:19:13 UTC (rev 9075)
@@ -169,7 +169,13 @@
}
}
- private XModelObject addPage(XModelObject pages, String path) {
+ /**
+ * Adds XML object for page
+ * @param pages
+ * @param path
+ * @return
+ */
+ public static XModelObject addPage(XModelObject pages, String path) {
String childEntity = pages.getModelEntity().getChildren()[0].getName();
XModelObject page = pages.getModel().createModelObject(childEntity, null);
page.setAttributeValue(ATTR_VIEW_ID, path);
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-07-04 12:11:36 UTC (rev 9074)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-07-04 12:19:13 UTC (rev 9075)
@@ -42,6 +42,11 @@
}
private boolean canBeOutputTarget(XModelObject group) {
+ String type = group.getAttributeValue(ATTR_TYPE);
+ if(TYPE_EXCEPTION.equals(type)) {
+ //Exception cannot be the target
+ return false;
+ }
String path = group.getAttributeValue(ATTR_PATH);
if(path == null) path = group.getAttributeValue(ATTR_VIEW_ID);
if(path == null) return false;
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9074 - in trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test: refactoring and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-07-04 08:11:36 -0400 (Fri, 04 Jul 2008)
New Revision: 9074
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2429 Fixed for Eclipse 3.4
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-07-04 11:47:33 UTC (rev 9073)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-07-04 12:11:36 UTC (rev 9074)
@@ -333,10 +333,10 @@
refreshProject(project);
number = getMarkersNumber(abcEntityFile);
- assertFalse("Problem marker 'Entity component has wrong scope' not found' not found' not found", number == 0);
+ assertFalse("Problem marker 'Entity component has wrong scope' was not found'", number == 0);
String[] messages = getMarkersMessage(abcEntityFile);
- assertEquals("Problem marker 'Entity component has wrong scope' not found", "Entity component \"abcEntity\" should not have org.jboss.seam.ScopeType.STATELESS", messages[0]);
+ assertEquals("Problem marker 'Entity component has wrong scope' was not found", "Entity component \"abcEntity\" should not have org.jboss.seam.ScopeType.STATELESS", messages[0]);
int[] lineNumbers = getMarkersNumbersOfLine(abcEntityFile);
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-07-04 11:47:33 UTC (rev 9073)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-07-04 12:11:36 UTC (rev 9074)
@@ -28,7 +28,6 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.eclipse.jdt.internal.corext.refactoring.reorg.IConfirmQuery;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQueries;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQuery;
@@ -37,8 +36,6 @@
import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgDestinationFactory;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgPolicyFactory;
import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgPolicy.IMovePolicy;
-import org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating;
-import org.eclipse.jdt.internal.corext.refactoring.tagging.IReferenceUpdating;
import org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating;
import org.eclipse.jdt.internal.ui.refactoring.RefactoringExecutionHelper;
import org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper;
@@ -47,6 +44,7 @@
import org.eclipse.ltk.core.refactoring.RefactoringCore;
import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
+import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -275,13 +273,8 @@
// init refactoring
RenameResourceProcessor processor = new RenameResourceProcessor(resource);
RenameRefactoring refactoring = new RenameRefactoring(processor);
- INameUpdating nameUpdateingAdapter = ((INameUpdating)refactoring.getAdapter(INameUpdating.class));
- assertNotNull("Cannot get INameUpdating adapter for renaming '" +resource.getFullPath().toString() + "'",nameUpdateingAdapter);
- nameUpdateingAdapter.setNewElementName(newFolderName);
- IReferenceUpdating reference = (IReferenceUpdating)refactoring.getAdapter(IReferenceUpdating.class);
- if(reference != null) {
- reference.setUpdateReferences(true);
- }
+ processor.setNewResourceName(newFolderName);
+ processor.setUpdateReferences(true);
ITextUpdating text = (ITextUpdating)refactoring.getAdapter(ITextUpdating.class);
if(text != null) {
text.setUpdateTextualMatches(true);
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9073 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-04 07:47:33 -0400 (Fri, 04 Jul 2008)
New Revision: 9073
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/figures/ParamFigure.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/edit/ParamEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-07-04 11:20:09 UTC (rev 9072)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-07-04 11:47:33 UTC (rev 9073)
@@ -13,8 +13,6 @@
import java.beans.PropertyChangeListener;
import java.util.List;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.FigureUtilities;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -23,20 +21,13 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DropRequest;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
-import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
-import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.ParamFigure;
public class ParamEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter {
@@ -70,30 +61,13 @@
}
public void selectedStateChanged(EditPart editpart) {
- if (this.getSelected() == EditPart.SELECTED_PRIMARY) {
- ((PagesDiagramEditPart) ParamEditPart.this.getParent())
- .setToFront(this);
-
- }
+ fig.repaint();
}
public boolean isGroupListenerEnable() {
return true;
}
-
-
- private void refreshTargetLink(Link link) {
- if (link == null)
- return;
- ParamEditPart gep = (ParamEditPart) getViewer().getEditPartRegistry()
- .get(link.getToElement());
- if (gep == null)
- return;
- gep.refreshTargetConnections();
- }
-
-
protected AccessibleEditPart createAccessible() {
return new AccessibleGraphicalEditPart() {
@@ -179,6 +153,7 @@
if (isActive())
return;
((Notifier) getModel()).eAdapters().add(this);
+ addEditPartListener(this);
super.activate();
}
@@ -186,6 +161,7 @@
if (!isActive())
return;
((Notifier) getModel()).eAdapters().remove(this);
+ removeEditPartListener(this);
super.deactivate();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-07-04 11:20:09 UTC (rev 9072)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-07-04 11:47:33 UTC (rev 9073)
@@ -10,10 +10,12 @@
******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.figures;
+import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
import org.eclipse.gef.handles.HandleBounds;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
import org.jboss.tools.seam.ui.pages.editor.edit.ParamEditPart;
@@ -64,6 +66,15 @@
Rectangle r = getBounds().getCopy();
g.translate(r.getLocation());
+ if (editPart.getSelected() == EditPart.SELECTED_PRIMARY
+ || editPart.getSelected() == EditPart.SELECTED) {
+ g.setBackgroundColor(ColorConstants.white);
+ g.fillRectangle(1, 1, r.width-2, r.height-2);
+
+ } else {
+ g.setBackgroundColor(lightGrayColor);
+ g.fillRectangle(1, 1, r.width-2, r.height-2);
+ }
String name;
if(param.getName() != null){
name = dottedString(param.getName(), getTextWidth()-getTextInset(), nameParamFont);
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9072 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml: src/org/jboss/tools/seam/pages/xml/model/handlers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 07:20:09 -0400 (Fri, 04 Jul 2008)
New Revision: 9072
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-07-04 11:19:52 UTC (rev 9071)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-07-04 11:20:09 UTC (rev 9072)
@@ -2819,7 +2819,7 @@
<XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
PROPERTIES="support=org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport"
- displayName="New Page..." kind="action" name="AddPage">
+ displayName="New Page (wizard)..." kind="action" name="AddPageWizard">
<EntityData EntityName="SeamPagesAddViewWizard">
<AttributeData AttributeName="view id" Mandatory="no"/>
<AttributeData AttributeName="create file" Mandatory="no"/>
@@ -2827,10 +2827,18 @@
</EntityData>
</XActionItem>
<XActionItem
+ HandlerClassName="org.jboss.tools.seam.ui.pages.editor.commands.AddPageOnDiagramHandler"
+ ICON="action.empty"
+ displayName="New Page (diagram)..." kind="action" name="AddPage"/>
+ <XActionItem
HandlerClassName="org.jboss.tools.jsf.model.handlers.JSFProcessRegirectHandler"
ICON="action.empty"
PROPERTIES="actionpath=CreateActions/AddException"
- displayName="New Exception..." kind="action" name="AddException"/>
+ displayName="New Exception (wizard)..." kind="action" name="AddExceptionWizard"/>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.seam.ui.pages.editor.commands.AddExceptionOnDiagramHandler"
+ ICON="action.empty"
+ displayName="New Exception (diagram)..." kind="action" name="AddException"/>
</XActionItem>
<XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.jsf.model.handlers.CreateCommentHandler"
@@ -2941,6 +2949,11 @@
<AttributeData AttributeName="comment"/>
</EntityData>
</XActionItem>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.jsf.model.handlers.JSFItemRegirectHandler"
+ ICON="action.new.jsf.case"
+ PROPERTIES="actionpath=CreateActions/AddParam"
+ WizardClassName="%Default%" displayName="Param..." kind="action" name="CreateParam"/>
</XActionItem>
<XActionItem HIDE="disabled"
HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.OpenPageHandler"
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-07-04 11:19:52 UTC (rev 9071)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-07-04 11:20:09 UTC (rev 9072)
@@ -110,7 +110,7 @@
p.put("sample", object);
String type = object.getAttributeValue(ATTR_TYPE);
if(TYPE_PAGE.equals(type)) {
- XActionInvoker.invoke("CreateActions.AddPage", target, p);
+ XActionInvoker.invoke("CreateActions.AddPageWizard", target, p);
} else {
//TODO
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-07-04 11:19:52 UTC (rev 9071)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-07-04 11:20:09 UTC (rev 9072)
@@ -105,9 +105,16 @@
protected void adoptSeamPage(XModelObject source, XModelObject target, Properties p) throws XModelException {
String path = target.getAttributeValue(ATTR_PATH);
- String n = path;
- if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.'));
- if(n.lastIndexOf('/') >= 0) n = n.substring(n.lastIndexOf('/') + 1);
+ if(source != null && source.getModelEntity().getName().startsWith(ENT_EXCEPTION)) {
+ XModelObject redirect = source.getChildByPath("target");
+ if(redirect != null) {
+ redirect.getModel().editObjectAttribute(redirect, ATTR_VIEW_ID, path);
+ return;
+ }
+ }
+// String n = path;
+// if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.'));
+// if(n.lastIndexOf('/') >= 0) n = n.substring(n.lastIndexOf('/') + 1);
String suffix = DiagramAdopt.getPageSuffix(source.getModelEntity().getName());
XModelObject cs = source.getModel().createModelObject(ENT_NAVIGATION_RULE + suffix, null);
XModelObject redirect = source.getModel().createModelObject("SeamPageRedirect" + suffix, null);
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 11:19:52 UTC (rev 9071)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 11:20:09 UTC (rev 9072)
@@ -87,11 +87,11 @@
String entity = ns[j].getModelEntity().getName();
if(!entity.startsWith(ENT_NAVIGATION)) continue;
if(entity.startsWith(ENT_NAVIGATION_RULE)) {
- addTarget(ns[j]);
+ addTarget(ns[j], true);
} else {
XModelObject[] rs = ns[j].getChildren();
for (int k = 0; k < rs.length; k++) {
- addTarget(rs[k]);
+ addTarget(rs[k], true);
}
}
}
@@ -103,7 +103,7 @@
XModelObject g = findOrCreateItem(code, code, TYPE_EXCEPTION);
((ReferenceObjectImpl)g).setReference(sourceExceptions[i]);
exceptionItems.put(code, g);
- addTarget(sourceExceptions[i]);
+ addTarget(sourceExceptions[i], false);
}
Iterator<String> it = pageItems.keySet().iterator();
@@ -118,11 +118,12 @@
updatePages();
}
- private void addTarget(XModelObject rule) {
+ private void addTarget(XModelObject rule, boolean addEmpty) {
XModelObject target = rule.getChildByPath("target");
if(target == null) return;
String tvi = target.getAttributeValue(ATTR_VIEW_ID);
if(tvi == null) return;
+ if(!addEmpty && tvi.length() == 0) return;
targets.put(toNavigationRulePathPart(tvi), getTemplate());
}
@@ -254,7 +255,13 @@
item.setAttributeValue(ATTR_ID, exc.getPathPart());
item.setAttributeValue(ATTR_PATH, exc.getAttributeValue("class"));
XModelObject t = getTargetChild(exc);
- XModelObject[] cs = t == null ? new XModelObject[0] : new XModelObject[]{t};
+ XModelObject[] cs = t == null ? new XModelObject[0] : new XModelObject[]{t};
+ if(cs.length == 1) {
+ String path = t.getAttributeValue(ATTR_VIEW_ID);
+ if(path == null || path.length() == 0) {
+ cs = new XModelObject[0];
+ }
+ }
updateOutputs(item, cs);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java 2008-07-04 11:19:52 UTC (rev 9071)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java 2008-07-04 11:20:09 UTC (rev 9072)
@@ -20,7 +20,7 @@
public class SeamPagesPageRefUpdateManager implements XModelTreeListener, Runnable, SeamPagesConstants {
public static SeamPagesPageRefUpdateManager getInstance(XModel model) {
- SeamPagesPageRefUpdateManager instance = (SeamPagesPageRefUpdateManager)model.getManager("JSFPageUpdateManager");
+ SeamPagesPageRefUpdateManager instance = (SeamPagesPageRefUpdateManager)model.getManager("SeamPagesPageRefUpdateManager");
if(instance == null) {
instance = new SeamPagesPageRefUpdateManager();
instance.model = model;
15 years, 9 months
- 1
- 0
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.
by jbosstools-commits＠lists.jboss.org
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);
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9070 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 06:19:53 -0400 (Fri, 04 Jul 2008)
New Revision: 9070
Added:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 09:57:04 UTC (rev 9069)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 10:19:53 UTC (rev 9070)
@@ -365,9 +365,13 @@
}
public void updatePages() {
- //TODO
+ SeamPagesPageRefUpdateManager pu = SeamPagesPageRefUpdateManager.getInstance(diagram.getModel());
+ pu.lock();
+ XModelObject[] items = diagram.getChildren();
+ for (int i = 0; i < items.length; i++) pu.updatePage(this, items[i]);
+ pu.unlock();
}
-
+
public String findBestMatch(String viewId) {
if(viewId == null || pageViewIds.contains(viewId)) {
return viewId;
Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesPageRefUpdateManager.java 2008-07-04 10:19:53 UTC (rev 9070)
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.pages.xml.model.helpers;
+
+import java.util.*;
+import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.event.*;
+import org.jboss.tools.seam.pages.xml.SeamPagesXMLPlugin;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl;
+
+public class SeamPagesPageRefUpdateManager implements XModelTreeListener, Runnable, SeamPagesConstants {
+
+ public static SeamPagesPageRefUpdateManager getInstance(XModel model) {
+ SeamPagesPageRefUpdateManager instance = (SeamPagesPageRefUpdateManager)model.getManager("JSFPageUpdateManager");
+ if(instance == null) {
+ instance = new SeamPagesPageRefUpdateManager();
+ instance.model = model;
+ instance.init();
+ model.addManager("SeamPagesPageRefUpdateManager", instance);
+ model.addModelTreeListener(instance);
+ }
+ return instance;
+ }
+
+ private static long id = 0;
+
+ private XModel model;
+ private Map<String,PageLinks> pages = new HashMap<String,PageLinks>();
+ private int lock = 0;
+ protected boolean stopped = false;
+
+ PageUpdateRunnable runnable = new PageUpdateRunnable();
+
+ public SeamPagesPageRefUpdateManager() {}
+
+ private void init() {
+ }
+
+ public void updatePage(SeamPagesDiagramHelper h, XModelObject page) {
+ PageLinks pl = getPageLinks(page);
+ if(pl == null) return;
+ pl.h = h;
+ pl.update();
+ }
+
+ PageLinks getPageLinks(XModelObject page) {
+ String pid = page.get("_page_id");
+ if(pid == null) {
+ pid = "" + (++id);
+ page.set("_page_id", pid);
+ }
+ PageLinks pl = pages.get(pid);
+ if(pl == null) {
+ pl = new PageLinks();
+ pl.setPage(page);
+ pages.put(pid, pl);
+ }
+ return pl;
+ }
+
+ public void updateAll() {
+ if(isLocked()) return;
+ lock();
+ try {
+ String[] ks = pages.keySet().toArray(new String[0]);
+ for (int i = 0; i < ks.length; i++) {
+ PageLinks pl = pages.get(ks[i]);
+ if(pl == null) continue;
+ if(!pl.page.isActive()) {
+ pages.remove(ks[i]);
+ } else {
+ pl.update();
+ }
+ }
+ } finally {
+ unlock();
+ }
+ }
+
+ public boolean isLocked() {
+ return lock > 0;
+ }
+
+ public void lock() {
+ lock++;
+ }
+
+ public void unlock() {
+ lock--;
+ }
+
+ public void structureChanged(XModelTreeEvent event) {
+ XModel model = event.getModelObject().getModel();
+ if (event.kind() == XModelTreeEvent.STRUCTURE_CHANGED &&
+ event.getModelObject() == model.getRoot()) {
+ model.removeModelTreeListener(this);
+ SeamPagesPageRefUpdateManager instance = (SeamPagesPageRefUpdateManager)model.getManager("JSFPageUpdateManager");
+ if(instance != null) {
+ instance.stopped = true;
+ model.removeManager("JSFPageUpdateManager");
+ }
+ return;
+ } else if(event.kind() == XModelTreeEvent.CHILD_ADDED) {
+ onChildAdded(event);
+ }
+ if(isLocked()) return;
+ XJob.addRunnable(runnable);
+ }
+
+ private void onChildAdded(XModelTreeEvent event) {
+ XModelObject c = (XModelObject)event.getInfo();
+ if(!c.getModelEntity().getName().equals("JSFProcessGroup")) return;
+ SeamPagesDiagramImpl pi = (SeamPagesDiagramImpl)event.getModelObject();
+ PageLinks pl = getPageLinks(c);
+ if(pl == null || pi.getHelper() == null) return;
+ pl.h = pi.getHelper();
+ }
+
+ public void nodeChanged(XModelTreeEvent event) {
+ if(isLocked()) return;
+ XJob.addRunnable(runnable);
+ }
+
+ public void run() {
+ while(!stopped) {
+ synchronized(this) {
+ try {
+ wait();
+ } catch (InterruptedException e) {
+ //ignore
+ }
+ }
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ //ignore
+ }
+ if(stopped) break;
+ if(!isLocked()) {
+ try {
+ updateAll();
+ } catch (Exception t) {
+ SeamPagesXMLPlugin.log("Error while running page update", t);
+ }
+ }
+ }
+ }
+
+ class PageUpdateRunnable implements XJob.XRunnable {
+
+ public String getId() {
+ return "Seam Pages Reference Update -" + XModelConstants.getWorkspace(model);
+ }
+
+ public void run() {
+ if(!isLocked()) {
+ updateAll();
+ }
+ }
+
+ }
+}
+
+class PageLinks implements SeamPagesConstants {
+ SeamPagesDiagramHelper h;
+ XModelObject page;
+ XModelObject jsp;
+ boolean confirmed = false;
+ long jspTimeStamp;
+ long pageTimeStamp;
+
+ public void setPage(XModelObject page) {
+ this.page = page;
+ }
+
+ public void update() {
+ if(page.getParent() == null) return;
+// boolean modified = (pageTimeStamp != page.getTimeStamp());
+ pageTimeStamp = page.getTimeStamp();
+
+ String path = page.getAttributeValue(ATTR_PATH);
+ if(path == null) {
+ jsp = null;
+ setConfirmed(false);
+ jspTimeStamp = -1;
+ return;
+ }
+ boolean isPattern = SeamPagesDiagramStructureHelper.instance.isPattern(page);
+ if(path.indexOf('?') >= 0) {
+ path = path.substring(0, path.indexOf('?'));
+ }
+ XModelObject jsp1 = (isPattern) ? null : page.getModel().getByPath(path);
+ if(jsp == null || !jsp.isActive() || jsp != jsp1) {
+ jsp = jsp1;
+ setConfirmed(jsp != null);
+ jspTimeStamp = -1;
+ }
+ }
+
+ private void setConfirmed(boolean b) {
+ confirmed = b;
+ if(confirmed == ("true".equals(page.get("confirmed")))) return;
+ page.setAttributeValue("confirmed", "" + confirmed);
+ }
+
+}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9069 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: edit and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 05:57:04 -0400 (Fri, 04 Jul 2008)
New Revision: 9069
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/SelectionUtil.java
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/PagesEditor.java
Log:
JBIDE-1189
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 09:12:56 UTC (rev 9068)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-07-04 09:57:04 UTC (rev 9069)
@@ -24,12 +24,8 @@
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.gef.ui.actions.GEFActionConstants;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
-import org.jboss.tools.seam.ui.pages.editor.edit.LinkEditPart;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
-import org.jboss.tools.seam.ui.pages.editor.edit.PagesEditPart;
-import org.jboss.tools.seam.ui.pages.editor.edit.ParamEditPart;
+import org.jboss.tools.seam.ui.pages.editor.edit.SelectionUtil;
public class PagesContextMenuProvider extends org.eclipse.gef.ContextMenuProvider {
private ActionRegistry actionRegistry;
@@ -68,7 +64,7 @@
ISelection s = getViewer().getSelection();
if(s.isEmpty() || !(s instanceof IStructuredSelection)) return;
IStructuredSelection ss = (IStructuredSelection)s;
- XModelObject object = getTarget(ss.getFirstElement());
+ XModelObject object = SelectionUtil.getTarget(ss.getFirstElement());
if(object != null) {
Properties p = new Properties();
if(lastDownEvent != null) {
@@ -78,48 +74,11 @@
p.setProperty("mouse.y", "" + point.y);
lastDownEvent = null;
}
- XModelObjectActionList list = new XModelObjectActionList(object.getModelEntity().getActionList(), object, getTargets(ss), new Object[]{object, p});
+ XModelObjectActionList list = new XModelObjectActionList(object.getModelEntity().getActionList(), object, SelectionUtil.getTargets(ss), new Object[]{object, p});
Menu menu = getMenu();
list.createMenu(menu);
list.removeLastSeparator(menu);
}
}
- private XModelObject[] getTargets(IStructuredSelection ss) {
- if(ss.size() < 2) return null;
- Iterator it = ss.iterator();
- ArrayList<XModelObject> l = new ArrayList<XModelObject>();
- while(it.hasNext()) {
- XModelObject o = getTarget(it.next());
- if(o != null) l.add(o);
- }
- return l.toArray(new XModelObject[0]);
- }
-
- private XModelObject getTarget(Object selected) {
- if(selected instanceof PagesEditPart) {
- PagesEditPart part = (PagesEditPart)selected;
- Object partModel = part.getModel();
- if(partModel instanceof PagesElement) {
- return (XModelObject)((PagesElement)partModel).getData();
- }
- }
- if(selected instanceof LinkEditPart) {
- LinkEditPart part = (LinkEditPart)selected;
- Object partModel = part.getModel();
- if(partModel instanceof Link) {
- return (XModelObject)((Link)partModel).getData();
- }
- }
- if(selected instanceof ParamEditPart) {
- ParamEditPart part = (ParamEditPart)selected;
- Object partModel = part.getParamModel().getPagesModel();
- if(partModel instanceof PagesElement) {
- return (XModelObject)((PagesElement)partModel).getData();
- }
- }
-
- return null;
- }
-
-}
\ No newline at end of file
+}
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-07-04 09:12:56 UTC (rev 9068)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-07-04 09:57:04 UTC (rev 9069)
@@ -28,24 +28,16 @@
import org.eclipse.draw2d.ConnectionLayer;
import org.eclipse.draw2d.FigureCanvas;
import org.eclipse.draw2d.FreeformViewport;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.PrinterGraphics;
-import org.eclipse.draw2d.SWTGraphics;
import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.ContextMenuProvider;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.SnapToGrid;
import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gef.editparts.LayerManager;
import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
import org.eclipse.gef.editparts.ZoomListener;
import org.eclipse.gef.editparts.ZoomManager;
@@ -60,7 +52,6 @@
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.WorkbenchPartAction;
import org.eclipse.gef.ui.actions.ZoomInAction;
import org.eclipse.gef.ui.actions.ZoomOutAction;
import org.eclipse.gef.ui.palette.PaletteContextMenuProvider;
@@ -79,14 +70,8 @@
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.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.printing.PrintDialog;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.printing.PrinterData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -105,7 +90,7 @@
import org.jboss.tools.common.gef.outline.xpl.DiagramContentOutlinePage;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
-import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.jst.web.model.ReferenceObject;
import org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
@@ -113,15 +98,13 @@
import org.jboss.tools.seam.ui.pages.editor.dnd.FileTransferDropTargetListener;
import org.jboss.tools.seam.ui.pages.editor.dnd.PagesTemplateTransferDropTargetListener;
import org.jboss.tools.seam.ui.pages.editor.dnd.XModelTransferDropTargetListener;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
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.edit.LinkEditPart;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesEditPart;
-import org.jboss.tools.seam.ui.pages.editor.edit.ParamEditPart;
+import org.jboss.tools.seam.ui.pages.editor.edit.SelectionUtil;
import org.jboss.tools.seam.ui.pages.editor.edit.xpl.PagesConnectionRouter;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.palette.PagesPaletteViewerPreferences;
@@ -559,6 +542,10 @@
if (viewer == null)
return null;
XModelObject o = getTarget(viewer.getSelection());
+ if(!(o instanceof ReferenceObject)) {
+ //Case of param object which does not have wrapper in diagram model.
+ return o;
+ }
XModelObject ref = SeamPagesDiagramStructureHelper.instance.getReference(o);
return ref;
}
@@ -639,34 +626,9 @@
private XModelObject getTarget(ISelection ss) {
if (ss.isEmpty() || !(ss instanceof StructuredSelection))
return null;
- return getTarget(((StructuredSelection) ss).getFirstElement());
+ return SelectionUtil.getTarget(((StructuredSelection) ss).getFirstElement());
}
- private XModelObject getTarget(Object selected) {
- if (selected instanceof PagesEditPart) {
- PagesEditPart part = (PagesEditPart) selected;
- Object partModel = part.getModel();
- if (partModel instanceof PagesElement) {
- return (XModelObject) ((PagesElement) partModel).getData();
- }
- }
- if (selected instanceof LinkEditPart) {
- LinkEditPart part = (LinkEditPart) selected;
- Object partModel = part.getModel();
- if (partModel instanceof Link) {
- return (XModelObject) ((Link)partModel).getData();
- }
- }
- if(selected instanceof ParamEditPart) {
- ParamEditPart part = (ParamEditPart)selected;
- Object partModel = part.getParamModel().getPagesModel();
- if(partModel instanceof PagesElement) {
- return (XModelObject)((PagesElement)partModel).getData();
- }
- }
- return null;
- }
-
protected void hookGraphicalViewer() {
getSelectionSynchronizer().addViewer(getGraphicalViewer());
}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/SelectionUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/SelectionUtil.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/SelectionUtil.java 2008-07-04 09:57:04 UTC (rev 9069)
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.edit;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jst.web.model.ReferenceObject;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SelectionUtil {
+
+ /**
+ * Returns array of XModelObject objects associated with selection
+ * containing PagesEditPart objects.
+ * @param ss
+ * @return
+ */
+ public static XModelObject[] getTargets(IStructuredSelection ss) {
+ if(ss.size() < 2) return null;
+ Iterator it = ss.iterator();
+ ArrayList<XModelObject> l = new ArrayList<XModelObject>();
+ while(it.hasNext()) {
+ XModelObject o = getTarget(it.next());
+ if(o != null) l.add(o);
+ }
+ return l.toArray(new XModelObject[0]);
+ }
+
+ /**
+ * Returns XModelObject associated with PagesEditPart
+ * @param selected
+ * @return
+ */
+ public static XModelObject getTarget(Object selected) {
+ if(selected instanceof ParamEditPart) {
+ ParamEditPart part = (ParamEditPart)selected;
+ Object partModel = part.getParamModel().getParent();
+ if(partModel instanceof PagesElement) {
+ XModelObject o = (XModelObject)((PagesElement)partModel).getData();
+ if(o instanceof ReferenceObject) {
+ XModelObject p = ((ReferenceObject)o).getReference();
+ if(p != null) {
+ String name = part.getParamModel().getName();
+ XModelObject[] cs = p.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(name.equals(cs[i].getAttributeValue(SeamPagesConstants.ATTR_NAME))) {
+ return cs[i];
+ }
+ }
+
+ }
+ }
+ return o;
+ }
+ }
+ if(selected instanceof PagesEditPart) {
+ PagesEditPart part = (PagesEditPart)selected;
+ Object partModel = part.getModel();
+ if(partModel instanceof PagesElement) {
+ return (XModelObject)((PagesElement)partModel).getData();
+ }
+ }
+ if(selected instanceof LinkEditPart) {
+ LinkEditPart part = (LinkEditPart)selected;
+ Object partModel = part.getModel();
+ if(partModel instanceof Link) {
+ return (XModelObject)((Link)partModel).getData();
+ }
+ }
+
+ return null;
+ }
+
+}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9068 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 05:12:56 -0400 (Fri, 04 Jul 2008)
New Revision: 9068
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
Log:
JBIDE-2349
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 09:11:51 UTC (rev 9067)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-07-04 09:12:56 UTC (rev 9068)
@@ -252,7 +252,7 @@
item.notifyUpdate();
XModelObject exc = item.getReference();
item.setAttributeValue(ATTR_ID, exc.getPathPart());
- item.setAttributeValue(ATTR_PATH, exc.getAttributeValue(ATTR_VIEW_ID));
+ item.setAttributeValue(ATTR_PATH, exc.getAttributeValue("class"));
XModelObject t = getTargetChild(exc);
XModelObject[] cs = t == null ? new XModelObject[0] : new XModelObject[]{t};
updateOutputs(item, cs);
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9067 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 05:11:51 -0400 (Fri, 04 Jul 2008)
New Revision: 9067
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
Log:
JBIDE-2349
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java 2008-07-04 08:35:56 UTC (rev 9066)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/process/SelectWebProcessItemWizardView.java 2008-07-04 09:11:51 UTC (rev 9067)
@@ -152,7 +152,7 @@
private void readSelection() {
int i = tableViewer.getTable().getSelectionIndex();
- selected = (i < 0) ? null : (XModelObject)provider.items.get(i);
+ selected = (i < 0 || provider == null) ? null : (XModelObject)provider.items.get(i);
}
private void makeSelection() {
@@ -188,17 +188,21 @@
class TContentProvider implements IListContentProvider, ITableLabelProvider {
XModelObject[] l = new XModelObject[0];
- ArrayList items = new ArrayList();
+ ArrayList<XModelObject> items = new ArrayList<XModelObject>();
public void setObjects(XModelObject[] l) {
this.l = l;
}
public void setPattern(String s) {
- s = s.toLowerCase();
+ s = s == null ? "" : s.toLowerCase();
items.clear();
for (int i = 0; i < l.length; i++) {
- if(s.length() == 0 || getKey(l[i]).toLowerCase().indexOf(s) >= 0) items.add(l[i]);
+ String key = getKey(l[i]);
+ if(key == null) {
+ continue;
+ }
+ if(s.length() == 0 || key.toLowerCase().indexOf(s) >= 0) items.add(l[i]);
}
makeSelection();
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9066 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: ecore/pages and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-04 04:35:56 -0400 (Fri, 04 Jul 2008)
New Revision: 9066
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/PagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Link.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.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
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
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.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/PagesContextMenuProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -113,7 +113,7 @@
}
if(selected instanceof ParamEditPart) {
ParamEditPart part = (ParamEditPart)selected;
- Object partModel = part.getExceptionModel().getPagesModel();
+ Object partModel = part.getParamModel().getPagesModel();
if(partModel instanceof PagesElement) {
return (XModelObject)((PagesElement)partModel).getData();
}
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-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -659,7 +659,7 @@
}
if(selected instanceof ParamEditPart) {
ParamEditPart part = (ParamEditPart)selected;
- Object partModel = part.getExceptionModel().getPagesModel();
+ Object partModel = part.getParamModel().getPagesModel();
if(partModel instanceof PagesElement) {
return (XModelObject)((PagesElement)partModel).getData();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Link.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Link.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Link.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -1,5 +1,6 @@
package org.jboss.tools.seam.ui.pages.editor.ecore.pages;
+import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.emf.ecore.EObject;
/**
@@ -91,4 +92,12 @@
void setData(Object value);
public void dataChanged();
+
+ public PointList getPointList();
+
+ public void savePointList(PointList list);
+
+ public void clearPointList();
+
+ public String getPathFromModel();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -6,6 +6,8 @@
*/
package org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -16,6 +18,7 @@
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
@@ -507,5 +510,67 @@
}
}
}
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ private final static String PROPERTY_SHAPE = "shape";
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public PointList getPointList() {
+ int[] path = null;
+ path = SeamPagesDiagramStructureHelper.instance.asIntArray((XModelObject)getData(), PROPERTY_SHAPE);
+
+ PointList list = new PointList();
+
+ if (path.length < 4)
+ return list;
+
+ for (int i = 0; i < path.length; i += 2) {
+ list.addPoint(path[i], path[i + 1]);
+ }
+
+ return list;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public void savePointList(PointList list) {
+ String value = "";
+ for (int i = 0; i < list.size(); i++) {
+ if (i != 0)
+ value += ",";
+ Point p = list.getPoint(i);
+ value += p.x + "," + p.y;
+ }
+ SeamPagesDiagramStructureHelper.instance.setAttributeValue((XModelObject)getData(), PROPERTY_SHAPE, value);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public void clearPointList() {
+ ((XModelObject)getData()).setAttributeValue(PROPERTY_SHAPE, "");
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public String getPathFromModel() {
+ return ((XModelObject)getData()).getAttributeValue(PROPERTY_SHAPE);
+ }
} //LinkImpl
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -13,26 +13,21 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.eclipse.draw2d.*;
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-import org.jboss.tools.common.model.ui.dnd.DnDUtil;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.graphics.Image;
-
-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.gef.GEFGraphicalViewer;
import org.jboss.tools.common.gef.edit.GEFRootEditPart;
import org.jboss.tools.common.gef.figures.GEFLabel;
import org.jboss.tools.common.gef.figures.xpl.CustomLocator;
@@ -86,12 +81,13 @@
return null;
ConnectionFigure conn = FigureFactory.createNewBendableWire(this,
getLink());
-// PointList list = getLink().getPointList();
-// if (list.size() > 0) {
-// conn.setManual(true);
-// conn.setOldPoints(list.getFirstPoint(), list.getLastPoint());
-// conn.setPoints(list);
-// }
+ PointList list = getLink().getPointList();
+ if (list.size() > 0) {
+ conn.setManual(true);
+ conn.setOldPoints(list.getFirstPoint(), list.getLastPoint());
+ conn.setPoints(list);
+ //conn.repaint();
+ }
pathLabel = new GEFLabel(getLink().getName(),
FigureFactory.normalColor);
@@ -134,11 +130,11 @@
public void save() {
PointList list = ((ConnectionFigure) getFigure()).getPoints();
- //getLink().savePointList(list);
+ getLink().savePointList(list);
}
public void clear() {
- //getLink().clearPointList();
+ getLink().clearPointList();
}
public void deactivate() {
@@ -222,15 +218,15 @@
refresh();
}
-// if (getLinkFigure().isManual()
-// && getLink().getPathFromModel().equals("")) {
-// getLinkFigure().setManual(false);
-// refresh();
-// } else if (!getLinkFigure().isManual()
-// && !getLink().getPathFromModel().equals("")) {
-// getLinkFigure().setManual(true);
-// refresh();
-// }
+ if (getLinkFigure().isManual()
+ && getLink().getPathFromModel().equals("")) {
+ getLinkFigure().setManual(false);
+ refresh();
+ } else if (!getLinkFigure().isManual()
+ && !getLink().getPathFromModel().equals("")) {
+ getLinkFigure().setManual(true);
+ refresh();
+ }
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEndpointEditPolicy.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -15,8 +15,6 @@
import org.eclipse.draw2d.ConnectionLocator;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.events.MouseEvent;
import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.DragTracker;
@@ -28,18 +26,19 @@
import org.eclipse.gef.handles.AbstractHandle;
import org.eclipse.gef.handles.ConnectionHandle;
import org.eclipse.gef.tools.ConnectionEndpointTracker;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.events.MouseEvent;
import org.jboss.tools.seam.ui.pages.editor.dnd.DndHelper;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.figures.ConnectionFigure;
-import org.jboss.tools.seam.ui.pages.editor.figures.FigureFactory;
public class LinkEndpointEditPolicy
extends org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy {
private List handles = null;
- private void addJSFHandles() {
- removeJSFHandles();
+ private void addPagesHandles() {
+ removePagesHandles();
handles = createHandles();
IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
for (int i = 0; i < handles.size(); i++)
@@ -47,7 +46,7 @@
}
- private void removeJSFHandles() {
+ private void removePagesHandles() {
if (handles == null)
return;
IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
@@ -59,7 +58,7 @@
protected void addSelectionHandles() {
super.addSelectionHandles();
- addJSFHandles();
+ addPagesHandles();
getConnectionFigure().setSelected(true);
}
@@ -70,7 +69,7 @@
protected void removeSelectionHandles() {
super.removeSelectionHandles();
- removeJSFHandles();
+ removePagesHandles();
getConnectionFigure().setSelected(false);
}
@@ -162,14 +161,14 @@
public void mouseDown(MouseEvent me, EditPartViewer epv) {
super.mouseDown(me, epv);
- removeJSFHandles();
+ removePagesHandles();
DndHelper.drag(((Link) getHost().getModel()).getData());
}
public void mouseUp(MouseEvent me, EditPartViewer epv) {
super.mouseUp(me, epv);
if (getHost().getSelected() != EditPart.SELECTED_NONE)
- addJSFHandles();
+ addPagesHandles();
}
protected boolean handleNativeDragFinished(DragSourceEvent event) {
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-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -116,9 +116,9 @@
if (RequestConstants.REQ_OPEN.equals(req.getType())) {
SelectionRequest request = (SelectionRequest) req;
Point mouseLocation = request.getLocation()
- .translate(-getGroupFigure().getLocation().x,
- -getGroupFigure().getLocation().y);
- if (mouseLocation.x < 16 && mouseLocation.y > getGroupFigure().getSize().height-16) {
+ .translate(-getPageFigure().getLocation().x,
+ -getPageFigure().getLocation().y);
+ if (mouseLocation.x < 16 && mouseLocation.y > getPageFigure().getSize().height-16) {
getPageModel().setParamsVisible(!getPageModel().isParamsVisible());
refresh();
fig.repaint();
@@ -141,8 +141,6 @@
super.createEditPolicies();
installEditPolicy(EditPolicy.NODE_ROLE, null);
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- // installEditPolicy(EditPolicy.COMPONENT_ROLE, new PageEditPolicy());
- // installEditPolicy(EditPolicy.LAYOUT_ROLE, new JSFFlowEditPolicy());
installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
new PageEditPolicy());
}
@@ -159,7 +157,7 @@
return fig;
}
- public PageFigure getGroupFigure() {
+ public PageFigure getPageFigure() {
return (PageFigure) getFigure();
}
@@ -225,10 +223,6 @@
return getNodeFigure().getSourceConnectionAnchorAt(pt);
}
- // protected List getModelChildren() {
- // return getPageModel().getChildren();
- // }
-
protected void refreshChildren() {
super.refreshChildren();
for (int i = 0; i < getChildren().size(); i++) {
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-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -60,7 +60,6 @@
*
*/
protected void createEditPolicies() {
-// installEditPolicy(EditPolicy.COMPONENT_ROLE, new JSFElementEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
new PagesNodeEditPolicy());
}
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-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -108,21 +108,16 @@
}
protected List getModelTargetConnections() {
- return getExceptionModel().getInputLinks();
+ return getParamModel().getInputLinks();
}
protected List getModelSourceConnections() {
- return getExceptionModel().getOutputLinks();
+ return getParamModel().getOutputLinks();
}
protected void createEditPolicies() {
- super.createEditPolicies();
installEditPolicy(EditPolicy.NODE_ROLE, null);
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- //installEditPolicy(EditPolicy.COMPONENT_ROLE, new PageEditPolicy());
- //installEditPolicy(EditPolicy.LAYOUT_ROLE, new JSFFlowEditPolicy());
- //installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
- // new PageEditPolicy());
}
/**
@@ -132,7 +127,7 @@
*/
protected IFigure createFigure() {
- fig = new ParamFigure(getExceptionModel());
+ fig = new ParamFigure(getParamModel());
((ParamFigure) fig).setEditPart(this);
return fig;
}
@@ -142,7 +137,7 @@
*
* @return Model of this as an LED.
*/
- public Param getExceptionModel() {
+ public Param getParamModel() {
return (Param) getModel();
}
@@ -165,37 +160,8 @@
return 21;
}
- public ConnectionAnchor getTargetConnectionAnchor(
- ConnectionEditPart connEditPart) {
- ConnectionAnchor anc = getNodeFigure().getConnectionAnchor("1_IN");
- return anc;
- }
-
- public ConnectionAnchor getTargetConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getNodeFigure().getTargetConnectionAnchorAt(pt);
- }
-
- public ConnectionAnchor getSourceConnectionAnchor(
- ConnectionEditPart connEditPart) {
- if (single) {
- Link link = (Link) connEditPart.getModel();
- int index = getExceptionModel().getOutputLinks().indexOf(link);
- return getNodeFigure().getConnectionAnchor((index + 1) + "_OUT");
- } else
- return super.getSourceConnectionAnchor(connEditPart);
- }
-
- public ConnectionAnchor getSourceConnectionAnchor(Request request) {
- if (single) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getNodeFigure().getSourceConnectionAnchorAt(pt);
- } else
- return super.getSourceConnectionAnchor(request);
- }
-
protected List getModelChildren() {
- return getExceptionModel().getChildren();
+ return getParamModel().getChildren();
}
protected void refreshChildren() {
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-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -56,13 +56,8 @@
}
protected void createEditPolicies() {
- //super.createEditPolicies();
installEditPolicy(EditPolicy.NODE_ROLE, null);
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- //installEditPolicy(EditPolicy.COMPONENT_ROLE, new PageEditPolicy());
- //installEditPolicy(EditPolicy.LAYOUT_ROLE, new JSFFlowEditPolicy());
- //installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
- // new PageEditPolicy());
}
/**
@@ -72,7 +67,7 @@
*/
protected IFigure createFigure() {
- fig = new ParamListFigure(getExceptionModel());
+ fig = new ParamListFigure(getPageWrapperModel());
((ParamListFigure) fig).setEditPart(this);
return fig;
}
@@ -82,7 +77,7 @@
*
* @return Model of this as an LED.
*/
- public PageWrapper getExceptionModel() {
+ public PageWrapper getPageWrapperModel() {
return (PageWrapper) getModel();
}
@@ -91,9 +86,9 @@
protected void refreshVisuals() {
- Point loc = getExceptionModel().getPage().getLocation().getCopy();
- loc.y += 25+getExceptionModel().getPage().getOutputLinks().size()*NodeFigure.LINK_HEIGHT;
- size = new Dimension(200, getExceptionModel().getPage().getChildren().size()*19);
+ Point loc = getPageWrapperModel().getPage().getLocation().getCopy();
+ loc.y += 25+getPageWrapperModel().getPage().getOutputLinks().size()*NodeFigure.LINK_HEIGHT;
+ size = new Dimension(200, getPageWrapperModel().getPage().getChildren().size()*19);
adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
@@ -108,27 +103,8 @@
}
- public ConnectionAnchor getTargetConnectionAnchor(
- ConnectionEditPart connEditPart) {
- ConnectionAnchor anc = getNodeFigure().getConnectionAnchor("1_IN");
- return anc;
- }
-
- public ConnectionAnchor getTargetConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getNodeFigure().getTargetConnectionAnchorAt(pt);
- }
-
- public ConnectionAnchor getSourceConnectionAnchor(Request request) {
- if (single) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getNodeFigure().getSourceConnectionAnchorAt(pt);
- } else
- return super.getSourceConnectionAnchor(request);
- }
-
protected List getModelChildren() {
- return getExceptionModel().getPage().getChildren();
+ return getPageWrapperModel().getPage().getChildren();
}
protected void refreshChildren() {
@@ -145,14 +121,14 @@
public void activate() {
if (isActive())
return;
- ((Notifier) getExceptionModel().getPage()).eAdapters().add(this);
+ ((Notifier) getPageWrapperModel().getPage()).eAdapters().add(this);
super.activate();
}
public void deactivate(){
if (!isActive())
return;
- ((Notifier) getExceptionModel().getPage()).eAdapters().remove(this);
+ ((Notifier) getPageWrapperModel().getPage()).eAdapters().remove(this);
super.deactivate();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -304,18 +304,18 @@
return;
}
-// if(((ConnectionFigure)conn).isManual()){
-// if(conn.getPoints().size() < 4){
-// PointList list = ((ConnectionFigure)conn).getLinkModel().getPointList();
-// ((ConnectionFigure)conn).setOldPoints(list.getFirstPoint(), list.getLastPoint());
-// conn.setPoints(list);
-// }
-// if(hold((ConnectionFigure)conn)) return;
-// else{
-// ((ConnectionFigure)conn).setManual(false);
-// ((ConnectionFigure)conn).clear();
-// }
-// }
+ if(((ConnectionFigure)conn).isManual()){
+ if(conn.getPoints().size() < 4){
+ PointList list = ((ConnectionFigure)conn).getLinkModel().getPointList();
+ ((ConnectionFigure)conn).setOldPoints(list.getFirstPoint(), list.getLastPoint());
+ conn.setPoints(list);
+ }
+ if(hold((ConnectionFigure)conn)) return;
+ else{
+ ((ConnectionFigure)conn).setManual(false);
+ ((ConnectionFigure)conn).clear();
+ }
+ }
int i;
Point startPoint = getStartPoint(conn);
conn.translateToRelative(startPoint);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -12,7 +12,6 @@
import org.eclipse.draw2d.AnchorListener;
import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.PolylineConnection;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -21,7 +21,7 @@
public class ParamFigure extends NodeFigure implements HandleBounds {
private static final Dimension SIZE = new Dimension(56, 100);
- public Param exc;
+ public Param param;
ParamEditPart editPart;
@@ -30,7 +30,7 @@
}
public ParamFigure(Param group) {
- this.exc = group;
+ this.param = group;
setOpaque(true);
}
@@ -65,19 +65,19 @@
g.translate(r.getLocation());
String name;
- if(exc.getName() != null){
- name = dottedString(exc.getName(), getTextWidth()-getTextInset(), nameParamFont);
+ if(param.getName() != null){
+ name = dottedString(param.getName(), getTextWidth()-getTextInset(), nameParamFont);
name += ":";
}else
name = "Param:";
String value;
- if(exc.getValue() != null){
- value = dottedString(exc.getValue(), getTextWidth()-getTextInset(), valueParamFont);
+ if(param.getValue() != null){
+ value = dottedString(param.getValue(), getTextWidth()-getTextInset(), valueParamFont);
}else
value = "value";
- if(exc != null){
+ if(param != null){
g.setFont(nameParamFont);
g.drawString(name, getTextInset(), 1);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java 2008-07-04 00:48:40 UTC (rev 9065)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java 2008-07-04 08:35:56 UTC (rev 9066)
@@ -13,22 +13,17 @@
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MouseEvent;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.handles.HandleBounds;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.common.gef.GEFGraphicalViewer;
import org.jboss.tools.seam.ui.pages.editor.edit.PageWrapper;
import org.jboss.tools.seam.ui.pages.editor.edit.ParamListEditPart;
public class ParamListFigure extends NodeFigure implements HandleBounds {
private static final Dimension SIZE = new Dimension(56, 100);
- private Image icon = null;
-
public PageWrapper paramList;
ParamListEditPart editPart;
@@ -41,12 +36,6 @@
super.setConstraint(child, constraint);
}
- public void setIcon(Image i) {
- //icon = PrintIconHelper.getPrintImage(i);
- }
-
-
-
public ParamListFigure(PageWrapper paramList) {
this.paramList = paramList;
@@ -102,18 +91,7 @@
graphics.drawLine(0, 1, 0, height - 1);
graphics.drawLine(1, height, width-1, height);
graphics.drawLine(width, 1, width, height - 1);
- }
-
- public void mouseDoubleClicked(MouseEvent me) {
- }
-
- public void mousePressed(MouseEvent me) {
- if (me.button == 3) {
- ((GEFGraphicalViewer) editPart.getViewer()).setNoDeselect();
- editPart.getViewer().select(editPart);
}
- }
-
-}
+ }
}
\ No newline at end of file
15 years, 9 months
- 1
- 0