GenealogyJ

Update of /cvsroot/genj/dev/src/core/genj/table
In directory sc8-pr-cvs1:/tmp/cvs-serv32043/src/core/genj/table

Modified Files:
	TableView.java EntityTableModel.java 
Log Message:
fixed problem when no table settings are left from last GenJ run - gotta test GenJ with blank .properties before the release!

Index: TableView.java
===================================================================
RCS file: /cvsroot/genj/dev/src/core/genj/table/TableView.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** TableView.java	12 Jun 2003 23:03:39 -0000	1.44
--- TableView.java	17 Jun 2003 16:26:08 -0000	1.45
***************
*** 109,116 ****
      
      // create our table
!     table = new JTable(tableModel, tableModel.createTableColumnModel(640)) {
        /** whenever new columns need to be created */
        public void createDefaultColumnsFromModel() {
!         setColumnModel(tableModel.createTableColumnModel(super.getWidth()));
        }
      };
--- 109,116 ----
      
      // create our table
!     table = new JTable(tableModel) {
        /** whenever new columns need to be created */
        public void createDefaultColumnsFromModel() {
!         setColumnModel(((EntityTableModel)getModel()).createTableColumnModel());
        }
      };
***************
*** 290,294 ****
        if (ws!=null) mode.setWidths(ws);
  
!       mode.setSort(registry.get(tag+".sort", new Point()));
  
      }
--- 290,294 ----
        if (ws!=null) mode.setWidths(ws);
  
!       mode.setSort(registry.get(tag+".sort", new Point(0, 1)));
  
      }

Index: EntityTableModel.java
===================================================================
RCS file: /cvsroot/genj/dev/src/core/genj/table/EntityTableModel.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** EntityTableModel.java	12 Jun 2003 23:10:01 -0000	1.29
--- EntityTableModel.java	17 Jun 2003 16:26:08 -0000	1.30
***************
*** 119,124 ****
      Mode set = getMode(tag);
      // already?
!     if (mode==set)
!       return;
      mode = set;
      // build rows
--- 119,124 ----
      Mode set = getMode(tag);
      // already?
! //    if (mode==set)
! //      return;
      mode = set;
      // build rows
***************
*** 261,265 ****
     * Helper that creates a new ColumnModel
     */
!   /*package*/ TableColumnModel createTableColumnModel(int total) {
      TagPath[] paths = mode.paths;
      int[] widths = mode.widths;
--- 261,265 ----
     * Helper that creates a new ColumnModel
     */
!   /*package*/ TableColumnModel createTableColumnModel() {
      TagPath[] paths = mode.paths;
      int[] widths = mode.widths;
***************
*** 269,273 ****
        TableColumn col = new TableColumn(c);
        col.setHeaderValue(paths[c]);
!       col.setPreferredWidth(widths.length>c&&widths[c]>0?widths[c]:total/mode.paths.length);
        columns.addColumn(col);
      }
--- 269,273 ----
        TableColumn col = new TableColumn(c);
        col.setHeaderValue(paths[c]);
!       col.setPreferredWidth(widths.length>c&&widths[c]>0?widths[c]:75);
        columns.addColumn(col);
      }