You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/07/02 18:51:27 UTC
[20/23] incubator-taverna-language git commit: Organized code
Organized code
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/ab341d7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ab341d7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ab341d7f
Branch: refs/heads/master
Commit: ab341d7fd98041b85d0985454e8b7e272c30b27e
Parents: 29300ed
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 09:23:28 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 09:23:28 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 4 --
.../org/apache/taverna/tavlang/tools/Tools.java | 1 -
.../tavlang/tools/convert/Scufl2Convert.java | 1 -
.../tavlang/tools/convert/ToRobundle.java | 1 -
.../tavlang/tools/inspect/ProcessorNames.java | 39 ++++++++++----------
.../taverna/tavlang/tools/stats/GetWfStat.java | 4 +-
.../tavlang/tools/validate/Validate.java | 1 -
7 files changed, 21 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index 97673bf..11c4032 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -26,10 +26,7 @@ import io.airlift.airline.Command;
import io.airlift.airline.Help;
import io.airlift.airline.Option;
-import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.List;
import javax.inject.Inject;
@@ -43,7 +40,6 @@ import org.apache.taverna.tavlang.tools.inspect.ServiceTypes;
import org.apache.taverna.tavlang.tools.stats.GetWfStat;
import org.apache.taverna.tavlang.tools.validate.Validate;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
/*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
index fb878fb..c708b3c 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
@@ -20,7 +20,6 @@ package org.apache.taverna.tavlang.tools;
*/
-import javax.print.attribute.standard.Media;
public class Tools {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
index cefdd67..8243d43 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
@@ -30,7 +30,6 @@ import org.apache.taverna.scufl2.api.io.ReaderException;
import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
import org.apache.taverna.scufl2.api.io.WriterException;
import org.apache.taverna.tavlang.tools.Tools.ConvertionTools;
-import org.apache.taverna.tavlang.tools.validate.Validate;
/*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
index 0b7a6a0..394f9ec 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
@@ -20,7 +20,6 @@ package org.apache.taverna.tavlang.tools.convert;
*/
-import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
index 8cbf989..c9d763a 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/inspect/ProcessorNames.java
@@ -1,5 +1,24 @@
package org.apache.taverna.tavlang.tools.inspect;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -23,26 +42,6 @@ import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
import org.apache.taverna.scufl2.api.profiles.Profile;
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/*
* list the processor names used in the workflow.
* Supported formats: .t2flow, .wfbundle
* */
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 885d3c8..9dcfa5a 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -77,8 +77,8 @@ public class GetWfStat {
this.set = wf.getWorkflows();
//String to be written to a file.
- this.str_nverb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
- this.str_verb.append(">>> Statistics of the workflow bundle: " + wf.getName() + " <<<\n");
+ this.str_nverb.append(">>> Statistics of the workflow bundle: " + file.getName() + " <<<\n");
+ this.str_verb.append(">>> Statistics of the workflow bundle: " + file.getName() + " <<<\n");
for(Workflow wrf : set){
//TODO :- Take each type of resource and make a system to view them to the user.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ab341d7f/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
index aa8ef5e..29220b7 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
@@ -23,7 +23,6 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.util.HashMap;
import java.util.List;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;