[gee-svn] SF.net SVN: gabel: [187] trunk/gee/war/WEB-INF/classes

[<al...@us...>]

Revision: 187
Author:   alllee
Date:     2006-05-31 16:57:30 -0700 (Wed, 31 May 2006)
ViewCVS:  http://svn.sourceforge.net/gabel/?rev=187&view=rev

Log Message:
-----------
experiment configurations now editable from the web, now to add experiment
parameters into the mix.

Modified Paths:
--------------
    trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperimentConfiguration.java
    trunk/gee/war/WEB-INF/classes/gee-admin.xml
Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperimentConfiguration.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperimentConfiguration.java	2006-05-31 22:53:54 UTC (rev 186)
+++ trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperimentConfiguration.java	2006-05-31 23:57:30 UTC (rev 187)
@@ -1,5 +1,7 @@
 package edu.indiana.psych.gee.action;
 
+import com.opensymphony.xwork.Preparable;
+
 import edu.indiana.psych.gee.ExperimentConfiguration;
 import edu.indiana.psych.gee.ExperimentRoundParameters;
 
@@ -13,16 +15,19 @@
  */
 
 @SuppressWarnings("serial")
-public class ManageExperimentConfiguration extends GeeAction {
+public class ManageExperimentConfiguration extends GeeAction implements Preparable {
     
     
     private ExperimentConfiguration<? extends ExperimentRoundParameters> configuration;
-    private String configurationId;
+    private Long configurationId;
     private String configurationClass;
 
+    public void prepare() {
+        configuration = findConfiguration(getConfigurationId());
+    }
+
     public String save() {
         if (configuration == null) {
-            configuration = findConfiguration(getConfigurationId());
             getLogger().warn("Trying to save a null configuration, ignoring..");
             return INPUT;
         }
@@ -52,12 +57,22 @@
     public ExperimentConfiguration<? extends ExperimentRoundParameters> getConfiguration() {
         return configuration;
     }
+
+    /*
+    public void setConfiguration(ExperimentConfiguration<? extends ExperimentRoundParameters> configuration) {
+        this.configuration = configuration;
+    }
+    */
     
     public Long getConfigurationId() {
-        return Long.valueOf(configurationId);
+        return configurationId;
     }
+    
+   public void setConfigurationClass(String configurationClass) {
+        this.configurationClass = configurationClass;
+    }
 
-    public void setConfigurationId(String configurationId) {
+    public void setConfigurationId(Long configurationId) {
         this.configurationId = configurationId;
     }
     
@@ -70,16 +85,12 @@
         try {
             return Class.forName(configurationClass);
         } 
-        catch (ClassNotFoundException e) {
+        catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-            getLogger().error("Could not find class:" + configurationClass);
+            getLogger().error("Unable to load class:" + configurationClass);
             return null;
         }
     }
 
-    public void setConfigurationClass(String configurationClass) {
-        this.configurationClass = configurationClass;
-    }
-    
-}
+ }

Modified: trunk/gee/war/WEB-INF/classes/gee-admin.xml
===================================================================
--- trunk/gee/war/WEB-INF/classes/gee-admin.xml	2006-05-31 22:53:54 UTC (rev 186)
+++ trunk/gee/war/WEB-INF/classes/gee-admin.xml	2006-05-31 23:57:30 UTC (rev 187)
@@ -17,7 +17,8 @@
       <result name="input" type="freemarker">configureExperiment.jsp</result>
     </action>
     <action name="configuration" class="edu.indiana.psych.gee.action.ManageExperimentConfiguration">
-      <result name="success" type="freemarker">listExperimentConfigurations.jsp</result>
+      <interceptor-ref name="paramsPrepareParamsStack"/>
+      <result name="success" type="freemarker">configureExperiment.jsp</result>
       <result name="input" type="freemarker">configureExperiment.jsp</result>
     </action>
   </package>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.