Changeset 3786

Timestamp:

Aug 23, 2010, 1:56:54 PM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #689. Initial revision of DBID and ActiveHitID classes

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/hit/ViewActiveHit.java (modified) (2 diffs)
• action/hit/ViewHit.java (modified) (1 diff)
• gui/form/FormFactory.java (modified) (2 diffs)
• params (added)
• params/ActiveHitID.java (added)
• params/DBID.java (added)

trunk/client/servlet/src/org/proteios/action/hit/ViewActiveHit.java

@@ -30 +30 @@
 import org.proteios.ActionLink;
 import org.proteios.Localizer;
+import org.proteios.params.*;
 import org.proteios.action.ProteiosAction;
 import org.proteios.action.gel.ViewGelOrNewGel;
@@ -61 +62 @@
    * Session id for active hit
    */
-  public static final VInteger VHITID = new VInteger("active.hit.id", 1, true);
+  public static final VInteger VHITID = new ActiveHitID();
 
 

trunk/client/servlet/src/org/proteios/action/hit/ViewHit.java

@@ -29 +29 @@
 
 import org.proteios.action.ProteiosAction;
-import org.proteios.gui.form.FormFactory;
+import org.proteios.params.DBID;
+import org.proteios.params.ActiveHitID;
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
 
 /**
- * Sets the ViewActiveHit.VFILEID attribute and forwards request to
- * {@link ViewActiveHit}.
  * 
- * @author olle
+ * @author gregory
  */
 public class ViewHit
     extends ProteiosAction<ViewHit>
 {
+ private static final VInteger vid = new DBID();
+ private static final VInteger vhitid = new ActiveHitId();
+
   @Override
   public void runMe()
       throws ActionException, InvalidParameterValue
   {
-    verifyParameters(FormFactory.VID);
-    Integer hitId = getValidInteger(FormFactory.VID);
-    log.debug(this.getClass().getSimpleName() + "::runMe(): hitId = " + hitId);
-    log.debug(this.getClass().getSimpleName() + "::runMe(): ViewActiveHit.VHITID.getName() = \"" + ViewActiveHit.VHITID.getName() + "\"");
-    setSessionAttribute(ViewActiveHit.VHITID.getName(), hitId);
+    Integer hitId;
+
+  verifyParameters(id);
+    hitId = getValidInteger(id);
+    setSessionAttribute(vhitid.getName(), hitId);
     setForwardTo(ViewActiveHit.class);
   }

trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

@@ -31 +31 @@
 import org.proteios.Localizer;
 import org.proteios.MascotPropertiesFile;
+import org.proteios.params.DBID;
 import org.proteios.action.ActionFactory;
 import org.proteios.action.ProteiosAction;
@@ -203 +204 @@
   private HashMap<String, String> filterValueColumnHashMap = null;
   // Valid parameters
-  public static final VInteger VID = new VInteger("itemId", 1, true);
+  public static final VInteger VID = new DBID();
   public static final VInteger VPROTOCOLID = new VInteger("protocolId", 0,
     true);