Changeset 2150

Timestamp:

Apr 5, 2006, 3:37:35 PM (18 years ago)

Author:

Nicklas Nordborg

Message:

Added page for viewing scores for reporters in reporter list.
Added new query to get the scores.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java (modified) (1 diff)
• src/core/net/sf/basedb/core/AbstractQuery.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/Item.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ReporterList.java (modified) (6 diffs)
• src/core/net/sf/basedb/core/ReporterScore.java (added)
• src/core/net/sf/basedb/core/ReporterScoreQuery.java (added)
• src/core/net/sf/basedb/core/ReporterScoreResultIterator.java (added)
• src/core/net/sf/basedb/core/data/ReporterListData.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/data/ReporterListScoreData.hbm.xml (modified) (3 diffs)
• src/core/net/sf/basedb/core/data/ReporterListScoreData.java (modified) (8 diffs)
• src/core/net/sf/basedb/core/query/Hql.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/query/HqlInnerJoin.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/query/Query.java (modified) (1 diff)
• src/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java (modified) (3 diffs)
• src/test/TestReporterList.java (modified) (1 diff)
• www/views/reporterlists/reporters (added)
• www/views/reporterlists/reporters/index.jsp (added)
• www/views/reporterlists/reporters/list_reporters.jsp (added)
• www/views/reporterlists/view_reporterlist.jsp (modified) (3 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/PresetSelector.java

@@ -193 +193 @@
     int numOptions = 0;
     Class dataClass = itemType.getDataClass();
-    if (RemovableData.class.isAssignableFrom(dataClass))
-    {
-      boolean current = cc.getInclude().contains(Include.REMOVED);
-      sb.append("<option value=\"option:removed:").append(current ? "0" : "1").append("\"");
-      sb.append(" title=\"Show/hide removed items\">");
-      sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Removed\n");
-      table.addHidden("removed", Boolean.toString(current));
-      numOptions++;
-    }
-    if (OwnableData.class.isAssignableFrom(dataClass))
-    {
-      boolean current = cc.getInclude().contains(Include.MINE);
-      sb.append("<option value=\"option:owned:").append(current ? "0" : "1").append("\"");
-      sb.append(" title=\"Show/hide items owned by me\">");
-      sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by me\n");
-      table.addHidden("owned", Boolean.toString(current));
-      numOptions++;
-    }
-    if (ShareableData.class.isAssignableFrom(dataClass) 
-        || ProjectData.class.isAssignableFrom(dataClass)
-      )
-    {
-      boolean current = cc.getInclude().contains(Include.SHARED);
-      sb.append("<option value=\"option:shared:").append(current ? "0" : "1").append("\"");
-      sb.append(" title=\"Show/hide items shared to me\">");
-      sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Shared to me\n");
-      table.addHidden("shared", Boolean.toString(current));
-      numOptions++;
-      
-      if (sc.getActiveProjectId() != 0 && !ProjectData.class.isAssignableFrom(dataClass))
-      {
-        current = cc.getInclude().contains(Include.IN_PROJECT);
-        sb.append("<option value=\"option:inproject:").append(current ? "0" : "1").append("\"");
-        sb.append(" title=\"Show/hide items in current project\">");
-        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("In current project\n");
-        table.addHidden("inproject", Boolean.toString(current));
+    if (dataClass != null)
+    {
+      if (RemovableData.class.isAssignableFrom(dataClass))
+      {
+        boolean current = cc.getInclude().contains(Include.REMOVED);
+        sb.append("<option value=\"option:removed:").append(current ? "0" : "1").append("\"");
+        sb.append(" title=\"Show/hide removed items\">");
+        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Removed\n");
+        table.addHidden("removed", Boolean.toString(current));
         numOptions++;
       }
-    }
-
-    if (sc.hasPermission(Permission.READ, itemType) && 
-        (
-          OwnableData.class.isAssignableFrom(dataClass) || 
-          SessionData.class.isAssignableFrom(dataClass)
+      if (OwnableData.class.isAssignableFrom(dataClass))
+      {
+        boolean current = cc.getInclude().contains(Include.MINE);
+        sb.append("<option value=\"option:owned:").append(current ? "0" : "1").append("\"");
+        sb.append(" title=\"Show/hide items owned by me\">");
+        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by me\n");
+        table.addHidden("owned", Boolean.toString(current));
+        numOptions++;
+      }
+      if (ShareableData.class.isAssignableFrom(dataClass) 
+          || ProjectData.class.isAssignableFrom(dataClass)
         )
-      )
-    {
-      boolean current = cc.getInclude().contains(Include.OTHERS);
-      sb.append("<option value=\"option:others:").append(current ? "0" : "1").append("\"");
-      sb.append(" title=\"Show/hide items owned by others\">");
-      sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by others\n");
-      table.addHidden("others", Boolean.toString(current));
-      numOptions++;
+      {
+        boolean current = cc.getInclude().contains(Include.SHARED);
+        sb.append("<option value=\"option:shared:").append(current ? "0" : "1").append("\"");
+        sb.append(" title=\"Show/hide items shared to me\">");
+        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Shared to me\n");
+        table.addHidden("shared", Boolean.toString(current));
+        numOptions++;
+        
+        if (sc.getActiveProjectId() != 0 && !ProjectData.class.isAssignableFrom(dataClass))
+        {
+          current = cc.getInclude().contains(Include.IN_PROJECT);
+          sb.append("<option value=\"option:inproject:").append(current ? "0" : "1").append("\"");
+          sb.append(" title=\"Show/hide items in current project\">");
+          sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("In current project\n");
+          table.addHidden("inproject", Boolean.toString(current));
+          numOptions++;
+        }
+      }
+  
+      if (sc.hasPermission(Permission.READ, itemType) && 
+          (
+            OwnableData.class.isAssignableFrom(dataClass) || 
+            SessionData.class.isAssignableFrom(dataClass)
+          )
+        )
+      {
+        boolean current = cc.getInclude().contains(Include.OTHERS);
+        sb.append("<option value=\"option:others:").append(current ? "0" : "1").append("\"");
+        sb.append(" title=\"Show/hide items owned by others\">");
+        sb.append(current ? "×&nbsp;" : "&nbsp;&nbsp;").append("Owned by others\n");
+        table.addHidden("others", Boolean.toString(current));
+        numOptions++;
+      }
     }
 

trunk/src/core/net/sf/basedb/core/AbstractQuery.java

@@ -181 +181 @@
   */
   private List<String> thetaJoinConditions;
+  
+  /**
+    If the {@link #count(DbControl)} method is executing or not.
+  */
+  private boolean isCounting;
 
   /**
@@ -427 +432 @@
     maxResults = 0;
   }
+  public boolean isCounting()
+  {
+    return isCounting;
+  }
   // -------------------------------------------
 
+  /**
+    Set the counting status of the query.
+  */
+  void setCounting(boolean isCounting)
+  {
+    this.isCounting = isCounting;
+  }
+  
   void temporarySelect(Select select)
     throws InvalidDataException, BaseException
@@ -585 +602 @@
   {
     StringBuilder ql = new StringBuilder();
+    setCounting(true);
     ql.append(isDistinct() ? "SELECT DISTINCT COUNT(*) " : "SELECT COUNT(*) ");
     ql.append(" FROM ").append(rootEntity).append(" ").append(getRootAlias());
@@ -618 +636 @@
     appended = appendHavings(ql, dc, permanentHavings, 0);
     appended += appendHavings(ql, dc, havings, appended);
+    setCounting(false);
     
     if (debugEnabled) logSql.debug("Count query(" + getQueryType()+ "): " +ql.toString());

trunk/src/core/net/sf/basedb/core/Item.java

@@ -193 +193 @@
   */
   REPORTERLIST(163, "Reporter list", "rpl", ReporterList.class, ReporterListData.class, DefinedPermissions.shareable),
+  /**
+    The item is a {@link ReporterScore}. This item is not a BasicItem.
+  */
+  REPORTERSCORE(164, "Reporter score", "rps", null, null, null),
 
   /**

trunk/src/core/net/sf/basedb/core/ReporterList.java

@@ -28 +28 @@
 import net.sf.basedb.core.data.ReporterData;
 import net.sf.basedb.core.data.ReporterListScoreData;
-import net.sf.basedb.core.DataQuery;
-import net.sf.basedb.core.query.Restrictions;
-import net.sf.basedb.core.query.Hql;
+
 
 /**
@@ -180 +178 @@
   }
 
+  /**
+    Add or update the score for a reporter.
+   
+    @param reporter The reporter to add to the list
+    @param score The score for the reporter, or null
+    @throws PermissionDeniedException If the logged in user doesn't have
+      write permission
+    @throws InvalidDataException If the reporter is null
+   */
   public void addReporter(ReporterData reporter, Float score)
     throws PermissionDeniedException, InvalidDataException
@@ -185 +192 @@
     checkPermission(Permission.WRITE);
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    ReporterListScoreData rlScore = getData().getReporterListScores().get(reporter);
+    ReporterListScoreData rlScore = getData().getReporterListScores().get(reporter.getId());
     if (rlScore == null)
     {
@@ -192 +199 @@
       rlScore.setReporter(reporter);
       rlScore.setScore(score);
-      getData().getReporterListScores().put(reporter, rlScore);
+      getData().getReporterListScores().put(reporter.getId(), rlScore);
+      getDbControl().getHibernateSession().save(rlScore);
     }
     else
@@ -200 +208 @@
   }
 
+  /**
+    Remove a reporter from the reporter list.
+    @param reporter The reporter to remove.
+    @throws PermissionDeniedException If the logged in user doesn't have
+      write permission
+    @throws InvalidDataException If the reporter is null
+   */
   public void removeReporter(ReporterData reporter)
     throws PermissionDeniedException, InvalidDataException
@@ -205 +220 @@
     checkPermission(Permission.WRITE);
     if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    getData().getReporterListScores().remove(reporter);
-  }
-  
+    System.out.println(reporter.getId());
+    
+    System.out.println(getData().getReporterListScores().toString());
+    
+    
+    ReporterListScoreData rlScore = getData().getReporterListScores().remove(reporter.getId());
+    if (rlScore != null)
+    {
+      System.out.println("rlScore.reporterId=" + rlScore.getReporterId());
+      System.out.println("rlScore.reporter.id=" + rlScore.getReporter().getId());
+      getDbControl().getHibernateSession().delete(rlScore);
+    }
+  }
+  
+  /**
+    Get the score for the specified reporter.
+    @param reporter The reporter
+    @return The score as a float value, or null if the reporter isn't found 
+      or hasn't been assigned a score
+    @throws InvalidDataException
+   */
   public Float getScore(ReporterData reporter)
-    throws InvalidDataException
-  {
-    if (reporter == null) throw new InvalidUseOfNullException("reporter");
-    ReporterListScoreData score = getData().getReporterListScores().get(reporter);
+  {
+    ReporterListScoreData score = getData().getReporterListScores().get(reporter.getId());
     return score == null ? null : score.getScore();
   }
 
-  public DataQuery<ReporterData> getReporters()
-  {
-    DataQuery<ReporterData> query = Reporter.getQuery();
-    query.joinPermanent(Hql.innerJoin("reporterListScores", Item.REPORTERLIST.getAlias()));
-    query.restrictPermanent(
-      Restrictions.eq(
-        Hql.property(Item.REPORTERLIST.getAlias(), "reporterList"),
-        Hql.entity(this)
-      )
-    );
+  /**
+    Get a query returning {@link ReporterScore} objects.
+  */
+  public ReporterScoreQuery getReporterScores()
+  {
+    ReporterScoreQuery query = ReporterScore.getQuery(this);
     return query;
   }
+  
 }
 

trunk/src/core/net/sf/basedb/core/data/ReporterListData.java

@@ -35 +35 @@
   @see net.sf.basedb.core.ReporterList
   @see <a href="../../../../../../../development/overview/data/reporters.html">Reporter overview</a>
-  @hibernate.class table="`ReporterLists`" lazy="false"
+  @hibernate.class table="`ReporterLists`" lazy="true"
 */
 public class ReporterListData
@@ -74 +74 @@
   }
 
-  private Map<ReporterData, ReporterListScoreData> reporters;
+  private Map<Integer, ReporterListScoreData> reporters;
   /**
     The list of reporters and their scores.
-    @hibernate.map lazy="true" inverse="true" cascade="all"
+    @hibernate.map lazy="true" inverse="true" cascade="delete"
     @hibernate.collection-key column="`reporterlist_id`"
-    @hibernate.index-many-to-many column="`reporter_id`" class="net.sf.basedb.core.data.ReporterData"
+    hibernate.index-many-to-many column="`reporter_id`" class="net.sf.basedb.core.data.ReporterData"
+    @hibernate.collection-index column="`reporter_id`" type="int"
     @hibernate.collection-one-to-many class="net.sf.basedb.core.data.ReporterListScoreData"
   */
-  public Map<ReporterData, ReporterListScoreData> getReporterListScores()
+  public Map<Integer, ReporterListScoreData> getReporterListScores()
   {
     if (reporters == null)
     {
-      reporters = new HashMap<ReporterData, ReporterListScoreData>();
+      reporters = new HashMap<Integer, ReporterListScoreData>();
     }
     return reporters;
   }
-  void setReporterListScores(Map<ReporterData, ReporterListScoreData> reporters)
+  void setReporterListScores(Map<Integer, ReporterListScoreData> reporters)
   {
     this.reporters = reporters;

trunk/src/core/net/sf/basedb/core/data/ReporterListScoreData.hbm.xml

@@ -7 +7 @@
   $Id$
 
-  Copyright (C) 2006 Jari Häkkinen, Nicklas Nordborg
+  Copyright (C) 2006 Nicklas Nordborg
   
   This file is part of BASE - BioArray Software Environment.
@@ -38 +38 @@
         class="net.sf.basedb.core.data.ReporterListData"
         column="`reporterlist_id`"
+        lazy="proxy"
       />
-      <key-many-to-one
-        name="reporter"
-        class="net.sf.basedb.core.data.ReporterData"
+      <key-property
+        name="reporterId"
+        type="int"
         column="`reporter_id`"
       />
@@ -54 +55 @@
       not-null="false"
     />
+    <many-to-one
+      name="reporter"
+      class="net.sf.basedb.core.data.ReporterData"
+      column="`reporter_id`"
+      lazy="proxy"
+      update="false"
+      insert="false"
+    />
+    
   </class>
 </hibernate-mapping>

trunk/src/core/net/sf/basedb/core/data/ReporterListScoreData.java

@@ -2 +2 @@
   $Id$
 
-   Copyright (C) 2006 Jari Häkkinen, Nicklas Nordborg
+   Copyright (C) 2006 Nicklas Nordborg
   
   This file is part of BASE - BioArray Software Environment.
@@ -28 +28 @@
 /**
   This class holds information about the score of a reporter in a 
-  reporter list
+  reporter list. The mapping is defined in the external mapping
+  file <code>ReporterListScoreData.hbm.xml</code> since
+  XDoclet can't generate the <code>&lt;composite-id&gt;</code>
+  tag for us.
  
   @author Nicklas
@@ -40 +43 @@
 {
 
+  public ReporterListScoreData()
+  {}
+  
   /*
     From the Object class
@@ -50 +56 @@
     if (getClass() != o.getClass()) return false;
     ReporterListScoreData other = (ReporterListScoreData)o;
-    return reporterList.equals(other.reporterList) && reporter.equals(other.reporter);
+    return reporterList.equals(other.reporterList) && reporterId == other.reporterId;
   }
   @Override
@@ -57 +63 @@
     return 23 * reporterList.hashCode() + 7 * reporter.hashCode();
   }
+  public String toString()
+  {
+    return "ReporterListScoreData: reporterId="+getReporterId()+"; score="+getScore();
+  }
   // -------------------------------------------
   
   private ReporterListData reporterList;
+  /**
+    The reporter list this reporter and score belongs to. Part
+    of the composite id of this class.
+  */
   public ReporterListData getReporterList()
   {
@@ -69 +83 @@
   }
   
+  private int reporterId;
+  /**
+    The id of the reporter. This mapping is neccessary
+    since the alternative <code>&lt;key-many-to-one&gt;</code>
+    doesn't work with <code>INNER JOIN FETCH</code> queries.
+    We have to use a regular <code>&lt;many-to-one&gt;</code>,
+    which means that the reporter property must be outside the
+    compiste id.
+  */
+  public int getReporterId()
+  {
+    return reporterId;
+  }
+  public void setReporterId(int reporterId)
+  {
+    this.reporterId = reporterId;
+  }
+  
   private ReporterData reporter;
+  /**
+    Get the reporter.
+  */
   public ReporterData getReporter()
   {
@@ -77 +112 @@
   {
     this.reporter = reporter;
+    reporterId = reporter.getId();
   }
 
   private Float score;
+  /**
+    Get the score for the reporter, or null if no score has been set.
+  */
   public Float getScore()
   {
@@ -89 +128 @@
   }
 
-  
 }

trunk/src/core/net/sf/basedb/core/query/Hql.java

@@ -211 +211 @@
     throws InvalidDataException
   {
-    return innerJoin(null, property, joinedAlias);
+    return innerJoin(null, property, joinedAlias, false);
   }
 
@@ -231 +231 @@
     throws InvalidDataException
   {
+    return innerJoin(alias, property, joinedAlias, false);
+  }
+
+  /**
+    Create an inner join query element and optionally 
+    prefetch the joined items in the same query. This is useful to 
+    avoid subsequent queries to the database when you know that you are
+    going to access the joined items in your code. If you are joining a
+    collection the {@link Query#setFirstResult(int)} and {@link Query#setMaxResults(int)}
+    shouldn't be used since the join will create multiple rows for the same
+    root item.
+    
+    @param alias The alias to resolve the property against, or null to resolve the
+      property against the root entity
+    @param property The property name of the associated entity (required)
+    @param joinedAlias The alias to give the joined entity (required)
+    @param fetch If the joined items should be prefetched or not
+    @return A join query element
+    @throws InvalidDataException If the property or joined alias parameter
+      are null or if any of the parameters contains invalid characters
+  */
+  public static Join innerJoin(String alias, String property, String joinedAlias, boolean fetch)
+    throws InvalidDataException
+  {
     if (property == null) throw new InvalidUseOfNullException("property");
     if (joinedAlias == null) throw new InvalidUseOfNullException("alias");
@@ -245 +269 @@
       throw new InvalidDataException("Alias '"+joinedAlias+"' has one or more invalid characters. Only a-z, A-Z and 0-9 is allowed.");
     }
-    return new HqlInnerJoin(alias, property, joinedAlias);
-  }
-
+    return new HqlInnerJoin(alias, property, joinedAlias, fetch);
+  }
+  
   /**
     Same as <code>leftJoin(null, propert, joinedAlias, null)</code>

trunk/src/core/net/sf/basedb/core/query/HqlInnerJoin.java

@@ -47 +47 @@
   private final String property;
   private final String joinedAlias;
+  private final boolean fetch;
 
-  HqlInnerJoin(String alias, String property, String joinedAlias)
+  HqlInnerJoin(String alias, String property, String joinedAlias, boolean fetch)
   {
     assert property != null : "property == null";
@@ -55 +56 @@
     this.property = property;
     this.joinedAlias = joinedAlias;
+    this.fetch = fetch;
   }
 
@@ -66 +68 @@
     if (query.getQueryType() == QueryType.HQL)
     {
-      return "JOIN "+(alias == null ? query.getRootAlias() : alias) + "." + property + " " + joinedAlias;
+      // Count queries can't use the fetch parameter; they are not selecting the root item
+      return "INNER JOIN " + (fetch && !query.isCounting() ? "FETCH " : "") +
+        (alias == null ? query.getRootAlias() : alias) + "." + property + " " + joinedAlias;
     }
     else
@@ -96 +100 @@
   public String toString()
   {
-    return "JOIN "+(alias == null ? "" : alias + ".") + property + " " + joinedAlias;
+    return "INNER JOIN " + (fetch ? "FETCH " : "") +
+      (alias == null ? "" : alias + ".") + property + " " + joinedAlias;
   }
   // -------------------------------------------

trunk/src/core/net/sf/basedb/core/query/Query.java

@@ -329 +329 @@
     throws BaseException;
 
+  /**
+    Check if the query is executing the {@link #count(DbControl)} method or not
+    @return TRUE if the query is currently executing the <code>count</code>
+      method, FALSE otherwise
+  */
+  public boolean isCounting();
+  
 }

