Author: koen.aers(a)jboss.com
Date: 2008-12-22 22:28:50 -0500 (Mon, 22 Dec 2008)
New Revision: 12810
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
Log:
attempts to introduce movable labels
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-12-22
18:32:50 UTC (rev 12809)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -36,8 +36,10 @@
import org.jboss.tools.flow.common.registry.ElementRegistry;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
/**
* Implementation of a connection EditPart.
@@ -50,6 +52,13 @@
return (ConnectionWrapper) getModel();
}
+ public List<Wrapper> getModelChildren() {
+ List<Wrapper> result = new ArrayList<Wrapper>();
+ LabelWrapper label = getElementConnection().getLabel();
+ if (label != null) result.add(label);
+ return result;
+ }
+
protected void createEditPolicies() {
ConnectionEditPolicy connectionEditPolicy = new ConnectionEditPolicy();
connectionEditPolicy.setElementConnectionFactory(getElementConnectionFactory());
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -0,0 +1,27 @@
+package org.jboss.tools.flow.common.model;
+
+import java.util.HashMap;
+
+public class DefaultLabel implements Label {
+
+ private String text;
+
+ private HashMap<String, Object> metaData = new HashMap<String, Object>();
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public void setMetaData(String key, Object value) {
+ metaData.put(key, value);
+ }
+
+ public Object getMetaData(String key) {
+ return metaData.get(key);
+ }
+
+}
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -0,0 +1,8 @@
+package org.jboss.tools.flow.common.model;
+
+public interface Label extends Element {
+
+ String getText();
+ void setText(String text);
+
+}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-12-22
18:32:50 UTC (rev 12809)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -32,6 +32,7 @@
private NodeWrapper source;
private NodeWrapper target;
+ private LabelWrapper label;
private transient List<Point> bendpoints = new ArrayList<Point>();
private transient List<ModelListener> listeners = new
ArrayList<ModelListener>();
@@ -117,6 +118,14 @@
}
protected abstract List<Point> internalGetBendpoints();
+
+ public void setLabel(LabelWrapper label) {
+ this.label = label;
+ }
+
+ public LabelWrapper getLabel() {
+ return label;
+ }
public void addListener(ModelListener listener) {
listeners.add(listener);
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -0,0 +1,43 @@
+package org.jboss.tools.flow.common.wrapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+
+public abstract class AbstractLabelWrapper extends AbstractWrapper implements
+ LabelWrapper {
+
+ private transient List<ModelListener> listeners = new
ArrayList<ModelListener>();
+ private Point location = null;
+ private Wrapper owner = null;
+
+ public Point getLocation() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getText() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setLocation(Point location) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setText(String text) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addListener(ModelListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(ModelListener listener) {
+ listeners.remove(listener);
+ }
+
+}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-12-22
18:32:50 UTC (rev 12809)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -41,6 +41,7 @@
}
private ContainerWrapper parent;
+ private LabelWrapper label;
private transient Rectangle constraint;
private List<ConnectionWrapper> incomingConnections = new
ArrayList<ConnectionWrapper>();
private List<ConnectionWrapper> outgoingConnections = new
ArrayList<ConnectionWrapper>();
@@ -70,6 +71,14 @@
public ContainerWrapper getParent() {
return parent;
}
+
+ public void setLabel(LabelWrapper label) {
+ this.label = label;
+ }
+
+ public LabelWrapper getLabel() {
+ return label;
+ }
public List<ConnectionWrapper> getOutgoingConnections() {
return Collections.unmodifiableList(outgoingConnections);
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-12-22
18:32:50 UTC (rev 12809)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -19,4 +19,7 @@
void removeBendpoint(int index);
List<Point> getBendpoints();
+ void setLabel(LabelWrapper label);
+ LabelWrapper getLabel();
+
}
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -0,0 +1,5 @@
+package org.jboss.tools.flow.common.wrapper;
+
+public class DefaultLabelWrapper extends AbstractLabelWrapper {
+
+}
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java
(rev 0)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -0,0 +1,13 @@
+package org.jboss.tools.flow.common.wrapper;
+
+import org.eclipse.draw2d.geometry.Point;
+
+public interface LabelWrapper extends Wrapper {
+
+ void setText(String text);
+ String getText();
+
+ void setLocation(Point location);
+ Point getLocation();
+
+}
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
===================================================================
---
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-12-22
18:32:50 UTC (rev 12809)
+++
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-12-23
03:28:50 UTC (rev 12810)
@@ -41,6 +41,9 @@
void setParent(ContainerWrapper parent);
ContainerWrapper getParent();
+ void setLabel(LabelWrapper label);
+ LabelWrapper getLabel();
+
List<ConnectionWrapper> getOutgoingConnections();
List<ConnectionWrapper> getIncomingConnections();
void addIncomingConnection(ConnectionWrapper connection);
Show replies by date