X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FJabaValueConstrain.java;h=df7df6f0161c1bac11f83c5a8840ad2fb36bb6cc;hb=cca685d0c7772f023636f4887b8faf92c98fde3e;hp=f3e393015fa7e0559763684f99b03e0820576eb8;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/JabaValueConstrain.java b/src/jalview/ws/jws2/dm/JabaValueConstrain.java
index f3e3930..df7df6f 100644
--- a/src/jalview/ws/jws2/dm/JabaValueConstrain.java
+++ b/src/jalview/ws/jws2/dm/JabaValueConstrain.java
@@ -1,27 +1,30 @@
 /*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.util.MessageManager;
 import jalview.ws.params.ValueConstrainI;
 
+import compbio.metadata.ValueConstrain;
+
 public class JabaValueConstrain implements ValueConstrainI
 {
 
@@ -33,10 +36,20 @@ public class JabaValueConstrain implements ValueConstrainI
   }
 
   @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(MessageManager.formatMessage(
+            "error.implementation_error_valuetype_doesnt_support_jabaws_type",
+            new String[]
+            { vc.toString() }));
   }
 
   @Override