trunk/src/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java

@@ -92 +92 @@
     new HashSet<GuiContext>(Arrays.asList(
       new GuiContext(Item.REPORTER, GuiContext.Type.LIST),
-      new GuiContext(Item.REPORTERLIST, GuiContext.Type.ITEM)
+      new GuiContext(Item.REPORTERLIST, GuiContext.Type.ITEM),
+      new GuiContext(Item.REPORTERSCORE, GuiContext.Type.LIST)
     ));
 
@@ -256 +257 @@
           return;
         }
-        if (context.getItem() == Item.REPORTERLIST)
+        if (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE)
         {
           storeValue(job, request, reporterListParameter);
@@ -479 +480 @@
       // RequestInformation for CONFIGURE_JOB
       List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
-      if (context.getItem() == Item.REPORTERLIST)
+      if (context.getItem() == Item.REPORTERLIST || context.getItem() == Item.REPORTERSCORE)
       {
         ItemParameterType<ReporterList> reporterListType = new ItemParameterType<ReporterList>(ReporterList.class, null, true, 1, null);

trunk/src/test/TestReporterList.java

@@ -248 +248 @@
       ReporterList rl = ReporterList.getById(dc, id);
       
-      DataQuery<ReporterData> query = rl.getReporters();
-      DataResultIterator<ReporterData> reporters = query.iterate(dc);
+      ReporterScoreQuery query = rl.getReporterScores();
+      ReporterScoreResultIterator reporters = query.iterate(dc);
       
       int i = 0;
       while (reporters.hasNext())
       {
-        ReporterData r = reporters.next();
-        write_item(i, r, rl.getScore(r));
+        ReporterScore r = reporters.next();
+        write_item(i, r.getReporter(), r.getScore());
         i++;
       }

trunk/www/views/reporterlists/view_reporterlist.jsp

@@ -1 +1 @@
 <%-- $Id$
   ------------------------------------------------------------------
-  BioArray Software Environment (BASE) - http://base.thep.lu.se/
-  Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-  Johan Vallon-Christersson, Jari Häkkinen, Nicklas Nordborg
-
-  This file is part of BASE.
-
-  BASE 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 2
-  of the License, or (at your option) any later version.
-
-  BASE 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.
-
+  Copyright (C) 2006 Nicklas Nordborg
+  
+  This file is part of BASE - BioArray Software Environment.
+  Available at http://base.thep.lu.se/
+  
+  BASE 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 2 of the License, or
+  (at your option) any later version.
+  
+  BASE 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 this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA  02111-1307, USA.
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA. 
   ------------------------------------------------------------------
 
@@ -108 +107 @@
       Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 740, 540);
     }
+    function viewReporters()
+    {
+      location.href = 'reporters/index.jsp?ID=<%=ID%>&cmd=List&reporterlist_id=<%=itemId%>';
+    }
+    function switchTab(tabControlId, tabId)
+    {
+      if (tabId == 'reporters')
+      {
+        viewReporters();
+      }
+      else
+      {
+        TabControl.setActiveTab(tabControlId, tabId);
+      }
+    }
     </script>
   </base:head>
@@ -117 +131 @@
     </p:path>
     
-    <t:tabcontrol id="main" active="properties">
+    <t:tabcontrol id="main" active="properties" switch="switchTab">
     <t:tab id="properties" title="Properties">
     <tbl:toolbar