Changeset 512 for tapas

Timestamp:

05/15/12 19:09:03 (12 years ago)

Author:

vmipsl

Message:

InstrumentalFunction?

File:

• tapas/web/src/com/ether/Controller.java (modified) (3 diffs)

tapas/web/src/com/ether/Controller.java

@@ -16 +16 @@
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Properties;
@@ -81 +80 @@
 
         /***********/
-    /*    final User user = new User();
-        user.setId( 12 );
-        user.setLastName( "tamere" );
-        user.setEmail( "rbopipsl@ipsl.jussieu.fr" );
-        user.setCreationDate( new Date() );
-        user.setPassword( "pif" );*/
+        /*    final User user = new User();
+      user.setId( 12 );
+      user.setLastName( "tamere" );
+      user.setEmail( "rbopipsl@ipsl.jussieu.fr" );
+      user.setCreationDate( new Date() );
+      user.setPassword( "pif" );*/
         /******/
 
@@ -202 +201 @@
 
         final List<JSONObject> jsonInstrumentalFunctions = new ArrayList<JSONObject>( instrumentalFunctions.length );
-
-        for( final InstrumentalFunction instrumentalFunction : instrumentalFunctions )
-        {
-            final JSONObject jsonInstrumentalFunction = new JSONObject();
-            jsonInstrumentalFunction.put( "text", instrumentalFunction.name() );
-            jsonInstrumentalFunction.put( "value", instrumentalFunction.ordinal() );
-            jsonInstrumentalFunctions.add( jsonInstrumentalFunction );
-        }
+        final JSONObject jsonInstrumentalFunctionNone = new JSONObject();
+        jsonInstrumentalFunctionNone.put( "text", InstrumentalFunction.NONE );
+        jsonInstrumentalFunctionNone.put( "value", -1 );
+        jsonInstrumentalFunctions.add( jsonInstrumentalFunctionNone );
+
+        final JSONObject jsonInstrumentalFunctionGaussian = new JSONObject();
+        jsonInstrumentalFunctionGaussian.put( "text", InstrumentalFunction.GAUSSIAN );
+        jsonInstrumentalFunctionGaussian.put( "value", 1 );
+        jsonInstrumentalFunctions.add( jsonInstrumentalFunctionGaussian );
+
         return jsonInstrumentalFunctions;
     }