X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FJabaValueConstrain.java;h=f57abde9260cdb07c3da1a16e4a2aa62f9f64661;hb=8d0d8f010041eb2089bfe0bf7e5ad481ceae56d5;hp=d9a29680358372e845ba4127e1a420dc5d5cf9b6;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/JabaValueConstrain.java b/src/jalview/ws/jws2/dm/JabaValueConstrain.java
index d9a2968..f57abde 100644
--- a/src/jalview/ws/jws2/dm/JabaValueConstrain.java
+++ b/src/jalview/ws/jws2/dm/JabaValueConstrain.java
@@ -1,41 +1,53 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws.jws2.dm;
 
 import compbio.metadata.ValueConstrain;
-import compbio.metadata.ValueConstrain.Type;
 
 import jalview.ws.params.ValueConstrainI;
 
 public class JabaValueConstrain implements ValueConstrainI
 {
 
-  ValueConstrain vc=null;
+  ValueConstrain vc = null;
+
   public JabaValueConstrain(ValueConstrain vc)
   {
     this.vc = vc;
   }
 
   @Override
-  public Type getType()
+  public ValueType getType()
   {
-    // TODO: refactor to local Jalview parameter type system.
-    return vc.getType();
+    if (vc.getType() == ValueConstrain.Type.Float)
+    {
+      return ValueType.Float;
+    }
+    if (vc.getType() == ValueConstrain.Type.Integer)
+    {
+      return ValueType.Integer;
+    }
+    throw new Error(
+            "IMPLEMENTATION ERROR: jalview.ws.params.ValueConstrainI.ValueType does not support the JABAWS type :"
+                    + vc.toString());
   }
 
   @Override