Changeset 5248

Timestamp:

01/08/11 13:40:09 (14 years ago)

Author:

mholper

Message:

modified Interface #1218

File:

• branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/wsclient/OKBServiceClient.java (modified) (2 diffs)

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/wsclient/OKBServiceClient.java

@@ -3 +3 @@
 import static at.hl.okb.wsclient.Utilities.createNameFilter;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
+import at.hl.okb.ECJDataTypeEnum;
 import at.hl.wsclient.okb.Algorithm;
 import at.hl.wsclient.okb.AlgorithmClass;
+import at.hl.wsclient.okb.AlgorithmData;
+import at.hl.wsclient.okb.AlgorithmParameter;
+import at.hl.wsclient.okb.ArrayOfAlgorithmParameter;
 import at.hl.wsclient.okb.IOKBService;
 import at.hl.wsclient.okb.NamedOKBItem;
@@ -18 +24 @@
 
 public class OKBServiceClient {
-    OKBService srv = null;
-    IOKBService port = null;
-    ObjectFactory factory = new ObjectFactory();
+  OKBService srv = null;
+  IOKBService port = null;
+  ObjectFactory factory = new ObjectFactory();
 
-    public OKBServiceClient() {
-  this.srv = new OKBService();
-  this.port = srv.getWSHttpBindingIOKBService1();
-    }
+  public OKBServiceClient() {
+    this.srv = new OKBService();
+    this.port = srv.getWSHttpBindingIOKBService1();
+  }
 
-    public Long getPlatformId(String platformName) {
-  Platform returnValue = Iterables.find(
-    port.getPlatforms().getPlatform(),
-    createNameFilter(platformName), null);
+  public Long getPlatformId(String platformName) {
+    Platform returnValue = Iterables.find(
+        port.getPlatforms().getPlatform(),
+        createNameFilter(platformName), null);
 
-  return returnValue.getId();
-    }
+    return returnValue.getId();
+  }
+  
+  public Long getProblemId(String problemName) {
+    Problem returnValue = Iterables.find(
+        port.getProblems().getProblem(),
+        createNameFilter(problemName), null);
 
-    public Long getProblemClassId(String problemClass) {
-  ProblemClass returnValue = Iterables.find(port.getProblemClasses()
-    .getProblemClass(), createNameFilter(problemClass), null);
+    return returnValue.getId();
+  } 
 
-  return returnValue.getId();
+  public Long getProblemClassId(String problemClass) {
+    ProblemClass returnValue = Iterables.find(port.getProblemClasses()
+        .getProblemClass(), createNameFilter(problemClass), null);
 
-    }
+    return returnValue.getId();
 
-    public Long getAlgorithmClassId(String algorithmClassName) {
-  AlgorithmClass returnValue = Iterables.find(port.getAlgorithmClasses()
-    .getAlgorithmClass(), createNameFilter(algorithmClassName),
-    null);
+  }
 
-  return returnValue.getId();
+  public Long getAlgorithmClassId(String algorithmClassName) {
+    AlgorithmClass returnValue = Iterables.find(port.getAlgorithmClasses()
+        .getAlgorithmClass(), createNameFilter(algorithmClassName),
+        null);
 
-    }
+    return returnValue.getId();
 
-    public Long getProblem(String problemName, Long problemClassId,
-      Long platformId) {
-  Problem problem = null;
-  Iterator<Problem> it = port.getProblems().getProblem().iterator();
+  }
+
+  public Long getProblem(String problemName, Long problemClassId,
+      Long platformId) {
+    Problem problem = null;
+    Iterator<Problem> it = port.getProblems().getProblem().iterator();
+
+    while (it.hasNext() && problem == null) {
+      Problem tmpProblem = it.next();
+      if (platformId.equals(tmpProblem.getPlatformId())
+          && problemName.equals(tmpProblem.getName().getValue())
+          && problemClassId.equals(tmpProblem.getProblemClassId())) {
+
+        problem = tmpProblem;
+      }
+    }
+    return problem.getId();
+  }
+
+  public Long getAlgorithmId(String algorithmName, /*Long algorithmClassId,*/
+      Long platformId) {
+    Algorithm algorithm = null;
+    
+    Iterator<Algorithm> it = port.getAlgorithms().getAlgorithm().iterator();
+
+    while (it.hasNext() && algorithm == null) {
+      Algorithm tmpAlgo = it.next();
+      if (platformId.equals(tmpAlgo.getPlatformId())
+          && algorithmName.equals(tmpAlgo.getName().getValue())
+          //&& algorithmClassId.equals(tmpAlgo.getAlgorithmClassId())
+          ) {
+        algorithm = tmpAlgo;
+      }
+    }
+    
+    return algorithm != null ?algorithm.getId() : null;
+      
+  }
   
-  while (it.hasNext() && problem == null) {
-      Problem tmpProblem = it.next();
-      if (platformId.equals(tmpProblem.getPlatformId())
-        && problemName.equals(tmpProblem.getName().getValue())
-        && problemClassId.equals(tmpProblem.getProblemClassId())) {
-    
-    
-    
-    problem = tmpProblem;
-      }
+//  public Map<String, ECJDataTypeEnum> getAlgorithParameter(Long  algorithmId) {
+//    Map<String, AlgorithmParameter> returnMap = new HashMap<String, AlgorithmParameter>();
+//    
+//    AlgorithmData algoData = port.getAlgorithmData(algorithmId);
+//  
+//    ArrayOfAlgorithmParameter algoParamList = port.getAlgorithmParameters(algorithmId);
+//    
+//    for (AlgorithmParameter algoParam:algoParamList.getAlgorithmParameter()) {
+//      mapOKBDataTypetoECJDataTypeEnum()
+//      port.getDataType(algoParam.getDataTypeId()).getName().getValue()) {
+//      
+//      }
+//      returnMap.put(algoParam.getName().getValue(), port.getDataType(algoParam.getDataTypeId()).getName().getValue());
+//    }
+//    
+//    return returnMap;
+//  }
+
+  private <T extends NamedOKBItem> T createNamedOKBItem(Class<T> clazz,
+      String name) {
+    try {
+      T instance = clazz.newInstance();
+      instance.setName(factory.createNamedOKBItemName(name));
+      return instance;
+    } catch (IllegalAccessException ex) {
+      throw new IllegalArgumentException(ex);
+    } catch (InstantiationException ex) {
+      throw new IllegalArgumentException(ex);
+    }
   }
-  return problem.getId();
-    }
-
-    
-    public Long getAlgorithm(String algorithmName, Long algorithmClassId,
-      Long platformId) {
-  Algorithm algorithm = null;
-  Iterator<Algorithm> it = port.getAlgorithms().getAlgorithm().iterator();
-  
-  while (it.hasNext() && algorithm == null) {
-      Algorithm tmpAlgo = it.next();
-      if (platformId.equals(tmpAlgo.getPlatformId())
-        && algorithmName.equals(tmpAlgo.getName().getValue())
-        && algorithmClassId.equals(tmpAlgo.getAlgorithmClassId())) {
-    algorithm = tmpAlgo;
-      }
-  }
-  return algorithm.getId();
-    }
-
-    
-    private <T extends NamedOKBItem> T createNamedOKBItem(Class<T> clazz,
-      String name) {
-  try {
-      T instance = clazz.newInstance();
-      instance.setName(factory.createNamedOKBItemName(name));
-      return instance;
-  } catch (IllegalAccessException ex) {
-      throw new IllegalArgumentException(ex);
-  } catch (InstantiationException ex) {
-      throw new IllegalArgumentException(ex);
-  }
-    }
 
 }