JBoss Tools SVN: r12033 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:18:08 -0500 (Tue, 25 Nov 2008)
New Revision: 12033
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
Log:
remove commented section
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-11-25 17:15:49 UTC (rev 12032)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-11-25 17:18:08 UTC (rev 12033)
@@ -119,59 +119,4 @@
return entries;
}
-// protected List<PaletteEntry> createComponentEntries() {
-// List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
-//
-// CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
-// "Start",
-// "Create a new Start Event",
-// "org.jboss.tools.flow.jpdl4.startEvent",
-// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif")),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/start.gif"))
-// );
-// entries.add(combined);
-//
-// combined = new CombinedTemplateCreationEntry(
-// "State",
-// "Create a new Wait State Task",
-// "org.jboss.tools.flow.jpdl4.state",
-// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.state"),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif")),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/state.gif"))
-// );
-// entries.add(combined);
-//
-// combined = new CombinedTemplateCreationEntry(
-// "End",
-// "Create a new End State",
-// "org.jboss.tools.flow.jpdl4.endState",
-// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.endState"),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif")),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/end.gif"))
-// );
-// entries.add(combined);
-//
-// combined = new CombinedTemplateCreationEntry(
-// "Super State",
-// "Create a new Super State",
-// "org.jboss.tools.flow.jpdl4.superState",
-// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.superState"),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/super.gif")),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/super.gif"))
-// );
-// entries.add(combined);
-//
-// ToolEntry tool = new ConnectionCreationToolEntry(
-// "Transition",
-// "Creating a new Transition",
-// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.transition"),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif")),
-// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif"))
-// );
-// entries.add(tool);
-//
-// return entries;
-// }
-
}
17 years, 4 months
JBoss Tools SVN: r12032 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:15:49 -0500 (Tue, 25 Nov 2008)
New Revision: 12032
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
Log:
change deserialization from new representation, handle graphics info
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-11-25 17:15:14 UTC (rev 12031)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-11-25 17:15:49 UTC (rev 12032)
@@ -1,12 +1,16 @@
package org.jboss.tools.flow.jpdl4.editor;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.draw2d.geometry.Rectangle;
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.registry.ElementRegistry;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
import org.jboss.tools.flow.common.wrapper.FlowWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -43,13 +47,54 @@
private static FlowWrapper createProcessWrapper(Element element) {
FlowWrapper result = (FlowWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.process");
if (result != null) {
+ result.getElement().setMetaData("flows", new ArrayList<ConnectionWrapper>());
addName(result, element);
- addChildren(result, element);
+ addNodes(result, element);
+ resolveSequenceFlowTargets(result);
+ result.getElement().setMetaData("flows", null);
}
return result;
}
- private static void addName(Wrapper wrapper, Element element) {
+ @SuppressWarnings("unchecked")
+ private static void resolveSequenceFlowTargets(FlowWrapper flowWrapper) {
+ ArrayList<ConnectionWrapper> flows = (ArrayList<ConnectionWrapper>)flowWrapper.getElement().getMetaData("flows");
+ for (ConnectionWrapper flow : flows) {
+ resolveSequenceFlowTarget(flow);
+ }
+ }
+
+ private static void resolveSequenceFlowTarget(ConnectionWrapper connectionWrapper) {
+ String to = (String)connectionWrapper.getElement().getMetaData("to");
+ if (to == null) {
+ Logger.logInfo("Ignoring sequenceflow without target");
+ return;
+ }
+ connectionWrapper.getElement().setMetaData("to", null);
+ NodeWrapper source = (NodeWrapper)connectionWrapper.getElement().getMetaData("from");
+ if (source == null) {
+ Logger.logInfo("Ignoring sequenceflow without source");
+ return;
+ }
+ connectionWrapper.getElement().setMetaData("from", null);
+ FlowWrapper flowWrapper = source.getParent().getFlowWrapper();
+ NodeWrapper target = getNamedNode(to, flowWrapper);
+ if (target != null) {
+ connectionWrapper.connect(source, target);
+ } else {
+ Logger.logInfo("Ignoring unknown target " + to + " while resolving sequenceflow target.");
+ }
+ }
+
+ private static NodeWrapper getNamedNode(String name, FlowWrapper flowWrapper) {
+ if (name == null) return null;
+ for (NodeWrapper nodeWrapper : flowWrapper.getElements()) {
+ if (name.equals(nodeWrapper.getName())) return nodeWrapper;
+ }
+ return null;
+ }
+
+ private static void addName(Wrapper wrapper, Element element) {
String name = element.getAttribute("name");
if (name == null) return;
if (wrapper instanceof FlowWrapper) {
@@ -59,55 +104,100 @@
}
}
- private static void addChildren(FlowWrapper wrapper, Element element) {
+ private static void addNodes(FlowWrapper wrapper, Element element) {
NodeList nodeList = element.getChildNodes();
for (int i = 0; i < nodeList.getLength(); i++) {
Node child = nodeList.item(i);
NodeWrapper result = null;
if ("start".equals(child.getNodeName())) {
- result = createElementWrapper((Element)child, "org.jboss.tools.flow.jpdl4.startEvent");
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.startEvent");
} else if ("state".equals(child.getNodeName())) {
- result = createElementWrapper((Element)child, "org.jboss.tools.flow.jpdl4.stateTask");
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.stateTask");
+ } else if ("end".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.endEvent");
}
if (result != null) {
wrapper.addElement(result);
+ addName(result, (Element)child);
+ addGraphics(result, (Element)child);
+ addSequenceFlow(result, (Element)child);
}
}
}
- private static NodeWrapper createElementWrapper(Element element, String elementType) {
- NodeWrapper result = (NodeWrapper)ElementRegistry.createWrapper(elementType);
+ @SuppressWarnings("unchecked")
+ private static void addSequenceFlow(NodeWrapper wrapper, Element element) {
+ NodeList nodeList = element.getElementsByTagName("flow");
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node child = nodeList.item(i);
+ ConnectionWrapper result =
+ createConnectionWrapper((Element)child, "org.jboss.tools.flow.jpdl4.sequenceFlow");
+ if (result != null) {
+ result.getElement().setMetaData("from", wrapper);
+ String to = ((Element)child).getAttribute("to");
+ result.getElement().setMetaData("to", to);
+ ContainerWrapper parent = wrapper.getParent();
+ FlowWrapper flowWrapper = parent.getFlowWrapper();
+ ArrayList<ConnectionWrapper> flows =
+ (ArrayList<ConnectionWrapper>)flowWrapper.getElement().getMetaData("flows");
+ flows.add(result);
+ addName(result, (Element)child);
+ }
+ }
+ }
+
+
+ private static ConnectionWrapper createConnectionWrapper(Element element, String elementType) {
+ ConnectionWrapper result = (ConnectionWrapper)ElementRegistry.createWrapper(elementType);
if (result != null) {
addName(result, element);
- addLocation(result, element);
+ addTo(result, element);
+ addGraphics(result, element);
}
return result;
}
- private static void addLocation(NodeWrapper wrapper, Element element) {
- NodeList nodelist = element.getElementsByTagName("location");
+ private static void addTo(ConnectionWrapper wrapper, Element element) {
+ String to = element.getAttribute("to");
+ if (to != null) {
+ wrapper.getElement().setMetaData("to", to);
+ }
+ }
+
+ private static void addGraphics(ConnectionWrapper wrapper, Element element) {
+
+ }
+
+ private static void addGraphics(NodeWrapper wrapper, Element element) {
+ String graphics = element.getAttribute("g");
Rectangle constraint = new Rectangle(0, 0, 80, 40);
- if (nodelist.getLength() >= 1) {
- Element location = (Element)nodelist.item(0);
- constraint.x = convertAttributeToInt(location, "x");
- constraint.y = convertAttributeToInt(location, "y");
- constraint.height = convertAttributeToInt(location, "h");
- constraint.width = convertAttributeToInt(location, "w");
+ if (graphics != null) {
+ StringTokenizer tokenizer = new StringTokenizer(graphics, ",");
+ if (tokenizer.countTokens() != 4) {
+ Logger.logInfo(
+ "Wrong info in attribute 'g' for element '" +
+ element.getNodeName() + "'" +
+ " with name '" +
+ element.getAttribute("name") +
+ "'. Using defaults." );
+ } else {
+ constraint.x = convertStringToInt(tokenizer.nextToken());
+ constraint.y = convertStringToInt(tokenizer.nextToken());
+ constraint.width = convertStringToInt(tokenizer.nextToken());
+ constraint.height = convertStringToInt(tokenizer.nextToken());
+ }
}
wrapper.setConstraint(constraint);
}
- private static int convertAttributeToInt(Element element, String attributeName) {
+ private static int convertStringToInt(String str) {
int result = 0;
- String str = element.getAttribute(attributeName);
- if (str != null) {
- try {
- result = new Integer(str).intValue();
- } catch (NumberFormatException e) {
- Logger.logError(attributeName + " is not correctly formatted.", e);
- }
+ try {
+ result = new Integer(str).intValue();
+ } catch (NumberFormatException e) {
+ Logger.logError("Error while converting " + str + " to an integer.", e);
}
return result;
}
-
+
}
17 years, 4 months
JBoss Tools SVN: r12031 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:15:14 -0500 (Tue, 25 Nov 2008)
New Revision: 12031
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
Log:
change serialization to new representation, add serialized graphics info
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-11-25 17:13:56 UTC (rev 12030)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-11-25 17:15:14 UTC (rev 12031)
@@ -17,7 +17,7 @@
import org.jboss.tools.flow.jpdl4.model.StartEvent;
import org.jboss.tools.flow.jpdl4.model.StateTask;
import org.jboss.tools.flow.jpdl4.model.SuperState;
-import org.jboss.tools.flow.jpdl4.model.Transition;
+import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
public class JpdlSerializer {
@@ -40,11 +40,11 @@
private static void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
Element element = (Element)wrapper.getElement();
- if (element instanceof Transition) {
- Transition transition = (Transition)element;
+ if (element instanceof SequenceFlow) {
+ SequenceFlow transition = (SequenceFlow)element;
buffer.append("\n");
appendPadding(buffer, level);
- buffer.append("<transition");
+ buffer.append("<flow");
if (transition.getTo() != null) {
buffer.append(" ");
String value = transition.getTo().getName();
@@ -56,12 +56,13 @@
EndEvent endState = (EndEvent)element;
buffer.append("\n");
appendPadding(buffer, level);
- buffer.append("<end-state");
+ buffer.append("<end");
if (endState.getName() != null) {
buffer.append(" ");
String value = endState.getName();
buffer.append("name=\"" + value + "\"");
}
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
buffer.append(">");
} else if (element instanceof StartEvent) {
StartEvent startState = (StartEvent)element;
@@ -73,6 +74,7 @@
String value = startState.getName();
buffer.append("name=\"" + value + "\"");
}
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
buffer.append(">");
} else if (element instanceof SuperState) {
SuperState superState = (SuperState)element;
@@ -95,6 +97,7 @@
String value = state.getName();
buffer.append("name=\"" + value + "\"");
}
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
buffer.append(">");
} else if (element instanceof Process) {
Process process = (Process)element;
@@ -123,14 +126,14 @@
private static void appendClosing(StringBuffer buffer, Wrapper wrapper, int level) {
Element element = (Element)wrapper.getElement();
- if (element instanceof Transition) {
+ if (element instanceof SequenceFlow) {
buffer.append("\n");
appendPadding(buffer, level);
- buffer.append("</transition>");
+ buffer.append("</flow>");
} else if (element instanceof EndEvent) {
buffer.append("\n");
appendPadding(buffer, level);
- buffer.append("</end-state>");
+ buffer.append("</end>");
} else if (element instanceof StartEvent) {
buffer.append("\n");
appendPadding(buffer, level);
@@ -161,26 +164,23 @@
if (wrapper instanceof NodeWrapper) {
NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
- appendLocation(buffer, (NodeWrapper)wrapper, level+1);
for (ConnectionWrapper connectionWrapper : children) {
appendToBuffer(buffer, connectionWrapper, level+1);
}
}
}
- private static void appendLocation(StringBuffer buffer, NodeWrapper wrapper, int level) {
+ private static void appendNodeGraphics(StringBuffer buffer, NodeWrapper wrapper) {
Rectangle constraint = wrapper.getConstraint();
- buffer.append("\n");
- appendPadding(buffer, level);
- buffer.append("<location x=\"");
+ buffer.append(" g=\"");
buffer.append(constraint.x);
- buffer.append("\" y=\"");
+ buffer.append(",");
buffer.append(constraint.y);
- buffer.append("\" w=\"");
+ buffer.append(",");
buffer.append(constraint.width);
- buffer.append("\" h=\"");
+ buffer.append(",");
buffer.append(constraint.height);
- buffer.append("\"/>");
+ buffer.append("\"");
}
}
17 years, 4 months
JBoss Tools SVN: r12030 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:13:56 -0500 (Tue, 25 Nov 2008)
New Revision: 12030
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
Log:
change transition in sequence flow, change end event figure
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-11-25 17:12:54 UTC (rev 12029)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-11-25 17:13:56 UTC (rev 12030)
@@ -50,15 +50,11 @@
</element>
<element
class="org.jboss.tools.flow.jpdl4.model.EndEvent"
- figure="icons/end.gif"
id="org.jboss.tools.flow.jpdl4.endEvent"
- language="org.jboss.tools.flow.jpdl4"
- name="End">
+ language="org.jboss.tools.flow.jpdl4">
<node
acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndStateAcceptsOutgoingConnectionStrategy">
- <figure>
- <rectangle></rectangle>
- </figure>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.EndEventFigure"></figure>
</node>
</element>
<element
@@ -70,11 +66,11 @@
</node>
</element>
<element
- class="org.jboss.tools.flow.jpdl4.model.Transition"
+ class="org.jboss.tools.flow.jpdl4.model.SequenceFlow"
figure="icons/sequence.gif"
- id="org.jboss.tools.flow.jpdl4.transition"
+ id="org.jboss.tools.flow.jpdl4.sequenceFlow"
language="org.jboss.tools.flow.jpdl4"
- name="Transition">
+ name="Flow">
<connection></connection>
</element>
</extension>
17 years, 4 months
JBoss Tools SVN: r12029 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:12:54 -0500 (Tue, 25 Nov 2008)
New Revision: 12029
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java
Log:
change of 'transition' in 'sequenceflow'
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java 2008-11-25 17:12:34 UTC (rev 12028)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java 2008-11-25 17:12:54 UTC (rev 12029)
@@ -1,16 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultConnection;
-import org.jboss.tools.flow.common.model.Node;
-
-public class Transition extends DefaultConnection {
-
- public Transition() {
- this(null, null);
- }
-
- public Transition(Node from, Node to) {
- super(from, to);
- }
-
-}
17 years, 4 months
JBoss Tools SVN: r12028 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:12:34 -0500 (Tue, 25 Nov 2008)
New Revision: 12028
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
Log:
change of 'transition' in 'sequenceflow'
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java (from rev 11705, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2008-11-25 17:12:34 UTC (rev 12028)
@@ -0,0 +1,16 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+import org.jboss.tools.flow.common.model.DefaultConnection;
+import org.jboss.tools.flow.common.model.Node;
+
+public class SequenceFlow extends DefaultConnection {
+
+ public SequenceFlow() {
+ this(null, null);
+ }
+
+ public SequenceFlow(Node from, Node to) {
+ super(from, to);
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 4 months
JBoss Tools SVN: r12027 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:12:02 -0500 (Tue, 25 Nov 2008)
New Revision: 12027
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java
Log:
set this as the parent of the added node
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-11-25 17:11:41 UTC (rev 12026)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractFlowWrapper.java 2008-11-25 17:12:02 UTC (rev 12027)
@@ -62,6 +62,7 @@
public void localAddElement(NodeWrapper element) {
elementMap.put(element.getId(), element);
elementList.add(element);
+ element.setParent(this);
}
public boolean acceptsElement(NodeWrapper element) {
17 years, 4 months
JBoss Tools SVN: r12026 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:11:41 -0500 (Tue, 25 Nov 2008)
New Revision: 12026
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java
Log:
set this as the parent of the added node
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java 2008-11-25 17:11:01 UTC (rev 12025)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractContainerWrapper.java 2008-11-25 17:11:41 UTC (rev 12026)
@@ -33,6 +33,7 @@
public void localAddElement(NodeWrapper element) {
elements.add(element);
+ element.setParent(this);
}
protected abstract void internalAddElement(NodeWrapper element);
17 years, 4 months
JBoss Tools SVN: r12025 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 12:11:01 -0500 (Tue, 25 Nov 2008)
New Revision: 12025
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
Log:
element is inherited from AbstractWrapper
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-11-25 17:09:26 UTC (rev 12024)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-11-25 17:11:01 UTC (rev 12025)
@@ -20,7 +20,6 @@
import java.util.List;
import org.eclipse.draw2d.geometry.Point;
-import org.jboss.tools.flow.common.model.Element;
/**
* A connection between two model elements.
@@ -31,20 +30,11 @@
private static final long serialVersionUID = 1L;
- private Element element;
private NodeWrapper source;
private NodeWrapper target;
private transient List<Point> bendpoints = new ArrayList<Point>();
private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
- public void setElement(Element element) {
- this.element = element;
- }
-
- public Element getElement() {
- return element;
- }
-
public void localSetSource(NodeWrapper source) {
this.source = source;
}
17 years, 4 months
JBoss Tools SVN: r12024 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-11-25 12:09:26 -0500 (Tue, 25 Nov 2008)
New Revision: 12024
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3254
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-25 16:19:25 UTC (rev 12023)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-25 17:09:26 UTC (rev 12024)
@@ -708,4 +708,26 @@
public void finishPressed() {
model.removeListener(validatorDelegate);
};
+
+
+ /*
+ * test method
+ */
+ public String getSessionBeanPkgName(){
+ return (String)sessionBeanPkgNameditor.getValue();
+ }
+
+ /*
+ * test method
+ */
+ public String getEntityBeanPkgName(){
+ return (String)entityBeanPkgNameditor.getValue();
+ }
+
+ /*
+ * test method
+ */
+ public String getTestsPkgName(){
+ return (String)testsPkgNameditor.getValue();
+ }
}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-11-25 16:19:25 UTC (rev 12023)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-11-25 17:09:26 UTC (rev 12024)
@@ -22,6 +22,7 @@
import org.jboss.tools.seam.ui.test.preferences.SeamSettingsPreferencesPageTest;
import org.jboss.tools.seam.ui.test.view.SeamComponentsViewAllTests;
import org.jboss.tools.seam.ui.test.wizard.OpenSeamComponentDialogTest;
+import org.jboss.tools.seam.ui.test.wizard.PackageNamesTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest;
@@ -54,6 +55,7 @@
suite.addTestSuite(Seam12WARNewOperationTest.class);
suite.addTestSuite(Seam20EARNewOperationTest.class);
suite.addTestSuite(Seam20WARNewOperationTest.class);
+ suite.addTestSuite(PackageNamesTest.class);
return suite;
}
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2008-11-25 17:09:26 UTC (rev 12024)
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.test.wizard;
+
+import junit.framework.TestCase;
+
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
+import org.jboss.tools.common.util.WorkbenchUtils;
+import org.jboss.tools.seam.ui.ISeamUiConstants;
+import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage;
+/**
+ * @author dazarov
+ * JBIDE-3254 tests
+ */
+public class PackageNamesTest extends TestCase{
+ NewProjectDataModelFacetWizard wizard;
+ IWizardPage startSeamPrjWzPg;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testProjectNameWithSpaces() {
+ SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam Test Project");
+
+ String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
+ String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
+ String testsPkgName = seamWizPg.getTestsPkgName();
+
+ wizard.performCancel();
+ assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
+ assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
+ assertEquals("org.domain.seamtestproject.test", testsPkgName);
+ }
+
+ public void testProjectNameWithUnderlines() {
+ SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam_Test_Project");
+
+ String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
+ String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
+ String testsPkgName = seamWizPg.getTestsPkgName();
+
+ wizard.performCancel();
+ assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
+ assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
+ assertEquals("org.domain.seamtestproject.test", testsPkgName);
+ }
+
+ public void testProjectNameWithMinuses() {
+ SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam-Test-Project");
+
+ String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
+ String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
+ String testsPkgName = seamWizPg.getTestsPkgName();
+
+ wizard.performCancel();
+ assertEquals("org.domain.seamtestproject.session", sessionBeanPkgName);
+ assertEquals("org.domain.seamtestproject.entity", entityBeanPkgName);
+ assertEquals("org.domain.seamtestproject.test", testsPkgName);
+ }
+
+ public void testProjectNameWithMultipleDots() {
+ SeamInstallWizardPage seamWizPg = startCreateSeamWizard("Seam...Test....Project");
+
+ String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
+ String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
+ String testsPkgName = seamWizPg.getTestsPkgName();
+
+ wizard.performCancel();
+ assertEquals("org.domain.seam.test.project.session", sessionBeanPkgName);
+ assertEquals("org.domain.seam.test.project.entity", entityBeanPkgName);
+ assertEquals("org.domain.seam.test.project.test", testsPkgName);
+ }
+
+ private SeamInstallWizardPage startCreateSeamWizard(String projectName){
+ wizard = (NewProjectDataModelFacetWizard)WorkbenchUtils.findWizardByDefId(ISeamUiConstants.NEW_SEAM_PROJECT_WIZARD_ID);
+ WizardDialog dialog = new WizardDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ wizard);
+ wizard.getDataModel().setStringProperty("IProjectCreationPropertiesNew.PROJECT_NAME", projectName);
+ dialog.create();
+ startSeamPrjWzPg = wizard.getStartingPage();
+ assertNotNull("Cannot create seam start wizard page", startSeamPrjWzPg);
+
+ IWizardPage webModuleWizPg = wizard.getNextPage(startSeamPrjWzPg);
+ assertNotNull("Cannot create dynamic web project wizard page",webModuleWizPg);
+ IWizardPage jsfCapabilitiesWizPg = wizard.getNextPage(webModuleWizPg);
+ assertNotNull("Cannot create JSF capabilities wizard page",jsfCapabilitiesWizPg);
+ SeamInstallWizardPage seamWizPg = (SeamInstallWizardPage)wizard.getNextPage(jsfCapabilitiesWizPg);
+ assertNotNull("Cannot create seam facet wizard page",seamWizPg);
+
+ return seamWizPg;
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 4 months