JBoss Tools SVN: r12053 - 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 15:59:12 -0500 (Tue, 25 Nov 2008)
New Revision: 12053
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
Log:
remove commented section
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-11-25 20:58:50 UTC (rev 12052)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-11-25 20:59:12 UTC (rev 12053)
@@ -34,19 +34,6 @@
protected void createModel(InputStream is) {
setModel(JpdlDeserializer.deserialize(is));
-// StringBuffer stringBuffer = new StringBuffer();
-// int c = -1;
-// do {
-// try {
-// c = is.read();
-// if (c != -1) {
-// stringBuffer.append((char)c);
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// } while (c != -1);
-// System.out.println(stringBuffer);
}
}
15 years, 11 months
JBoss Tools SVN: r12052 - 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 15:58:50 -0500 (Tue, 25 Nov 2008)
New Revision: 12052
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
Log:
Deserialization of exclusive gateways
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 20:58:28 UTC (rev 12051)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-11-25 20:58:50 UTC (rev 12052)
@@ -116,6 +116,8 @@
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");
+ } else if ("exclusive".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.exclusiveGateway");
}
if (result != null) {
wrapper.addElement(result);
15 years, 11 months
JBoss Tools SVN: r12051 - 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 15:58:28 -0500 (Tue, 25 Nov 2008)
New Revision: 12051
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
Log:
serialization of exclusive gateways
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 20:57:59 UTC (rev 12050)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-11-25 20:58:28 UTC (rev 12051)
@@ -14,6 +14,7 @@
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.model.EndEvent;
+import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
import org.jboss.tools.flow.jpdl4.model.Process;
import org.jboss.tools.flow.jpdl4.model.StartEvent;
import org.jboss.tools.flow.jpdl4.model.StateTask;
@@ -28,7 +29,7 @@
Writer writer = new OutputStreamWriter(os);
writer.write(buffer.toString());
writer.close();
- System.out.println(buffer.toString());
+// System.out.println(buffer.toString());
}
private static void appendToBuffer(StringBuffer buffer, Wrapper wrapper, int level) {
@@ -101,6 +102,18 @@
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
buffer.append(">");
+ } else if (element instanceof ExclusiveGateway) {
+ ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<exclusive");
+ if (exclusiveGateway.getName() != null) {
+ buffer.append(" ");
+ String value = exclusiveGateway.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ buffer.append(">");
} else if (element instanceof Process) {
Process process = (Process)element;
buffer.append("<process");
@@ -148,6 +161,10 @@
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</state>");
+ } else if (element instanceof ExclusiveGateway) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</exclusive>");
} else if (element instanceof Process) {
buffer.append("\n");
appendPadding(buffer, level);
15 years, 11 months
JBoss Tools SVN: r12050 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 15:57:59 -0500 (Tue, 25 Nov 2008)
New Revision: 12050
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
Log:
Add exclusive gateway support
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-11-25 20:57:39 UTC (rev 12049)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-11-25 20:57:59 UTC (rev 12050)
@@ -66,6 +66,14 @@
</node>
</element>
<element
+ class="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"
+ id="org.jboss.tools.flow.jpdl4.exclusiveGateway"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.ExclusiveGatewayFigure"></figure>
+ </node>
+ </element>
+ <element
class="org.jboss.tools.flow.jpdl4.model.SequenceFlow"
figure="icons/sequence.gif"
id="org.jboss.tools.flow.jpdl4.sequenceFlow"
15 years, 11 months
JBoss Tools SVN: r12049 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 15:57:39 -0500 (Tue, 25 Nov 2008)
New Revision: 12049
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java
Log:
Exclusive Gateway figure
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ExclusiveGatewayFigure.java 2008-11-25 20:57:39 UTC (rev 12049)
@@ -0,0 +1,7 @@
+package org.jboss.tools.flow.jpdl4.figure;
+
+import org.jboss.tools.flow.common.figure.DiamondElementFigure;
+
+public class ExclusiveGatewayFigure extends DiamondElementFigure {
+
+}
15 years, 11 months
JBoss Tools SVN: r12048 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-25 15:44:40 -0500 (Tue, 25 Nov 2008)
New Revision: 12048
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondAnchor.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondElementFigure.java
Log:
Support for diamond shaped figures
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondAnchor.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondAnchor.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondAnchor.java 2008-11-25 20:44:40 UTC (rev 12048)
@@ -0,0 +1,47 @@
+package org.jboss.tools.flow.common.figure;
+
+import org.eclipse.draw2d.AbstractConnectionAnchor;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+public class DiamondAnchor extends AbstractConnectionAnchor {
+
+ public DiamondAnchor(IFigure owner) {
+ super(owner);
+ }
+
+ public Point getLocation(Point reference) {
+ Rectangle r = Rectangle.SINGLETON;
+ r.setBounds(getOwner().getBounds());
+ r.translate(-1, -1);
+ r.resize(1, 1);
+ getOwner().translateToAbsolute(r);
+
+ Point ref = r.getCenter().negate().translate(reference);
+
+ float centerX = r.x + 0.5f * r.width;
+ float centerY = r.y + 0.5f * r.height;
+ float dx, dy;
+
+ if (Math.abs(ref.x * r.height) == Math.abs(Math.abs(ref.y)* r.width )) {
+ dx = ref.x > 0 ? r.width / 4 : - r.width / 4;
+ dy = ref.y > 0 ? r.height / 4 : - r.height / 4;
+ } else if (ref.x == 0) {
+ dx = 0;
+ dy = ref.y > 0 ? r.height / 2 : - r.height / 2;
+ } else {
+
+ float numerator = ref.x * r.height * r.width / 2;
+ float firstDenominator = Math.abs(ref.y) * r.width + ref.x * r.height;
+ float secondDenominator = Math.abs(ref.y) * r.width - ref.x * r.height;
+
+ dx = (ref.x > 0) ? numerator / firstDenominator : numerator / secondDenominator;
+ dy = dx * ref.y / ref.x;
+
+ }
+
+ return new Point(Math.round(centerX + dx), Math.round(centerY + dy));
+ }
+
+}
\ No newline at end of file
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondElementFigure.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondElementFigure.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/DiamondElementFigure.java 2008-11-25 20:44:40 UTC (rev 12048)
@@ -0,0 +1,44 @@
+package org.jboss.tools.flow.common.figure;
+
+import org.eclipse.draw2d.ConnectionAnchor;
+import org.eclipse.draw2d.Polygon;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+public class DiamondElementFigure extends AbstractElementFigure {
+
+ protected Polygon diamond;
+
+ @Override
+ protected void customizeFigure() {
+ diamond = new Polygon();
+ diamond.setLineWidth(1);
+ add(diamond, 0);
+ setSize(50, 50);
+ diamond.setPoints(calculatePointList());
+ }
+
+ public void setBounds(Rectangle rectangle) {
+ super.setBounds(rectangle);
+ diamond.setPoints(calculatePointList());
+ }
+
+ private PointList calculatePointList() {
+ PointList result = new PointList();
+ Rectangle bounds = getBounds();
+ result.addPoint(bounds.x + bounds.width / 2 - diamond.getLineWidth() / 4, bounds.y + diamond.getLineWidth() / 2);
+ result.addPoint(bounds.x + bounds.width - diamond.getLineWidth(), bounds.y + bounds.height / 2 - diamond.getLineWidth() / 4);
+ result.addPoint(bounds.x + bounds.width / 2 - diamond.getLineWidth() / 4, bounds.y + bounds.height - diamond.getLineWidth());
+ result.addPoint(bounds.x + diamond.getLineWidth() / 2, bounds.y + bounds.height / 2 - diamond.getLineWidth() / 4);
+ return result;
+ }
+
+ public ConnectionAnchor getSourceConnectionAnchor() {
+ return new DiamondAnchor(this);
+ }
+
+ public ConnectionAnchor getTargetConnectionAnchor() {
+ return new DiamondAnchor(this);
+ }
+
+}
15 years, 11 months
JBoss Tools SVN: r12047 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2008-11-25 14:32:51 -0500 (Tue, 25 Nov 2008)
New Revision: 12047
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
Log:
RESOLVED - issue JBIDE-3204: rich:scrollableDataTable's bugs.
https://jira.jboss.org/jira/browse/JBIDE-3204
- minor change - code has been formatted
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-25 19:27:13 UTC (rev 12046)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-25 19:32:51 UTC (rev 12047)
@@ -97,9 +97,8 @@
String divStyle = HTML.ATTR_WIDTH + " : "
+ width + ";"
+ HTML.ATTR_HEIGHT + " : "
- + height +
-";overflow:auto;";
-VpeCreationData creationData = new VpeCreationData(div);
+ + height + ";overflow:auto;"; //$NON-NLS-1$
+ VpeCreationData creationData = new VpeCreationData(div);
div.setAttribute(HTML.ATTR_STYLE, divStyle);
@@ -202,7 +201,7 @@
nsIDOMElement tbody = visualDocument
.createElement(HTML.TAG_TBODY);
mainTable.appendChild(tbody);
-ComponentUtil.copyAttributes(sourceNode, tbody);
+ ComponentUtil.copyAttributes(sourceNode, tbody);
for (int i = 0; i < NUM_ROW; i++) {
new RichFacesDataTableChildrenEncoder(creationData, visualDocument,
@@ -332,8 +331,6 @@
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
-// String style = ComponentUtil.getHeaderBackgoundImgStyle();
-// tr.setAttribute(HTML.ATTR_STYLE, style);
nsIDOMElement td = visualDocument.createElement(element);
tr.appendChild(td);
15 years, 11 months
JBoss Tools SVN: r12046 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2008-11-25 14:27:13 -0500 (Tue, 25 Nov 2008)
New Revision: 12046
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/scrollableDataTable/scrollableDataTable.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
CODING IN PROGRESS - issue JBIDE-3204: rich:scrollableDataTable's bugs.
https://jira.jboss.org/jira/browse/JBIDE-3204
- Item #2 has been fixed: No one style or styleClass should be applyed for the footer and header of scrollableDataTable as default.
- Item #4 has been fixed: columnClasses and rowClasses don't work at all (use attachment file)
- some minor fixes of <rich:scrollableDataTable> template
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/scrollableDataTable/scrollableDataTable.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/scrollableDataTable/scrollableDataTable.css 2008-11-25 19:16:34 UTC (rev 12045)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/scrollableDataTable/scrollableDataTable.css 2008-11-25 19:27:13 UTC (rev 12046)
@@ -78,7 +78,7 @@
border-bottom: 1px solid;
border-color: #C4C0B9;
padding: 4px 4px 4px 4px;
- text-align: left;
+ text-align: center;
font-size: 11px;
color: #000000;
font-family: Arial, Verdana, sans-serif;
@@ -114,4 +114,8 @@
.dr-table-hidden {
overflow: hidden;
border: solid 1px #C4C0C9;
-}
\ No newline at end of file
+}
+
+.dr-sdt-hr {
+ background-color:#BED6F8;
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-25 19:16:34 UTC (rev 12045)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-25 19:27:13 UTC (rev 12046)
@@ -21,6 +21,7 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -73,70 +74,38 @@
Element sourceElement = (Element) sourceNode;
- String width = sourceElement
- .getAttribute(HTML.ATTR_WIDTH);
- String height = sourceElement
- .getAttribute(HTML.ATTR_HEIGHT);
+ String width = sourceElement.getAttribute(HTML.ATTR_WIDTH);
+ if (width == null) {
+ width = DEFAULT_WIDTH;
+ } else {
+ width = VpeStyleUtil.addPxIfNecessary(width);
+ }
- // -----------CommonTable
- nsIDOMElement tableCommon = visualDocument
- .createElement(HTML.TAG_TABLE);
-
- VpeCreationData creationData = new VpeCreationData(tableCommon);
-
- nsIDOMElement tr1 = visualDocument
- .createElement(HTML.TAG_TR);
-
- nsIDOMElement tr2 = visualDocument
- .createElement(HTML.TAG_TR);
-
- tableCommon.appendChild(tr1);
- tableCommon.appendChild(tr2);
-
- // ---------tr2
- nsIDOMElement tr2_TD = visualDocument
- .createElement(HTML.TAG_TD);
- tr2.appendChild(tr2_TD);
-
- nsIDOMElement tr2_td_DIV = visualDocument
- .createElement(HTML.TAG_DIV);
- tr2_td_DIV.setAttribute(HTML.ATTR_STYLE,
- STYLE_FOR_LOW_SCROLL);
- tr2_TD.appendChild(tr2_td_DIV);
-
- // --------------------------------------------
-
- // ---------------------tr1------------------------
- nsIDOMElement tr1_TD1 = visualDocument
- .createElement(HTML.TAG_TD);
- tr1.appendChild(tr1_TD1);
-
- nsIDOMElement tr1_TD2 = visualDocument
- .createElement(HTML.TAG_TD);
- tr1.appendChild(tr1_TD2);
-
- nsIDOMElement tr1_td2_DIV = visualDocument
- .createElement(HTML.TAG_DIV);
- tr1_td2_DIV.setAttribute(HTML.ATTR_STYLE,
- STYLE_FOR_RIGHT_SCROLL);
- tr1_TD2.appendChild(tr1_td2_DIV);
-
- // -------------------------------------------------------
+ String height = sourceElement.getAttribute(HTML.ATTR_HEIGHT);
+ if (height == null) {
+ height = DEFAULT_HEIGHT;
+ } else {
+ height = VpeStyleUtil.addPxIfNecessary(height);
+ }
+
+
nsIDOMElement div = visualDocument
.createElement(HTML.TAG_DIV);
- tr1_TD1.appendChild(div);
+
div.setAttribute(HTML.ATTR_CLASS, "dr-table-hidden");
String divStyle = HTML.ATTR_WIDTH + " : "
- + (width == null ? DEFAULT_WIDTH : width) + ";"
+ + width + ";"
+ HTML.ATTR_HEIGHT + " : "
- + (height == null ? DEFAULT_HEIGHT : height) + ";";
+ + height +
+";overflow:auto;";
+VpeCreationData creationData = new VpeCreationData(div);
div.setAttribute(HTML.ATTR_STYLE, divStyle);
nsIDOMElement mainTable = visualDocument
.createElement(HTML.TAG_TABLE);
- ComponentUtil.copyAttributes(sourceNode, mainTable);
+
mainTable.removeAttribute(HTML.ATTR_HEIGHT);
nsIDOMElement mainTableWrapper = visualDocument.createElement(TAG_MAIN_TABLE_WRAPPER);
@@ -177,16 +146,14 @@
if (header != null) {
encodeTableHeaderOrFooterFacet(pageContext, creationData, thead,
columnsLength, visualDocument, header,
- "dr-table-header rich-table-header",
- "dr-table-header-continue rich-table-header-continue",
- "dr-table-headercell rich-table-headercell",
+ "", "", "",//JBIDE-3204 #2:No one style or styleClass should be applyed for the footer and header of scrollableDataTable as default
headerClass, HTML.TAG_TD);
}
if (!columnsHeaders.isEmpty()) {
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
thead.appendChild(tr);
String styleClass = encodeStyleClass(null,
- "dr-table-subheader rich-table-subheader", null,
+ "dr-table-subheader dr-sdt-hr", null,
headerClass);
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS,
@@ -227,9 +194,7 @@
if (footer != null) {
encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot,
columnsLength, visualDocument, footer,
- "dr-table-footer rich-table-footer",
- "dr-table-footer-continue rich-table-footer-continue",
- "dr-table-footercell rich-table-footercell",
+ "", "", "",//JBIDE-3204 #2:No one style or styleClass should be applyed for the footer and header of scrollableDataTable as default
footerClass, HTML.TAG_TD);
}
}
@@ -237,6 +202,7 @@
nsIDOMElement tbody = visualDocument
.createElement(HTML.TAG_TBODY);
mainTable.appendChild(tbody);
+ComponentUtil.copyAttributes(sourceNode, tbody);
for (int i = 0; i < NUM_ROW; i++) {
new RichFacesDataTableChildrenEncoder(creationData, visualDocument,
@@ -366,8 +332,8 @@
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
- String style = ComponentUtil.getHeaderBackgoundImgStyle();
- tr.setAttribute(HTML.ATTR_STYLE, style);
+// String style = ComponentUtil.getHeaderBackgoundImgStyle();
+// tr.setAttribute(HTML.ATTR_STYLE, style);
nsIDOMElement td = visualDocument.createElement(element);
tr.appendChild(td);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml 2008-11-25 19:16:34 UTC (rev 12045)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml 2008-11-25 19:27:13 UTC (rev 12046)
@@ -12,7 +12,7 @@
<body>
<f:view>
<rich:scrollableDataTable id="scrollableDataTable" rowKeyVar="rkv" frozenColCount="1"
- height="400px" width="700px" id="carList" rows="40"
+ height="100" width="500" id="carList" rows="40"
columnClasses="col" value="#{dataTableScrollerBean.allCars}"
var="category" sortMode="single"
binding="#{dataTableScrollerBean.table}"
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-11-25 19:16:34 UTC (rev 12045)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-11-25 19:27:13 UTC (rev 12046)
@@ -1,162 +1,218 @@
+
<tests>
<test id="scrollableDataTable">
- <TABLE>
- <TR>
- <TD>
- <DIV CLASS="dr-table-hidden" STYLE="width: 700px; height: 400px;">
- <TABLE WIDTH="700" ID="carList" ROWKEYVAR="rkv"
- FROZENCOLCOUNT="1" ROWS="40" COLUMNCLASSES="col"
- VALUE="#{dataTableScrollerBean.allCars}" VAR="category" SORTMODE="single"
- BINDING="#{dataTableScrollerBean.table}" SORTORDER="#{dataTableScrollerBean.order}"
- SELECTION="#{dataTableScrollerBean.selection}" CLASS="dr-table rich-table">
- <COLGROUP SPAN="6">
- </COLGROUP>
- <THEAD>
- <TR CLASS="dr-table-subheader rich-table-subheader">
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> Make</SPAN>
- </TD>
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> Model</SPAN>
- </TD>
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> Price</SPAN>
- </TD>
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> Mileage</SPAN>
- </TD>
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> VIN</SPAN>
- </TD>
- <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
- SCOP="col">
- <SPAN CLASS="headerText"> Stock</SPAN>
- </TD>
- </TR>
- </THEAD>
- <TBODY>
- </TBODY>
- <TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.make}</SPAN>
- </TD>
- <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.model}</SPAN>
- </TD>
- <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.price}</SPAN>
- </TD>
- <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.mileage}</SPAN>
- </TD>
- <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.vin}</SPAN>
- </TD>
- <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.stock}</SPAN>
- </TD>
- </TR>
- <TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.make}</SPAN>
- </TD>
- <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.model}</SPAN>
- </TD>
- <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.price}</SPAN>
- </TD>
- <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.mileage}</SPAN>
- </TD>
- <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.vin}</SPAN>
- </TD>
- <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.stock}</SPAN>
- </TD>
- </TR>
- <TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.make}</SPAN>
- </TD>
- <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.model}</SPAN>
- </TD>
- <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.price}</SPAN>
- </TD>
- <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.mileage}</SPAN>
- </TD>
- <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.vin}</SPAN>
- </TD>
- <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.stock}</SPAN>
- </TD>
- </TR>
- <TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.make}</SPAN>
- </TD>
- <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.model}</SPAN>
- </TD>
- <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.price}</SPAN>
- </TD>
- <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.mileage}</SPAN>
- </TD>
- <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.vin}</SPAN>
- </TD>
- <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.stock}</SPAN>
- </TD>
- </TR>
- <TR CLASS="dr-table-firstrow rich-table-firstrow">
- <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.make}</SPAN>
- </TD>
- <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.model}</SPAN>
- </TD>
- <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.price}</SPAN>
- </TD>
- <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.mileage}</SPAN>
- </TD>
- <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.vin}</SPAN>
- </TD>
- <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
- <SPAN> #{category.stock}</SPAN>
- </TD>
- </TR>
- </TABLE>
- </DIV>
- </TD>
- <TD>
- <DIV STYLE="overflow: scroll; width: 17px; height: 100%;">
- </DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
- </TD>
- </TR>
- <TR>
- <TD>
- <DIV STYLE="overflow: scroll; width: 100%; height: 17px;">
- </DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
- </TD>
- </TR>
- </TABLE>
+
+ <DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 500px; height: 100px;">
+ <TABLE CLASS="dr-table rich-table">
+ <COLGROUP SPAN="6">
+ </COLGROUP>
+ <THEAD>
+ <TR CLASS="dr-table-subheader dr-sdt-hr">
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ Make
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ Model
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ Price
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ Mileage
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ VIN
+ </SPAN>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <SPAN CLASS="headerText">
+ Stock
+ </SPAN>
+ </TD>
+ </TR>
+ </THEAD>
+ <TBODY HEIGHT="100" ID="carList" ROWKEYVAR="rkv"
+ FROZENCOLCOUNT="1" WIDTH="500" ROWS="40" COLUMNCLASSES="col"
+ VALUE="#{dataTableScrollerBean.allCars}" VAR="category" SORTMODE="single"
+ BINDING="#{dataTableScrollerBean.table}" SORTORDER="#{dataTableScrollerBean.order}"
+ SELECTION="#{dataTableScrollerBean.selection}">
+ </TBODY>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.make}
+ </SPAN>
+ </TD>
+ <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.model}
+ </SPAN>
+ </TD>
+ <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.price}
+ </SPAN>
+ </TD>
+ <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.mileage}
+ </SPAN>
+ </TD>
+ <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.vin}
+ </SPAN>
+ </TD>
+ <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.stock}
+ </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.make}
+ </SPAN>
+ </TD>
+ <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.model}
+ </SPAN>
+ </TD>
+ <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.price}
+ </SPAN>
+ </TD>
+ <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.mileage}
+ </SPAN>
+ </TD>
+ <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.vin}
+ </SPAN>
+ </TD>
+ <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.stock}
+ </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.make}
+ </SPAN>
+ </TD>
+ <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.model}
+ </SPAN>
+ </TD>
+ <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.price}
+ </SPAN>
+ </TD>
+ <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.mileage}
+ </SPAN>
+ </TD>
+ <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.vin}
+ </SPAN>
+ </TD>
+ <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.stock}
+ </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.make}
+ </SPAN>
+ </TD>
+ <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.model}
+ </SPAN>
+ </TD>
+ <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.price}
+ </SPAN>
+ </TD>
+ <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.mileage}
+ </SPAN>
+ </TD>
+ <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.vin}
+ </SPAN>
+ </TD>
+ <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.stock}
+ </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD ID="make" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.make}
+ </SPAN>
+ </TD>
+ <TD ID="model" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.model}
+ </SPAN>
+ </TD>
+ <TD ID="price" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.price}
+ </SPAN>
+ </TD>
+ <TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.mileage}
+ </SPAN>
+ </TD>
+ <TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.vin}
+ </SPAN>
+ </TD>
+ <TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
+ <SPAN>
+ #{category.stock}
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-11-25 19:16:34 UTC (rev 12045)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-11-25 19:27:13 UTC (rev 12046)
@@ -725,4 +725,22 @@
}
}
+
+ /**
+ * If the {@code size} ends with a digit, adds {@code "px"} to it.
+ *
+ * @param size non-null value of a size attribute (e.g. {@code width}).
+ */
+ public static String addPxIfNecessary(final String size) {
+ final String trimmed = size.trim();
+ int length = trimmed.length();
+ if (length > 0) {
+ final char lastChar = trimmed.charAt(length - 1);
+ if (Character.isDigit(lastChar)) {
+ return trimmed + PX_STRING;
+ }
+ }
+
+ return size;
+ }
}
\ No newline at end of file
15 years, 11 months
JBoss Tools SVN: r12045 - 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 14:16:34 -0500 (Tue, 25 Nov 2008)
New Revision: 12045
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
Log:
remove addTo
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 19:15:37 UTC (rev 12044)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-11-25 19:16:34 UTC (rev 12045)
@@ -156,13 +156,6 @@
return result;
}
- 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) {
String graphics = element.getAttribute("g");
if (graphics != null) {
15 years, 11 months
JBoss Tools SVN: r12044 - 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 14:15:37 -0500 (Tue, 25 Nov 2008)
New Revision: 12044
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java
Log:
package rename to org.jboss.tools.flow.common.properties
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java 2008-11-25 19:14:04 UTC (rev 12043)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultContainerWrapper.java 2008-11-25 19:15:37 UTC (rev 12044)
@@ -4,11 +4,11 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.common.properties.DefaultContainerPropertySource;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Container;
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.model.Node;
+import org.jboss.tools.flow.common.properties.DefaultContainerPropertySource;
import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy;
import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java 2008-11-25 19:14:04 UTC (rev 12043)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultFlowWrapper.java 2008-11-25 19:15:37 UTC (rev 12044)
@@ -1,10 +1,10 @@
package org.jboss.tools.flow.common.wrapper;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.common.properties.DefaultFlowPropertySource;
import org.jboss.tools.flow.common.model.DefaultFlow;
import org.jboss.tools.flow.common.model.Flow;
import org.jboss.tools.flow.common.model.Node;
+import org.jboss.tools.flow.common.properties.DefaultFlowPropertySource;
import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy;
public class DefaultFlowWrapper extends AbstractFlowWrapper {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java 2008-11-25 19:14:04 UTC (rev 12043)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java 2008-11-25 19:15:37 UTC (rev 12044)
@@ -2,9 +2,9 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.common.properties.DefaultNodePropertySource;
import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Node;
+import org.jboss.tools.flow.common.properties.DefaultNodePropertySource;
import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
15 years, 11 months