lcsim/src/org/lcsim/plugin/browser

diff -u -r1.3 -r1.4
--- EventHeaderPanel.form	31 Aug 2005 02:06:33 -0000	1.3
+++ EventHeaderPanel.form	10 Jun 2007 04:46:51 -0000	1.4
@@ -6,6 +6,7 @@

     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>

   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>

lcsim/src/org/lcsim/plugin/browser

diff -u -r1.3 -r1.4
--- EventHeaderPanel.java	31 Aug 2005 02:06:33 -0000	1.3
+++ EventHeaderPanel.java	10 Jun 2007 04:46:51 -0000	1.4
@@ -6,17 +6,23 @@

 import javax.swing.JPanel;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;

+import org.lcsim.plugin.browser.sort.DefaultSortableTableModel;
+import org.lcsim.plugin.browser.sort.TableSorter;

 /**
  *
  * @author tonyj
  */
 class EventHeaderPanel extends JPanel
 {

-   

+   private DefaultTableModel blockModel;

    /** Creates new form EventHeaderPanel */
    EventHeaderPanel()
    {
       initComponents();

+      blockModel = (DefaultTableModel) blockTable.getModel();
+      blockTable.setModel(new DefaultSortableTableModel(blockModel));
+      
+      new TableSorter(blockTable).setSortOnColumn(0);

    }
    void setData(EventHeader event)
    {

@@ -32,15 +38,14 @@

       }
       else for (int i=0; i<4; i++) model.setValueAt("",i,1);
       

-      model = (DefaultTableModel) blockTable.getModel();
-      model.setRowCount(0);

+      blockModel.setRowCount(0);

       if (event != null)
       {
          List<List<Object>> collections = event.get(Object.class);
          for (List<Object> list : collections)
          {
             LCMetaData meta = event.getMetaData(list);            

-            model.addRow(new Object[]{meta.getName(),meta.getType().getName(), list.size()});          

+            blockModel.addRow(new Object[]{meta.getName(),meta.getType().getName(), list.size()});          

          }
       }
    }

lcsim/src/org/lcsim/plugin/browser/sort

diff -u -r1.2 -r1.3
--- DefaultSortableTableModel.java	4 Jun 2007 06:50:40 -0000	1.2
+++ DefaultSortableTableModel.java	10 Jun 2007 04:46:51 -0000	1.3
@@ -6,12 +6,11 @@

 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableModel;

-import org.lcsim.plugin.browser.*;

 
 /**
  * Converts any TableModel to a SortableTableModel.
  * @author Tony Johnson

- * @version $Id: DefaultSortableTableModel.java,v 1.2 2007/06/04 06:50:40 tonyj Exp $

+ * @version $Id: DefaultSortableTableModel.java,v 1.3 2007/06/10 04:46:51 tonyj Exp $

  */
 public class DefaultSortableTableModel implements SortableTableModel
 {

@@ -370,7 +369,7 @@

             {
                for (int i=first; i<=last; i++)
                {

-                  int sortedRow = rowWasDeleted(i);

+                  int sortedRow = rowWasDeleted(first); // Note, always first because previous first was deleted

                   TableModelEvent ee = new TableModelEvent(DefaultSortableTableModel.this,sortedRow,sortedRow,column,type);
                   fireTableChanged(ee);
                }

@@ -453,7 +452,7 @@

       {
          if ((o1 instanceof Comparable) && (o2 instanceof Comparable))
             return ((Comparable) o1).compareTo((Comparable) o2);

-         else return o1.toString().compareTo(o2.toString());

+         else return String.valueOf(o1).compareTo(String.valueOf(o2));

       }
    }
 }