Changeset 3380 for trunk/src

Timestamp:

May 25, 2007, 9:31:37 AM (15 years ago)

Author:

Johan Enell

Message:

jobParameter specification added as an configuration parameter

Location:

trunk/src

Files:

• core/net/sf/basedb/core/dtd/base1-plugin-configuration-file.dtd (added)
• plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (28 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -71 +71 @@
 import net.sf.basedb.util.Enumeration;
 import net.sf.basedb.util.RemovableUtil;
+import net.sf.basedb.util.XMLUtil;
 import net.sf.basedb.util.parser.FlatFileParser;
+
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.filter.Filter;
 
 import java.io.BufferedInputStream;
@@ -82 +88 @@
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -90 +97 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -124 +132 @@
   private static final Set<Permissions> permissions = new HashSet<Permissions>();
   
+  private static final URL dtdFile = Base1PluginExecuter.class.getResource("/net/sf/basedb/core/dtd/base1-plugin-configuration-file.dtd");
+  
   /* Configuration parameters */
 
@@ -172 +182 @@
   
   /**
-   * The maximu number of channels, 0 means unlimited.
+   * The maximum number of channels, 0 means unlimited.
    */
   private PluginParameter<Integer> maxChannelsParameter;
@@ -198 +208 @@
   private PluginParameter<String> usedFieldsParameter;
   
+  /**
+   * This parameter describes the job parameters that the base1 plugin needs. 
+   */
+  private PluginParameter<String> jobParametersParameter = new PluginParameter<String>(
+    "jobParameters",
+    "Job parameters",
+    "An XML text that describes the job parameters.",
+    new StringParameterType(null, null, true));
+  
   /* Job parameters */
   /**
@@ -233 +252 @@
    */
   private java.io.File execDirectory;
+
+  private int pluginDirectoryId = -1;
 
   /* From InteractivePlugin iterface */
@@ -320 +341 @@
         throw new BaseException("Unable to configure job from configuration file. "+e.getMessage());
       }
+      catch (JDOMException e)
+      {
+        throw new BaseException("There is something wrong with the jobparameter xml. "+e.getMessage());
+      }
     }
     else
@@ -338 +363 @@
       {
         storeValue(configuration, request, execPathParameter);
-        storeValue(configuration, request, fileParameter);
         
         dc = sc.newDbControl();
@@ -353 +377 @@
           
           getManualConfigureParameters();
-          Map<String, String> headers = getBaseFileHeaders(f);
+          Map<String, String> headers = getParametersFromBaseFile(f);
           configuration.setValue(serialFormatParameter.getName(), serialFormatParameter.getParameterType(), getBoolean(headers.get(serialFormatParameter.getName())));
           configuration.setValue(versionNumberParameter.getName(), versionNumberParameter.getParameterType(), headers.get(versionNumberParameter.getName()));
@@ -364 +388 @@
           configuration.setValue(usedColumnsParameter.getName(), usedColumnsParameter.getParameterType(), headers.get(usedColumnsParameter.getName()));
           configuration.setValue(usedFieldsParameter.getName(), usedFieldsParameter.getParameterType(), headers.get(usedFieldsParameter.getName()));
+          configuration.setValue(jobParametersParameter.getName(), jobParametersParameter.getParameterType(), headers.get(jobParametersParameter.getName()));
           
           response.setDone("Configured plug-in with file.");
@@ -384 +409 @@
         storeValue(configuration, request, usedColumnsParameter);
         storeValue(configuration, request, usedFieldsParameter);
-        
-        //TODO: Ask about parameters and create a config file
+        storeValue(configuration, request, jobParametersParameter);
+        // test the xml in the jobParameters paramere
+        getJobParameters();
         response.setDone("Plugin configuration done.");
       }
