[jtcfrost-cvs] frost-wot/source/frost/util/model/gui AbstractTableFormat.java,1.5,1.5.2.1 ModelTable.java,1.10,1.10.2.1 ModelTableFormat.java,1.6,1.6.2.1

[Zlatin B. <zl...@us...>]

Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/util/model/gui

Modified Files:
      Tag: swt-gui-branch
	AbstractTableFormat.java ModelTable.java ModelTableFormat.java 
Log Message:
its crippled but almost compiles

Index: ModelTableFormat.java
===================================================================
RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTableFormat.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** ModelTableFormat.java	18 May 2004 17:18:59 -0000	1.6
--- ModelTableFormat.java	29 May 2004 01:01:23 -0000	1.6.2.1
***************
*** 7,11 ****
  package frost.util.model.gui;
  
! import javax.swing.JTable;
  
  import frost.util.model.ModelItem;
--- 7,11 ----
  package frost.util.model.gui;
  
! import swingwtx.swing.JTable;
  
  import frost.util.model.ModelItem;

Index: ModelTable.java
===================================================================
RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTable.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** ModelTable.java	20 May 2004 11:38:28 -0000	1.10
--- ModelTable.java	29 May 2004 01:01:23 -0000	1.10.2.1
***************
*** 7,16 ****
  package frost.util.model.gui;
  
! import java.awt.Font;
  import java.lang.reflect.InvocationTargetException;
  import java.util.logging.*;
  
! import javax.swing.*;
! import javax.swing.table.AbstractTableModel;
  
  import frost.util.model.*;
--- 7,16 ----
  package frost.util.model.gui;
  
! import swingwt.awt.Font;
  import java.lang.reflect.InvocationTargetException;
  import java.util.logging.*;
  
! import swingwtx.swing.*;
! import swingwtx.swing.table.AbstractTableModel;
  
  import frost.util.model.*;
***************
*** 78,81 ****
--- 78,82 ----
  	/**
  	 * Helper class to be able to safely get the selection fron any thread
+ 	 * note - don't know how SWT handles this stuff, so I just commented them out --zab
  	 */
  	protected class SelectionGetter implements Runnable {
***************
*** 95,101 ****
  		public ModelItem[] getSelectedItems() {
  			mode = MODE_MULTIPLE;
! 			if (SwingUtilities.isEventDispatchThread()) {
  				run();
! 			} else {
  				try {
  					SwingUtilities.invokeAndWait(this);
--- 96,102 ----
  		public ModelItem[] getSelectedItems() {
  			mode = MODE_MULTIPLE;
! 		//	if (SwingUtilities.isEventDispatchThread()) {
  				run();
! 		/*	} else {
  				try {
  					SwingUtilities.invokeAndWait(this);
***************
*** 105,109 ****
  					logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e);
  				}
! 			}
  			return selectedItems;
  		}
--- 106,110 ----
  					logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e);
  				}
! 			}*/
  			return selectedItems;
  		}
***************
*** 114,120 ****
  		public ModelItem getSelectedItem() {
  			mode = MODE_SINGLE;
! 			if (SwingUtilities.isEventDispatchThread()) {
  				run();
! 			} else {
  				try {
  					SwingUtilities.invokeAndWait(this);
--- 115,121 ----
  		public ModelItem getSelectedItem() {
  			mode = MODE_SINGLE;
! 			//if (SwingUtilities.isEventDispatchThread()) {
  				run();
! 		/*	} else {
  				try {
  					SwingUtilities.invokeAndWait(this);
***************
*** 124,128 ****
  					logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e);
  				}
! 			}
  			return selectedItem;
  		}
--- 125,129 ----
  					logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e);
  				}
! 			}*/
  			return selectedItem;
  		}
***************
*** 198,202 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#getColumnCount()
  	 */
  	public int getColumnCount() {
--- 199,203 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#getColumnCount()
  	 */
  	public int getColumnCount() {
***************
*** 205,209 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#getRowCount()
  	 */
  	public int getRowCount() {
--- 206,210 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#getRowCount()
  	 */
  	public int getRowCount() {
***************
*** 212,216 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#getValueAt(int, int)
  	 */
  	public Object getValueAt(int rowIndex, int columnIndex) {
--- 213,217 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#getValueAt(int, int)
  	 */
  	public Object getValueAt(int rowIndex, int columnIndex) {
***************
*** 257,261 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#getColumnName(int)
  	 */
  	public String getColumnName(int column) {
--- 258,262 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#getColumnName(int)
  	 */
  	public String getColumnName(int column) {
***************
*** 279,283 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#isCellEditable(int, int)
  	 */
  	public boolean isCellEditable(int rowIndex, int columnIndex) {
--- 280,284 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#isCellEditable(int, int)
  	 */
  	public boolean isCellEditable(int rowIndex, int columnIndex) {
***************
*** 286,290 ****
  
  	/* (non-Javadoc)
! 	 * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int)
  	 */
  	public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
--- 287,291 ----
  
  	/* (non-Javadoc)
! 	 * @see swingwtx.swing.table.TableModel#setValueAt(java.lang.Object, int, int)
  	 */
  	public void setValueAt(Object aValue, int rowIndex, int columnIndex) {

Index: AbstractTableFormat.java
===================================================================
RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/AbstractTableFormat.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** AbstractTableFormat.java	18 May 2004 17:18:20 -0000	1.5
--- AbstractTableFormat.java	29 May 2004 01:01:23 -0000	1.5.2.1
***************
*** 10,15 ****
  import java.util.logging.Logger;
  
! import javax.swing.JTable;
! import javax.swing.table.*;
  
  import frost.util.model.ModelItem;
--- 10,15 ----
  import java.util.logging.Logger;
  
! import swingwtx.swing.JTable;
! import swingwtx.swing.table.*;
  
  import frost.util.model.ModelItem;
***************
*** 61,65 ****
  
  	/* (non-Javadoc)
! 	 * @see frost.util.model.gui.ModelTableFormat#addTable(javax.swing.JTable)
  	 */
  	public synchronized void addTable(JTable table) {
--- 61,65 ----
  
  	/* (non-Javadoc)
! 	 * @see frost.util.model.gui.ModelTableFormat#addTable(swingwtx.swing.JTable)
  	 */
  	public synchronized void addTable(JTable table) {