necessary changes for my Eclipse

[jabaws.git] / engine / compbio / engine / client / SkeletalExecutable.java

diff --git a/engine/compbio/engine/client/SkeletalExecutable.java b/engine/compbio/engine/client/SkeletalExecutable.java
index 19fde7e..369f8e7 100644 (file)
--- a/engine/compbio/engine/client/SkeletalExecutable.java
+++ b/engine/compbio/engine/client/SkeletalExecutable.java
@@ -42,9 +42,13 @@ public abstract class SkeletalExecutable<T> implements Executable<T> {
        // Cache for Limits information\r
        private LimitsManager<T> limits;\r
 \r
-       protected String inputFile = "input.txt";\r
-       protected String outputFile = "output.txt";\r
-       protected String errorFile = "error.txt";\r
+       public static final String INPUT = "input.txt";\r
+       public static final String OUTPUT = "result.txt";\r
+       public static final String ERROR = "error.txt";\r
+\r
+       protected String inputFile = INPUT;\r
+       protected String outputFile = OUTPUT;\r
+       protected String errorFile = ERROR;\r
 \r
        private boolean isInputSet = false;\r
        private boolean isOutputSet = false;\r
@@ -257,7 +261,8 @@ public abstract class SkeletalExecutable<T> implements Executable<T> {
                return code;\r
        }\r
 \r
-       public String getClusterSettings() {\r
+       @Override\r
+       public String getClusterJobSettings() {\r
                String settings = ph.getProperty(getType().getSimpleName()\r
                                .toLowerCase() + ".cluster.settings");\r
                return settings == null ? "" : settings;\r
@@ -323,7 +328,7 @@ public abstract class SkeletalExecutable<T> implements Executable<T> {
        public LimitsManager<T> getLimits() {\r
                synchronized (SkeletalExecutable.class) {\r
                        if (limits == null) {\r
-                               limits = compbio.runner.Util.getLimits(this.getType());\r
+                               limits = compbio.engine.client.Util.getLimits(this.getType());\r
                        }\r
                }\r
                return limits;\r
@@ -333,6 +338,6 @@ public abstract class SkeletalExecutable<T> implements Executable<T> {
         * \r
         * @return subclasses must return their type\r
         */\r
-       public abstract Class<Executable<T>> getType();\r
+       public abstract Class<T> getType();\r
 \r
 }\r