@@ -439 +465 @@
   
   
-  /**
-   * Creates the plugin directory specified by {@link Base1PluginExecuter#pluginDirectoryParameter}.
-   */
-  private void createPluginDirectory()
+  private int createPluginDirectory()
   {
     DbControl dc = null;
+    int id = -1;
     try
     {
       dc = sc.newDbControl();
-      Directory parent = Directory.getByPath(dc, getPluginDirectoryPath().getParent());
-      if (Directory.exists(dc, parent, getPluginDirectoryPath().getDirectory(getPluginDirectoryPath().getDirectoryCount() - 1)))
-      {
-        int directoryId = Directory.getIdFromPath(dc, getPluginDirectoryPath());
-        RemovableUtil.removeRecursively(dc, Item.DIRECTORY, Collections.singleton(directoryId), true);
+      String pathName = (String) job.getValue(pluginDirectoryParameter.getName()) + "/" + job.getId();
+      Path.makeSafeFilename(pathName, "");
+      Path path = new Path(pathName, Path.Type.DIRECTORY);
+      try
+      {
+        id = Directory.getIdFromPath(dc, path);
+        // delete existing
+        RemovableUtil.removeRecursively(dc, Item.DIRECTORY, Collections.singleton(id), true);
         dc.commit();
         dc = sc.newDbControl();
       }
-      Directory d = Directory.getNew(dc, getPluginDirectoryPath());
-      dc.saveItem(d);
+      catch(ItemNotFoundException e)
+      {}
+      
+      Directory jobDirectory = Directory.getNew(dc, path);
+      dc.saveItem(jobDirectory);
       dc.commit();
+      id = jobDirectory.getId();
     }
     finally
     {
-      if (dc != null) dc.close(); 
-    }
-  }
-  
+      if (dc != null)
+        dc.close();
+    }
+    return id; 
+  }
+    
 
   @Override
@@ -517 +550 @@
         getConfigureJobParameters();
         progress.display(0, "Exporting data to be used by plugin.");
-        createPluginDirectory();
         File stdin = exportData(dc);
         copy(stdin, getExecDirectory());
         progress.display(10, "Running on remote computation server.");
+
+        System.err.println(getExecLine());
         
-        String execPath = (String) configuration.getValue(execPathParameter.getName());
-        String execName = (String) configuration.getValue(execNameParameter.getName());
-        Process p = Runtime.getRuntime().exec(execPath + java.io.File.separator + execName, null, getExecDirectory());
+        Process p = Runtime.getRuntime().exec(getExecLine(), null, getExecDirectory());
 
         ByteArrayOutputStream err = new ByteArrayOutputStream();
@@ -587 +619 @@
     try
     {
-      Directory d = Directory.getByPath(dc, getPluginDirectoryPath());
+      Directory d = getPluginDirectory(dc);
       File file = File.getFile(dc, d, "stdin.txt", true);
       file.setMimeTypeAuto("text/plain", null);
@@ -628 +660 @@
     {
       throw new BaseException(e);
-    } 
+    }
   }
   
@@ -639 +671 @@
    * @return A list of {@link AnnotationType AnnotationTypes}
    */
-  private List<AnnotationType> getAnnotationTypes(DbControl dc, Experiment e)
-  {
-    ItemQuery<AnnotationType> query = e.getExperimentalFactors();
-    query.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
-    query.order(Orders.asc(Hql.property("name")));
-    return query.list(dc);
-  }
-  
-  
-  /**
-   * Get the headers from a configuration file.
+  private List<AnnotationType> getAnnotationTypes()
+  {
+    DbControl dc = null;
+    List<AnnotationType> list = null;
+    try
+    {
+      dc = sc.newDbControl();
+      Experiment e = super.getCurrentExperiment(dc);
+      ItemQuery<AnnotationType> query = e.getExperimentalFactors();
+      query.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
+      query.order(Orders.asc(Hql.property("name")));
+      list = query.list(dc);
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    return list;
+  }
+  
+  
+  /**
+   * Get the data from the configuration file.
    * 
    * @param f The file.
@@ -655 +699 @@
    * @throws IOException If there i any problem reading from file.
    */
-  private Map<String, String> getBaseFileHeaders(File f)
+  private Map<String, String> getParametersFromBaseFile(File f)
     throws IOException
   {
@@ -673 +717 @@
       headers.put(header, ffp.getHeader(header));
     }
