Changeset 384 for trunk/uk/ac/ebi/AnnotationTypeCvImporter

Timestamp:

Aug 9, 2007, 4:47:05 PM (16 years ago)

Author:

dominic

Message:

new annotation type and cv importer class files and build file

Location:

trunk/uk/ac/ebi/AnnotationTypeCvImporter

Files:

• AnnotationTypeCvImporter.jar (modified) (previous)
• build.xml (added)
• src/uk/ac/ebi/nugo/plugins/AnnotationTypeCvImporter.java (modified) (4 diffs)
• src/uk/ac/ebi/nugo/plugins/util/AnnotTypeCvHelper.java (added)
• src/uk/ac/ebi/nugo/plugins/util/Helper.java (deleted)
• src/uk/ac/ebi/nugo/plugins/util/ValueFormatter.java (modified) (3 diffs)
• src/uk/ac/ebi/nugo/plugins/util/ZipUnpacker.java (deleted)

trunk/uk/ac/ebi/AnnotationTypeCvImporter/src/uk/ac/ebi/nugo/plugins/AnnotationTypeCvImporter.java

@@ -35 +35 @@
 import net.sf.basedb.util.parser.Mapper;
 import net.sf.basedb.util.Values;
+import uk.ac.ebi.nugo.plugins.util.ValueFormatter;
 
 
@@ -511 +512 @@
           if (category != null) 
           {
-            List<String> annotationTypeCategory= Values.getList(columnMappings.get("categoryColumnMapping").getValue(data),";");
+            List<String> annotationTypeCategory= 
+              ValueFormatter.getList(columnMappings.get("categoryColumnMapping").getValue(data),";");
             
             for (int i=0, z=annotationTypeCategory.size(); i<z;i++)
@@ -540 +542 @@
           if (enumeration)
             annotationType.setValues
-              (Values.getList(columnMappings.get("cvValueColumnMapping").getValue(data),";"));
+              (ValueFormatter.getList(columnMappings.get("cvValueColumnMapping").getValue(data),";"));
           
           itemType= columnMappings.get("itemTypeColumnMapping").getValue(data);
@@ -546 +548 @@
           {
             Item[] items=Item.values();
-            List<String> itemTypes=Values.getList(columnMappings.get("itemTypeColumnMapping").getValue(data),separator);  
+            List<String> itemTypes=ValueFormatter.getList(columnMappings.get("itemTypeColumnMapping").getValue(data),separator);  
             for (String itemType: itemTypes)
             {

trunk/uk/ac/ebi/AnnotationTypeCvImporter/src/uk/ac/ebi/nugo/plugins/util/ValueFormatter.java

@@ -8 +8 @@
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
+
+import net.sf.basedb.core.BaseException;
 /**
   A utility class containing static methods for formatting parameter values.
@@ -24 +24 @@
 public class ValueFormatter 
   {
-  
+
   private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
   
@@ -74 +74 @@
   }
 
+  /**
+   * Convert a string value with a delimeter into a list 
+   * @param values, the values to convert
+   * @param delimeter, the delimeter in the string
+   * @return the list of string values
+   */
+  public static final List<String> getList(String values, String delimeter)
+  {
+    List<String> value = null;
+    String[] result;
+    if (values != null ) 
+    {
+      try
+      {
+        result =values.split(delimeter);
+        value= Arrays.asList(result);
+      }
+      catch(PatternSyntaxException pse)
+      {
+        new BaseException(pse.getMessage());
+      }
+    }
+    return  value;
+  }