Changeset 3773

Timestamp:

Aug 18, 2010, 10:51:48 AM (13 years ago)

Author:

Gregory Vincic

Message:

Fixing problem with ViewHitSubHits? action. The problem was in the ActionFactory? that did not reuse factories approprietly.

Location:

trunk/client/servlet/src/org/proteios

Files:

• action/ActionFactory.java (modified) (2 diffs)
• action/hit/ViewHitSubHits.java (modified) (2 diffs)
• gui/table/TableFactory2.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/ActionFactory.java

@@ -39 +39 @@
 import org.proteios.RoleController;
 import org.proteios.action.execute.ViewLoginForm;
+import org.proteios.action.execute.Login;
 import org.proteios.action.extract.ViewExtract;
 import org.proteios.action.file.ViewFile;
@@ -318 +319 @@
     }
 
-  // Special case for Login action, must check the owner parameter aswell
-  if(lastAction == null || owner != null)
+  log.debug(action.getId() + " : Owner is " + owner);
+  // Special case for Login action, must check the lastAction id aswell
+  if(lastAction == null || lastAction.getId().equals(Login.class.getName()))
   { // Create new factories and stuff for this action
    log.debug(action.getId() + " : Creating new factories and stuff");

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

@@ -57 +57 @@
       throws ActionException, InvalidParameterValue
   {
-    /*
-     * Get hit id from valid parameter and set it as session attribute.
-     */
-    Integer hitId = getValidInteger(FormFactory.VID);
-    log.debug("hitId = " + hitId);
-    /***********************************************************************
-     * Get external id data
-     */
-    // Define
+  Integer hitId;
     Table tbl;
     RowLayout layout;
-    Title title;
+    Title title;  DbControl dc;
+  ItemFactory factory;
+  Hit hit;
+  List<Hit> hits;
+
+    hitId = getValidInteger(FormFactory.VID);
     tbl = (Table) getRequest().getAttribute("table");
+
+    log.debug("hitId = " + hitId);
+
     if (tbl == null)
     {
       // Let ConfigureTableFactory2 action create the table for us
-      setAttribute(ConfigureTableFactory2.VWRAPPERCLASS, Hit.class
-        .getName());
-      setAttribute(ConfigureTableFactory2.VDATACLASS, HitData.class
-        .getName());
-      setAttribute(ConfigureTableFactory2.VFORWARDTO,
-        ViewHitSubHits.class.getName());
+      setAttribute(ConfigureTableFactory2.VWRAPPERCLASS, Hit.class.getName());
+      setAttribute(ConfigureTableFactory2.VDATACLASS, HitData.class.getName());
+      setAttribute(ConfigureTableFactory2.VFORWARDTO, ViewHitSubHits.class.getName()); // Back to this action
       setAttribute(ConfigureTableFactory2.VONLYINPROJECT, true);
       setAttribute(ConfigureTableFactory2.VUSEDEFAULT, false);
@@ -85 +82 @@
     else
     {
-      DbControl dc = newDbControl();
-      ItemFactory factory = getItemFactory(dc);
-      Hit hit = factory.getById(Hit.class, hitId);
-      List<Hit> hits = new ArrayList<Hit>();
+      title = new Title("HitsCombination");
+      dc = newDbControl();
+      factory = getItemFactory(dc);
+
+      hit = factory.getById(Hit.class, hitId);
+      hits = new ArrayList<Hit>();
       hits.add(hit);
       hits.addAll(hit.getSubHitsInCombination());
-      for (Hit h : hits)
-      {
-        log.error("Hit " + h.getScoreType() + " " + h.getScore());
-      }
+
       getTableFactory2().setIterator(hits.iterator());
       tbl = getTableFactory2().build();
       tbl.setTitle("Hit");
-      // List the hits
-      /*******************************************************************
-       * Layout
-       */
-      title = new Title("HitsCombination");
+
       layout = getLayoutFactory().getRowLayout();
       layout.add(title);

trunk/client/servlet/src/org/proteios/gui/table/TableFactory2.java

@@ -90 +90 @@
   public Table build()
   {
-    log.debug("Building table for [" + classDescriptor.getDescribedClass()
-      .getName() + "]");
+  if(classDescriptor == null) { log.error("TableFactory2 is missconfigured. classDescriptor is null, make sure you call TableFactory2.setClassDescriptor prior to TableFactory2.build()"); return null; }
+    log.debug("Building table for [" + classDescriptor.getDescribedClass().getName() + "]");
     Table table = null;
     if (verify())
     {
-      table = new Table(classDescriptor.getDescribedClass()
-        .getSimpleName());
+      table = new Table(classDescriptor.getDescribedClass().getSimpleName());
       table.setHeader(columns);
       while (iterator.hasNext())