[jboss-svn-commits] JBL Code SVN: r28367 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 23 18:53:12 EDT 2009
Author: KrisVerlaenen
Date: 2009-07-23 18:53:12 -0400 (Thu, 23 Jul 2009)
New Revision: 28367
Modified:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ActionEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/CompositeNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EventNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/FaultNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ForEachNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/JoinEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/MilestoneEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleSetNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SplitEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StateNodeEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SubFlowEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/TimerEditPart.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
Log:
JBRULES-2156: Improved BPMN2 skin
- fixed issue where height / width was overridden
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ActionEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ActionEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ActionEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -47,8 +47,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createActionNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/CompositeNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/CompositeNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/CompositeNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -19,8 +19,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createCompositeNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EndNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -41,8 +41,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createEndNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EventNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EventNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/EventNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -41,8 +41,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createEventNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/FaultNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/FaultNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/FaultNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -46,8 +46,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createFaultNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ForEachNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ForEachNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/ForEachNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -37,8 +37,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createForEachNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/JoinEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/JoinEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/JoinEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -49,8 +49,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createJoinFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/MilestoneEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/MilestoneEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/MilestoneEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -46,8 +46,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createMilestoneFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleSetNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleSetNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleSetNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -44,8 +44,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createRuleSetNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SplitEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SplitEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SplitEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -47,8 +47,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createSplitFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StartNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -41,8 +41,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createStartNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StateNodeEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StateNodeEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/StateNodeEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -46,8 +46,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createStateFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SubFlowEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SubFlowEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/SubFlowEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -46,8 +46,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createSubFlowFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/TimerEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/TimerEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/TimerEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -44,8 +44,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
IFigure result = skinProvider.createTimerNodeFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = result.getSize().width;
- constraint.height = result.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = result.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = result.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
return result;
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2009-07-23 22:12:21 UTC (rev 28366)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2009-07-23 22:53:12 UTC (rev 28367)
@@ -66,8 +66,12 @@
SkinProvider skinProvider = SkinManager.getInstance().getSkinProvider(SKIN);
WorkItemFigureInterface figure = skinProvider.createWorkItemFigure();
Rectangle constraint = getElementWrapper().getConstraint();
- constraint.width = figure.getSize().width;
- constraint.height = figure.getSize().height;
+ if (constraint.width == -1) {
+ constraint.width = figure.getSize().width;
+ }
+ if (constraint.height == -1) {
+ constraint.height = figure.getSize().height;
+ }
getElementWrapper().setConstraint(constraint);
String icon = null;
WorkDefinition workDefinition = getWorkDefinition();
More information about the jboss-svn-commits
mailing list