Changes to return type of Executable.getType() method to make it compile with Oracle...

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

diff --git a/engine/compbio/engine/client/ConfExecutable.java b/engine/compbio/engine/client/ConfExecutable.java
index 6cb5c4a..9477ecf 100644 (file)
--- a/engine/compbio/engine/client/ConfExecutable.java
+++ b/engine/compbio/engine/client/ConfExecutable.java
@@ -97,14 +97,15 @@ public class ConfExecutable<T> implements ConfiguredExecutable<T> {
        @Override\r
        public String getCommand(ExecProvider provider)\r
                        throws UnsupportedRuntimeException {\r
-               String command = compbio.engine.client.Util.getCommand(provider, exec\r
-                               .getClass());\r
+               String command = compbio.engine.client.Util.getCommand(provider,\r
+                               exec.getClass());\r
                if (Util.isEmpty(command)) {\r
                        throw new UnsupportedRuntimeException(\r
                                        "Executable "\r
                                                        + this.exec.getClass().getSimpleName()\r
                                                        + " is not supported by the current runtime environment! Current runtime environment is "\r
-                                                       + (SysPrefs.isWindows ? "Windows "\r
+                                                       + (SysPrefs.isWindows\r
+                                                                       ? "Windows "\r
                                                                        : "Linux/Unix/Mac"));\r
                }\r
                return command;\r
@@ -251,8 +252,8 @@ public class ConfExecutable<T> implements ConfiguredExecutable<T> {
         * @return\r
         * @throws IOException\r
         */\r
-       public static <V> LimitsManager<V> getRunnerLimits(\r
-                       Class<? extends Executable<V>> clazz) throws IOException {\r
+       public static <V> LimitsManager<V> getRunnerLimits(Class<V> clazz)\r
+                       throws IOException {\r
                String parametersFile = clazz.getSimpleName().toLowerCase()\r
                                + ".limits.file";\r
                LimitsManager<V> limits = (LimitsManager<V>) getRunnerConfiguration(\r
@@ -260,9 +261,9 @@ public class ConfExecutable<T> implements ConfiguredExecutable<T> {
                return limits;\r
        }\r
 \r
-       static <V> Object getRunnerConfiguration(\r
-                       Class<? extends Executable<V>> clazz, Class<?> configurationHolder,\r
-                       String propertyName) throws IOException {\r
+       static <V> Object getRunnerConfiguration(Class<V> clazz,\r
+                       Class<?> configurationHolder, String propertyName)\r
+                       throws IOException {\r
 \r
                Object rconf = null;\r
                FileInputStream confFileStream = null;\r
@@ -298,8 +299,8 @@ public class ConfExecutable<T> implements ConfiguredExecutable<T> {
                        return Collections.emptyMap();\r
                }\r
 \r
-               return EnvVariableProcessor.getEnvVariables(envProperty, this\r
-                               .getClass());\r
+               return EnvVariableProcessor.getEnvVariables(envProperty,\r
+                               this.getClass());\r
        }\r
 \r
        @Override\r