You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/03/26 18:08:08 UTC
[09/50] [abbrv] airavata git commit: Refactor renamed,
isSatisfy method to isReady
Refactor renamed, isSatisfy method to isReady
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1a5daae1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1a5daae1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1a5daae1
Branch: refs/heads/master
Commit: 1a5daae1a2c87a0cf66b2df820e1460224dc998c
Parents: 0ae7e83
Author: shamrath <sh...@gmail.com>
Authored: Wed Feb 18 15:51:42 2015 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Wed Feb 18 15:51:42 2015 -0500
----------------------------------------------------------------------
.../simple/workflow/engine/SimpleWorkflowInterpreter.java | 8 ++++----
.../workflow/engine/dag/nodes/ApplicationNodeImpl.java | 2 +-
.../workflow/engine/dag/nodes/WorkflowInputNodeImpl.java | 2 +-
.../simple/workflow/engine/dag/nodes/WorkflowNode.java | 2 +-
.../workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a5daae1/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/SimpleWorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/SimpleWorkflowInterpreter.java b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/SimpleWorkflowInterpreter.java
index bc9c9a2..b4ec3cb 100644
--- a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/SimpleWorkflowInterpreter.java
+++ b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/SimpleWorkflowInterpreter.java
@@ -133,7 +133,7 @@ public class SimpleWorkflowInterpreter implements Runnable{
private void setupNodeDetailsInput(WorkflowNode readyNode, WorkflowNodeDetails wfNodeDetails) {
if (readyNode instanceof ApplicationNode) {
ApplicationNode applicationNode = (ApplicationNode) readyNode;
- if (applicationNode.isSatisfy()) {
+ if (applicationNode.isReady()) {
for (InPort inPort : applicationNode.getInputPorts()) {
wfNodeDetails.addToNodeInputs(inPort.getInputObject());
}
@@ -149,7 +149,7 @@ public class SimpleWorkflowInterpreter implements Runnable{
private void processWorkflowInputNodes(List<WorkflowInputNode> wfInputNodes) {
Set<WorkflowNode> tempNodeSet = new HashSet<WorkflowNode>();
for (WorkflowInputNode wfInputNode : wfInputNodes) {
- if (wfInputNode.isSatisfy()) {
+ if (wfInputNode.isReady()) {
// for (Edge edge : wfInputNode.getOutputLinks()) {
// WorkflowUtil.copyValues(wfInputNode.getInputObject(), edge.getToPort().getInputObject());
@@ -158,7 +158,7 @@ public class SimpleWorkflowInterpreter implements Runnable{
}
}
for (WorkflowNode workflowNode : tempNodeSet) {
- if (workflowNode.isSatisfy()) {
+ if (workflowNode.isReady()) {
readList.add(workflowNode);
} else {
waitingList.add(workflowNode);
@@ -223,7 +223,7 @@ public class SimpleWorkflowInterpreter implements Runnable{
}
for (WorkflowNode node : tempWfNodeSet) {
- if (node.isSatisfy()) {
+ if (node.isReady()) {
waitingList.remove(node);
readList.add(node);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a5daae1/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/ApplicationNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/ApplicationNodeImpl.java b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/ApplicationNodeImpl.java
index 36d4349..cfcd3fb 100644
--- a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/ApplicationNodeImpl.java
+++ b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/ApplicationNodeImpl.java
@@ -71,7 +71,7 @@ public class ApplicationNodeImpl implements ApplicationNode {
}
@Override
- public boolean isSatisfy() {
+ public boolean isReady() {
for (InPort inPort : getInputPorts()) {
if (!inPort.isSatisfy()) {
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a5daae1/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowInputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowInputNodeImpl.java b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowInputNodeImpl.java
index 38092dd..2f912b3 100644
--- a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowInputNodeImpl.java
+++ b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowInputNodeImpl.java
@@ -66,7 +66,7 @@ public class WorkflowInputNodeImpl implements WorkflowInputNode {
}
@Override
- public boolean isSatisfy() {
+ public boolean isReady() {
return inputDataObjectType.getValue() != null && !inputDataObjectType.getValue().equals("");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a5daae1/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowNode.java
----------------------------------------------------------------------
diff --git a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowNode.java b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowNode.java
index 043f6cb..f8b0e0c 100644
--- a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowNode.java
+++ b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowNode.java
@@ -33,6 +33,6 @@ public interface WorkflowNode {
public void setNodeState(NodeState newNodeState);
- public boolean isSatisfy();
+ public boolean isReady();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/1a5daae1/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java
index 32db82c..aa7f0a3 100644
--- a/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java
+++ b/modules/simple-workflow/src/main/java/org/apache/ariavata/simple/workflow/engine/dag/nodes/WorkflowOutputNodeImpl.java
@@ -68,7 +68,7 @@ public class WorkflowOutputNodeImpl implements WorkflowOutputNode {
}
@Override
- public boolean isSatisfy() {
+ public boolean isReady() {
return this.outputDataObjectType.getValue() != null && !this.outputDataObjectType.getValue().equals("");
}