1 files changed, 90 insertions, 36 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
index d0f1b44f293..9cdf112c395 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
@@ -45,7 +45,9 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
 public class TaskArtifact extends StateMachineArtifact implements IWorldViewArtifact, IATSStateMachineArtifact {
 
    public static enum TaskStates {
-      InWork, Completed, Cancelled
+      InWork,
+      Completed,
+      Cancelled
    };
 
    public TaskArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {
@@ -68,7 +70,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    public Set<User> getPrivilegedUsers() throws OseeCoreException {
       Set<User> users = new HashSet<User>();
       StateMachineArtifact parentSma = getParentSMA();
-      if (parentSma.isTeamWorkflow()) users.addAll(((TeamWorkFlowArtifact) parentSma).getPrivilegedUsers());
+      if (parentSma.isTeamWorkflow()) {
+         users.addAll(((TeamWorkFlowArtifact) parentSma).getPrivilegedUsers());
+      }
       users.addAll(parentSma.getStateMgr().getAssignees());
       return users;
    }
@@ -81,9 +85,11 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
       try {
          StateMachineArtifact parentSMA = getParentSMA();
          boolean unCancellable =
-               (parentSMA.getStateMgr().getCurrentStateName().equals(getSoleAttributeValue(
-                     ATSAttributes.RELATED_TO_STATE_ATTRIBUTE.getStoreName(), "")));
-         if (!unCancellable) return false;
+            parentSMA.getStateMgr().getCurrentStateName().equals(
+               getSoleAttributeValue(ATSAttributes.RELATED_TO_STATE_ATTRIBUTE.getStoreName(), ""));
+         if (!unCancellable) {
+            return false;
+         }
          return super.isUnCancellable();
       } catch (Exception ex) {
          // Do Nothing
@@ -97,31 +103,39 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    }
 
    public boolean isUsingTaskResolutionOptions() throws OseeCoreException {
-      return (getTaskResolutionOptionDefintions().size() > 0);
+      return getTaskResolutionOptionDefintions().size() > 0;
    }
 
    public List<TaskResOptionDefinition> getTaskResolutionOptionDefintions() throws OseeCoreException {
       TeamWorkFlowArtifact team = getParentTeamWorkflow();
-      if (team == null) return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      if (team == null) {
+         return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      }
       return TaskResolutionOptionRule.getTaskResolutionOptions(team.getWorkPageDefinition());
    }
 
    public TaskResOptionDefinition getTaskResolutionOptionDefinition(String optionName) throws OseeCoreException {
       for (TaskResOptionDefinition def : getTaskResolutionOptionDefintions()) {
-         if (def.getName().equals(optionName)) return def;
+         if (def.getName().equals(optionName)) {
+            return def;
+         }
       }
       return null;
    }
 
    public List<TaskResOptionDefinition> getTaskResolutionOptionDefintions(String stateName) throws OseeCoreException {
       TeamWorkFlowArtifact team = getParentTeamWorkflow();
-      if (team == null) return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      if (team == null) {
+         return TaskResolutionOptionRule.EMPTY_TASK_RESOLUTION_OPTIONS;
+      }
       return TaskResolutionOptionRule.getTaskResolutionOptions(team.getWorkPageDefinitionByName(stateName));
    }
 
    public TaskResOptionDefinition getTaskResolutionOptionDefinition(String stateName, String optionName) throws OseeCoreException {
       for (TaskResOptionDefinition def : getTaskResolutionOptionDefintions(stateName)) {
-         if (def.getName().equals(optionName)) return def;
+         if (def.getName().equals(optionName)) {
+            return def;
+         }
       }
       return null;
    }
@@ -153,37 +167,49 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    @Override
    public String getWorldViewWorkPackage() throws OseeCoreException {
       String value = super.getWorldViewWorkPackage();
-      if (value != null && !value.equals("")) return value;
+      if (value != null && !value.equals("")) {
+         return value;
+      }
       return getParentSMA().getWorldViewWorkPackage();
    }
 
    @Override
    public Date getWorldViewEstimatedCompletionDate() throws OseeCoreException {
       Date value = super.getWorldViewEstimatedCompletionDate();
-      if (value != null) return value;
+      if (value != null) {
+         return value;
+      }
       return getParentSMA().getWorldViewEstimatedCompletionDate();
    }
 
    @Override
    public Date getWorldViewEstimatedReleaseDate() throws OseeCoreException {
       Date value = super.getWorldViewEstimatedReleaseDate();
-      if (value != null) return value;
+      if (value != null) {
+         return value;
+      }
       return getParentSMA().getWorldViewEstimatedReleaseDate();
    }
 
    public Boolean isInWork() throws OseeCoreException {
-      return (getStateMgr().getCurrentStateName().equals(TaskStates.InWork.name()));
+      return getStateMgr().getCurrentStateName().equals(TaskStates.InWork.name());
    }
 
    public void transitionToCancelled(String reason, SkynetTransaction transaction, TransitionOption transitionOption) throws OseeCoreException {
-      if (getStateMgr().getCurrentStateName().equals(DefaultTeamState.Cancelled.name())) return;
+      if (getStateMgr().getCurrentStateName().equals(DefaultTeamState.Cancelled.name())) {
+         return;
+      }
       setSoleAttributeValue(ATSAttributes.CANCEL_REASON_ATTRIBUTE.getStoreName(), reason);
       Result result = transition(DefaultTeamState.Cancelled.name(), (User) null, transaction, transitionOption);
-      if (result.isFalse()) result.popup();
+      if (result.isFalse()) {
+         result.popup();
+      }
    }
 
    public void transitionToCompleted(double additionalHours, SkynetTransaction transaction, TransitionOption... transitionOption) throws OseeCoreException {
-      if (getStateMgr().getCurrentStateName().equals(DefaultTeamState.Completed.name())) return;
+      if (getStateMgr().getCurrentStateName().equals(DefaultTeamState.Completed.name())) {
+         return;
+      }
       // Assign current user if unassigned
       try {
          if (getStateMgr().isUnAssigned()) {
@@ -194,11 +220,15 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
          OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
       }
       Result result = transition(DefaultTeamState.Completed.name(), (User) null, transaction, transitionOption);
-      if (result.isFalse()) result.popup();
+      if (result.isFalse()) {
+         result.popup();
+      }
    }
 
    public void transitionToInWork(User toUser, int percentComplete, double additionalHours, SkynetTransaction transaction, TransitionOption... transitionOption) throws OseeCoreException {
-      if (getStateMgr().getCurrentStateName().equals(TaskStates.InWork.name())) return;
+      if (getStateMgr().getCurrentStateName().equals(TaskStates.InWork.name())) {
+         return;
+      }
       Result result = transition(TaskStates.InWork.name(), toUser, transaction, transitionOption);
       if (getStateMgr().getPercentComplete() != percentComplete || additionalHours > 0) {
          getStateMgr().updateMetrics(additionalHours, percentComplete, true);
@@ -206,7 +236,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
       if (Collections.getAggregate(transitionOption).contains(TransitionOption.Persist)) {
          saveSMA(transaction);
       }
-      if (result.isFalse()) result.popup();
+      if (result.isFalse()) {
+         result.popup();
+      }
    }
 
    /**
@@ -222,7 +254,7 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
          transitionToCompleted(additionalHours, transaction, TransitionOption.None);
       } else if (percentComplete != 100 && isCompleted()) {
          transitionToInWork(UserManager.getUser(), percentComplete, additionalHours, transaction,
-               TransitionOption.Persist);
+            TransitionOption.Persist);
       }
       // Case where already completed and statusing, just add additional hours to InWork state
       else if (percentComplete == 100 && isCompleted()) {
@@ -235,9 +267,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    }
 
    public void parentWorkFlowTransitioned(WorkPageDefinition fromWorkPageDefinition, WorkPageDefinition toWorkPageDefinition, Collection<User> toAssignees, boolean persist, SkynetTransaction transaction, TransitionOption... transitionOption) throws OseeCoreException {
-      if (toWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name()) && isInWork())
+      if (toWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name()) && isInWork()) {
          transitionToCancelled("Parent Cancelled", transaction, transitionOption);
-      else if (fromWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name()) && isCancelled()) {
+      } else if (fromWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name()) && isCancelled()) {
          transitionToInWork(UserManager.getUser(), 99, 0, transaction, transitionOption);
       }
    }
@@ -254,7 +286,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
 
    @Override
    public Date getWorldViewReleaseDate() throws OseeCoreException {
-      if (getParentSMA().isTeamWorkflow()) return ((TeamWorkFlowArtifact) getParentSMA()).getWorldViewReleaseDate();
+      if (getParentSMA().isTeamWorkflow()) {
+         return ((TeamWorkFlowArtifact) getParentSMA()).getWorldViewReleaseDate();
+      }
       return getSoleAttributeValue(ATSAttributes.RELEASE_DATE_ATTRIBUTE.getStoreName());
    }
 
@@ -270,37 +304,53 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
 
    @Override
    public double getWorldViewRemainHours() throws OseeCoreException {
-      if (isCompleted() || isCancelled()) return 0;
+      if (isCompleted() || isCancelled()) {
+         return 0;
+      }
       double est = getWorldViewEstimatedHours();
-      if (getWorldViewStatePercentComplete() == 0) return getWorldViewEstimatedHours();
+      if (getWorldViewStatePercentComplete() == 0) {
+         return getWorldViewEstimatedHours();
+      }
       double percent = getStateMgr().getPercentComplete(TaskStates.InWork.name());
-      if (percent == 0) return getWorldViewEstimatedHours();
-      double remain = getWorldViewEstimatedHours() - (est * (percent / 100.0));
+      if (percent == 0) {
+         return getWorldViewEstimatedHours();
+      }
+      double remain = getWorldViewEstimatedHours() - est * percent / 100.0;
       return remain;
    }
 
    @Override
    public StateMachineArtifact getParentSMA() throws OseeCoreException {
-      if (parentSma != null) return parentSma;
+      if (parentSma != null) {
+         return parentSma;
+      }
       Collection<StateMachineArtifact> smas =
-            getRelatedArtifacts(AtsRelationTypes.SmaToTask_Sma, StateMachineArtifact.class);
-      if (smas.isEmpty()) throw new OseeStateException("Task has no parent - " + getHumanReadableId());
+         getRelatedArtifacts(AtsRelationTypes.SmaToTask_Sma, StateMachineArtifact.class);
+      if (smas.isEmpty()) {
+         throw new OseeStateException("Task has no parent - " + getHumanReadableId());
+      }
       parentSma = smas.iterator().next();
       return parentSma;
    }
 
    @Override
    public ActionArtifact getParentActionArtifact() throws OseeCoreException {
-      if (parentAction != null) return parentAction;
+      if (parentAction != null) {
+         return parentAction;
+      }
       parentAction = getParentTeamWorkflow().getParentActionArtifact();
       return parentAction;
    }
 
    @Override
    public TeamWorkFlowArtifact getParentTeamWorkflow() throws OseeCoreException {
-      if (parentTeamArt != null) return parentTeamArt;
+      if (parentTeamArt != null) {
+         return parentTeamArt;
+      }
       StateMachineArtifact sma = getParentSMA();
-      if (sma.isTeamWorkflow()) parentTeamArt = ((TeamWorkFlowArtifact) sma);
+      if (sma.isTeamWorkflow()) {
+         parentTeamArt = (TeamWorkFlowArtifact) sma;
+      }
       return parentTeamArt;
    }
 
@@ -332,7 +382,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    @Override
    public String getWorldViewLegacyPCR() throws OseeCoreException {
       StateMachineArtifact sma = getParentSMA();
-      if (sma != null) return sma.getWorldViewLegacyPCR();
+      if (sma != null) {
+         return sma.getWorldViewLegacyPCR();
+      }
       return "";
    }
 
@@ -344,7 +396,9 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
    @Override
    public String getWorldViewSWEnhancement() throws OseeCoreException {
       StateMachineArtifact sma = getParentSMA();
-      if (sma != null) return sma.getWorldViewSWEnhancement();
+      if (sma != null) {
+         return sma.getWorldViewSWEnhancement();
+      }
       return "";
    }