feature[TW2228]: Fix WFE Outline view and Demo Code WorkDef
Change-Id: I213860d4caaa9611cf520c9359fc4c91d0d81ecc
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java
index 029503c..66f1083 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java
@@ -49,7 +49,7 @@
WorkDefBuilder bld = new WorkDefBuilder(workDefToken, AtsDemoOseeTypes.DemoCodeTeamWorkflow);
bld.andState(1, "Endorse", StateType.Working).isStartState() //
- .andToStates(StateToken.Cancelled, StateToken.Analyze) //
+ .andToStates(StateToken.Analyze, StateToken.Cancelled) //
.andRules(RuleDefinitionOption.AllowAssigneeToAll) //
.andColor(StateColor.BLACK) //
.andLayout( //
diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfeOutlinePage.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfeOutlinePage.java
index e6b74a9..2ff1777 100644
--- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfeOutlinePage.java
+++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfeOutlinePage.java
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import org.eclipse.jface.action.Action;
@@ -322,7 +321,9 @@
} else if (element instanceof WrappedStateItems) {
return !((WrappedStateItems) element).workflowHooks.isEmpty();
} else if (element instanceof WrappedStates) {
- return !((WrappedStates) element).states.isEmpty();
+ if (((WrappedStates) element).states != null) {
+ return !((WrappedStates) element).states.isEmpty();
+ }
} else if (element instanceof RuleAndLocation) {
return false;
} else if (element instanceof WrappedRules) {
@@ -555,7 +556,11 @@
@Override
public String toString() {
- return name + (states.isEmpty() ? " (Empty)" : "");
+ if (states != null) {
+ return name + (states.isEmpty() ? " (Empty)" : "");
+ } else {
+ return name;
+ }
}
public Collection<IAtsStateDefinition> getStates() {
@@ -670,11 +675,10 @@
public Collection<Object> getTransitions() {
List<Object> items = new ArrayList<>();
- if (!stateDef.getToStates().isEmpty()) {
- items.add(new WrappedStates("DefaultToState", Collections.emptyList()));
+ if (stateDef.getToStates().isEmpty()) {
+ items.add(new WrappedStates("DefaultToState: None", null));
} else {
- items.add(
- new WrappedStates("DefaultToState", Collections.singleton(stateDef.getToStates().iterator().next())));
+ items.add(new WrappedStates("DefaultToState: " + stateDef.getToStates().iterator().next(), null));
}
items.add(new WrappedStates("ToStates", stateDef.getToStates()));
return items;