+    
+    String parameters = "<jobparameters>\n";
+    while (ffp.hasMoreData())
+    {
+      FlatFileParser.Data dataline = ffp.nextData();
+      try
+      {
+        JobParameter jp = new JobParameter(dataline.line().split("\t"));
+        parameters += jp + "\n";
+      }
+      catch(BaseException e)
+      {
+        throw new BaseException("Error on line "+dataline.lineNo()+" in the configurationfile.", e);
+      }
+    }
+    parameters += "</jobparameters>";
+    headers.put(jobParametersParameter.getName(), parameters);
     return headers;
   }
@@ -774 +835 @@
       parameters.add(maxChannelsParameter);
       
+      parameters.add(jobParametersParameter);
+      
       configureManual = new RequestInformation(
         Base1PluginExecuter.COMMAND_MANUAL_CONFIG,
@@ -794 +857 @@
    */
   private RequestInformation getConfigureJobParameters()
-    throws IOException
+    throws IOException, JDOMException
   {
     if (configureJob == null)
@@ -853 +916 @@
     return execDirectory;
   }
+  
+  
+  private String getExecLine()
+  {
+    String execPath = (String) configuration.getValue(execPathParameter.getName());
+    String execName = (String) configuration.getValue(execNameParameter.getName());
+    String s = java.io.File.separator;
+    if (execPath.endsWith(s) || execName.startsWith(s))
+    {
+      s = "";
+    }
+    String line = execPath + s + execName;
+    return line;
+  }
 
   
@@ -880 +957 @@
    * @throws IOException Thrown if there is any problem reading the configuration file.
    */
+  @SuppressWarnings("unchecked")
   private List<PluginParameter<?>> getJobParameters()
-    throws IOException
+    throws BaseException
   {
     if (jobParameters != null)
@@ -887 +965 @@
       return jobParameters;
     }
-    jobParameters = new ArrayList<PluginParameter<?>>();  
-    DbControl dc = null;
+    jobParameters = new ArrayList<PluginParameter<?>>();
     
     try
     {
+      String doctype = "<!DOCTYPE jobparameters SYSTEM \"base1-plugin-configuration-file.dtd\">";
+      Document doc = XMLUtil.getValidatedXml(doctype+configuration.getValue(jobParametersParameter.getName()).toString(), dtdFile);
+      Iterator<Element> it = doc.getDescendants(new Filter()
+      {
+        public boolean matches(Object o)
+        {
+          if (o instanceof Element)
+          {
+            Element e = (Element) o;
+            return e.getName().equals("parameter");
+          }
+          return false;
+        }
+      });
+      while (it.hasNext())
+      {
+        Element e = it.next();
+        JobParameter jp = new JobParameter(e);
+        jobParameters.add(jp.getPluginParameter());
+      }
+    }
+    catch (JDOMException e)
+    {
+      throw new BaseException(e.getCause());
+    }
+    catch (IOException e)
+    {
+      throw new BaseException(e.getCause());
+    }
+    
+    DbControl dc = null;
+    try
+    {
       dc = sc.newDbControl();
-      AnyToAny ata = AnyToAny.getByName(dc, configuration.getPluginConfiguration(), "Configurationfile");
-      if (ata == null)
-      {
-        throw new BaseException("The plugin needs a configuration file to find the job parameters");
-      }
-      File f = File.getById(dc, ata.getTo().getId());
-      Experiment experiment = getCurrentBioAssaySet(dc).getExperiment();
-      FlatFileParser ffp = getInitializedFlatFileParser(f.getDownloadStream(0));
-      ffp.setMinDataColumns(8);
-      FlatFileParser.Line section = ffp.nextSection();
-      while (section != null && !section.name().equals("plugin"))
-      {
-        section = ffp.nextSection();
-      }
-      ffp.parseHeaders();
-      List<String> columns = Arrays.asList(ffp.getHeader("columns").split("\\t"));
-      int valueTypeCol = columns.indexOf("valueType");
-      int nameCol = columns.indexOf("name");
-      int commonNameCol = columns.indexOf("commonName");
-      int optionsCol = columns.indexOf("options");
-      int defaultValueCol = columns.indexOf("defaultValue");
-      int enumOptionsCol = columns.indexOf("enumOptions");
-      int removedCol = columns.indexOf("removed");
-      while (ffp.hasMoreData())
-      {
-        FlatFileParser.Data dataline = ffp.nextData();
-        if (!Boolean.valueOf(dataline.get(removedCol)))
-        {
-          String name = dataline.get(nameCol);
-          String commonName = dataline.get(commonNameCol);
-          String options = dataline.get(optionsCol);
-          String defaultValue = dataline.get(defaultValueCol);
-          String enumOptions = dataline.get(enumOptionsCol);
-
-          PluginParameter<?> parameter = null;
-          switch (dataline.get(valueTypeCol).charAt(0))
-          {
-            // String parameter
-            case 't':
-            {
-              StringParameterType type = new StringParameterType(255, defaultValue, false, 1, new Integer(options), 1);
-              parameter = new PluginParameter<String>(name, commonName, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-              // Integer parameter
-            case 'i':
-            {
-              Integer defValue = defaultValue == null ? null : new Integer(defaultValue);
-              IntegerParameterType type = new IntegerParameterType(null, null, defValue, false, 1, new Integer(options), 1, null);
-              parameter = new PluginParameter<Integer>(name, commonName, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-              // HiddenString parameter
-            case 'h':
-            {
-              StringParameterType type = new StringParameterType(255, defaultValue, false, 1, 0, 1);
-              parameter = new PluginParameter<String>(name, null, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-              // Float parameter
-            case 'f':
-            {
-              Float defValue = defaultValue == null ? null : new Float(defaultValue);
-              FloatParameterType type = new FloatParameterType(null, null, defValue, false, 1, new Integer(options), 1, null);
-              parameter = new PluginParameter<Float>(name, commonName, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-              // TextField parameter
-            case 'a':
-            {
-              String[] wh = options.split(",");
-              StringParameterType type = new StringParameterType(
-                null,
-                defaultValue,
-                false,
-                1,
-                new Integer(wh[0]),
-                wh.length > 1 ? new Integer(wh[1]) : 1);
-              parameter = new PluginParameter<String>(name, commonName, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-              // Annotation parameter
-            case 'n':
-            {
-              List<AnnotationType> annotations = getAnnotationTypes(dc, experiment);
-              if (!annotations.isEmpty())
-              {
-                Enumeration<String, String> enums = new Enumeration<String, String>();
-                for (AnnotationType at : annotations)
-                {
-                  enums.add(at.getName(), at.getName());
-                }
-                StringParameterType type = new StringParameterType(255, defaultValue, true, 1, new Integer(options), 1, enums);
-                parameter = new PluginParameter<String>(name, commonName, "", type);
-                jobParameters.add(parameter);
-              }
-              break;
-            }
-              // Enum Parameter
-            case 'e':
-            {
-              Enumeration<String, String> enums = new Enumeration<String, String>();
-              String[] enumOptionsSplit = enumOptions.split("\\\\t");
-              for (int i = 0; i < enumOptionsSplit.length; i += 2)
-              {
-                enums.add(enumOptionsSplit[i], enumOptionsSplit[i + 1]);
-              }
-              StringParameterType type = new StringParameterType(255, defaultValue, true, 1, new Integer(options), 1, enums);
-              parameter = new PluginParameter<String>(name, commonName, "", type);
-              jobParameters.add(parameter);
-              break;
-            }
-          }
-        }
-      }
+      Experiment experiment = super.getCurrentExperiment(dc);
       String homeDirectoryPath = "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
       Directory homeDirectory = experiment.getDirectory();
@@ -1036 +1027 @@
     finally
     {
-      dc.close();
-    }   
+      if (dc != null) dc.close();
+    }
 
     return jobParameters;
   }
   
-
-  /**
-   * Creates the {@link Path} to the plugin directory. 
+  /**
+   * Get a {@link Directory directory} 
    * 
-   * @return The path
-   */
-  private Path getPluginDirectoryPath()
-  {
-    Path p = new Path((String) job.getValue(pluginDirectoryParameter.getName()) + "/" + job.getId(), Path.Type.DIRECTORY);
-    return p;
+   * @return
+   */
+  private Directory getPluginDirectory(DbControl dc)
+  {
+    if (pluginDirectoryId == -1)
+    {
+      pluginDirectoryId = createPluginDirectory();
+    }
+    return Directory.getById(dc, pluginDirectoryId);
   }
   
@@ -1167 +1160 @@
         int repCol = columns.indexOf("reporter");
         int dataCol = columns.indexOf("assayData");
+        //TODO: should use the channels field to decide number of intensities
         int int1Col = assayFields.indexOf("intensity1");
         int int2Col = assayFields.indexOf("intensity2");
@@ -1328 +1322 @@
     {
       dc = sc.newDbControl();
-      Directory homeDirectory = Directory.getByPath(dc, getPluginDirectoryPath());
+      Directory homeDirectory = getPluginDirectory(dc);
       importTempFiles(dc, getExecDirectory().listFiles(), homeDirectory);
       dc.commit();
@@ -1483 +1477 @@
     }
   }
+  
+  private class JobParameter
+  {
+    private int position;
+    
+    private Base1JobParameterType type;
+    
+    private String name;
+    
+    private String commonName;
+    
+    private String options;
+    
+    private String defaultValue;
+    
+    private Enumeration<String, String> enumOptions = new Enumeration<String, String>();
+    
+    private boolean removed = false;
+
+    JobParameter(String... base1ConfigLine)
+    {
+      if (base1ConfigLine.length != 8)
+      {
+        throw new BaseException("Must have 8 parameters.");
+      }
+      if (base1ConfigLine[0].equals(""))
+      {
+        throw new BaseException("Position cannot be null");
+      }
+      position = Integer.parseInt(base1ConfigLine[0]);
+      if (base1ConfigLine[1].length() != 1)
+      {
+        throw new BaseException("Type must one character");
+      }
+      type = Base1JobParameterType.get(base1ConfigLine[1].charAt(0));
+      name = base1ConfigLine[2];
+      commonName = base1ConfigLine[3];
+      options = base1ConfigLine[4];
+      defaultValue = base1ConfigLine[5];
+      
+      if (type == Base1JobParameterType.ENUMERATION)
+      {
+        String[] enums = base1ConfigLine[6].split("\\\\t");
+        if (enums.length % 2 != 0) throw new BaseException("name/value pairs in enum isnt even: "+base1ConfigLine[6]);
+        for (int i = 0; i < enums.length; i += 2)
+        {
+          enumOptions.add(enums[i], enums[i+1]);
+        }
+      }
+      removed = !base1ConfigLine[7].equals("0");
+    }
+
+    @SuppressWarnings("unchecked")
+    JobParameter(Element e)
+    {
+      try
+      {
+        position = e.getAttribute("position").getIntValue();
+        type = Base1JobParameterType.get(e.getAttribute("type").getValue().charAt(0));
+        Iterator<Element> it = e.getDescendants(new Filter()
+        {
+          public boolean matches(Object o)
+          {
+            if (o instanceof Element)
+            {
+              return true;
+            }
+            return false;
+          }
+        });
+        while (it.hasNext())
+        {
+          Element child = it.next();
+          if (child.getName().equals("name"))
+          {
+            name = child.getValue();
+          }
+          else if (child.getName().equals("commonname"))
+          {
+            commonName = child.getValue();
+          }
+          else if (child.getName().equals("options"))
+          {
+            options = child.getValue();
+          }
+          else if (child.getName().equals("defaultvalue"))
+          {
+            defaultValue = child.getValue();
+          }
+          else if (child.getName().equals("removed"))
+          {
+            removed = true;
+          }
+          else if (child.getName().equals("enumoptions"))
+          {
+            Iterator<Element> it2 = child.getDescendants(new Filter()
+            {
+              public boolean matches(Object o)
+              {
+                if (o instanceof Element)
+                {
+                  return true;
+                }
+                return false;
+              }
+            });
+            while (it2.hasNext())
+            {
+              Element value = it2.next();
+              enumOptions.add(value.getAttributeValue("key"), value.getValue());
+            }
+          }
+        }
+      }
+      catch (JDOMException ex)
+      {
+        throw new BaseException(ex);
+      }
+    }
+
+    public PluginParameter<?> getPluginParameter()
+    {
+      PluginParameter<?> parameter;
+      switch (type)
+      {
+        case STRING:
+        {
+          StringParameterType t = new StringParameterType(255, defaultValue, false, 1, new Integer(options), 1);
+          parameter = new PluginParameter<String>(name, commonName, "", t);
+          break;
+        }
+        case INTEGER:
+        {
+          Integer defValue = defaultValue == null ? null : new Integer(defaultValue);
+          IntegerParameterType t = new IntegerParameterType(
+            null,
+            null,
+            defValue,
+            false,
+            1,
+            new Integer(options),
+            1,
+            null);
+          parameter = new PluginParameter<Integer>(name, commonName, "", t);
+          break;
+        }
+        case HIDDEN_STRING:
+        {
+          StringParameterType t = new StringParameterType(255, defaultValue, false, 1, 0, 1);
+          parameter = new PluginParameter<String>(name, null, "", t);
+          break;
+        }
+        case FLOAT:
+        {
+          Float defValue = defaultValue == null ? null : new Float(defaultValue);
+          FloatParameterType t = new FloatParameterType(null, null, defValue, false, 1, new Integer(options), 1, null);
+          parameter = new PluginParameter<Float>(name, commonName, "", t);
+          break;
+        }
+        case TEXT:
+        {
+          String[] wh = options.split(",");
+          StringParameterType t = new StringParameterType(null, defaultValue, false, 1, new Integer(wh[0]), wh.length > 1 ? new Integer(wh[1]) : 1);
+          parameter = new PluginParameter<String>(name, commonName, "", t);
+          break;
+        }
+        case ANNOTATION:
+        {
+          List<AnnotationType> annotations = getAnnotationTypes();
+          Enumeration<String, String> enums = new Enumeration<String, String>();
+          for (AnnotationType at : annotations)
+          {
+            enums.add(at.getName(), at.getName());
+          }
+          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, new Integer(options), 1, enums);
+          parameter = new PluginParameter<String>(name, commonName, "", t);
+          jobParameters.add(parameter);
+          break;
+        }
+        case ENUMERATION:
+        {
+          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, new Integer(options), 1, enumOptions);
+          parameter = new PluginParameter<String>(name, commonName, "", t);
+          break;
+        }
+        default:
+          parameter = null;
+      }
+      return parameter;
+    }
+
+    @Override
+    public String toString()
+    {
+      String s = "<parameter position=\""+position+"\" type=\""+type+"\">\n";
+      s += "\t<name>"+name+"</name>\n";
+      s += "\t<commonname>"+commonName+"</commonname>\n";
+      s += "\t<options>"+options+"</options>\n";
+      s += "\t<defaultvalue>"+defaultValue+"</defaultvalue>\n";
+      if (enumOptions.size() > 0)
+      {
+        s += "\t<enumoptions>\n";
+        for (int i = 0; i < enumOptions.size(); ++i)
+        {
+          s += "\t\t<value key=\""+enumOptions.getKey(i)+"\">";
+          s += enumOptions.getValue(i);
+          s += "</value>\n";
+        }
+        s += "\t</enumoptions>\n";
+      }
+      if (removed) s += "<removed/>";
+      s += "</parameter>";
+      return s;
+    }
+  }
+
+  private enum Base1JobParameterType
+  {
+    HIDDEN_STRING('h'), STRING('t'), INTEGER('i'), FLOAT('f'), TEXT('a'), ANNOTATION('n'), ENUMERATION('e');
+    
+    private final char c;
+    
+    private Base1JobParameterType(char c)
+    {
+      this.c = c;
+    }
+    
+    public static Base1JobParameterType get(char c)
+    {
+      switch (c)
+      {
+        case 'h' : return HIDDEN_STRING;
+        case 't' : return STRING;
+        case 'i' : return INTEGER;
+        case 'f' : return FLOAT;
+        case 'a' : return TEXT;
+        case 'n' : return ANNOTATION;
+        case 'e' : return ENUMERATION;
+        default:
+          throw new BaseException("Unknown type: "+c);
+      }
+    }
+
+    @Override
+    public String toString()
+    {
+      return String.valueOf(c);
+    }
+  }
 }