[queryviewer-devel] queryviewer/src/net/sourceforge/queryviewer/ui/swing ConnectionTab.java,1.8,1.9 InfoTab.java,1.2,1.3 Main.java,1.7,1.8 QueryJPanel.java,1.10,1.11 QueryTab.java,1.7,1.8 QueryTableModel.java,1.3,1.4

[<av...@us...>]

Update of /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing
In directory sc8-pr-cvs1:/tmp/cvs-serv9747/src/net/sourceforge/queryviewer/ui/swing

Modified Files:
	ConnectionTab.java InfoTab.java Main.java QueryJPanel.java 
	QueryTab.java QueryTableModel.java 
Log Message:
removed (nearly) all deprecated methods

Index: ConnectionTab.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/ConnectionTab.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ConnectionTab.java	25 Jun 2003 15:00:13 -0000	1.8
--- ConnectionTab.java	5 Nov 2003 13:28:26 -0000	1.9
***************
*** 7,18 ****
  import java.awt.FlowLayout;
  import java.awt.GridLayout;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Set;
! import java.util.Vector;
! import javax.swing.Action;
  import javax.swing.Box;
  import javax.swing.BoxLayout;
--- 7,15 ----
  import java.awt.FlowLayout;
  import java.awt.GridLayout;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Set;
! 
  import javax.swing.Box;
  import javax.swing.BoxLayout;
***************
*** 21,27 ****
  import javax.swing.JPanel;
  import javax.swing.JTextField;
! import javax.swing.SwingConstants;
! import net.sourceforge.queryviewer.ConnectionListener;
! import net.sourceforge.queryviewer.JDBCConnectionImpl;
  import net.sourceforge.queryviewer.ui.ViewInfo;
  import net.sourceforge.queryviewer.ui.event.AbstractControler;
--- 18,22 ----
  import javax.swing.JPanel;
  import javax.swing.JTextField;
! 
  import net.sourceforge.queryviewer.ui.ViewInfo;
  import net.sourceforge.queryviewer.ui.event.AbstractControler;
***************
*** 143,165 ****
  
    /**
-    * Retourne le texte ({@link String}) qu'il y a dans les composants de texte.
-    * @see QueryActions
-    * @return the UserInputs value.
-    * @deprecated use #getUserValue(String) instead
-    */
-   public Map getUserInputs() {
-     Map m = new HashMap();
-     Set keys = this.userInputs.keySet();
-     Iterator iterator = keys.iterator();
-     while (iterator.hasNext()) {
-       String k = (String)iterator.next();
-       String value = ( (JTextField)this.userInputs.get( k ) ).getText();
-       m.put( k, value );
-     } // end of while ()
-     
-     return m;
-   }
- 
-   /**
     * Retourne le texte qu'il y a dans le composant <b>clé</b>.
     * @param key la clé
--- 138,141 ----
***************
*** 173,196 ****
      } // end of if ()
      return result;
-   }
- 
-   /**
-    * Mise à jour des valeurs dans les composants de texte.
-    * @see QueryActions
-    * @param newUserInputs The new UserInputs value.
-    * @deprecated use putUserValue(String,String) instead
-    */
-   public void setUserInputs(Map newUserInputs) {
-     Set keys = newUserInputs.keySet();
-     Iterator iter = keys.iterator();
-     while (iter.hasNext()) {
-       String k = (String)iter.next();
-       Object o = this.userInputs.get( k );
-       if (o!=null) {
-         ( (JTextField)o ).setText( (String)newUserInputs.get( k ) );
-       } // end of if ()
-       
-     } // end of while ()
-     
    }
  
--- 149,152 ----

Index: InfoTab.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/InfoTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InfoTab.java	22 Jun 2003 21:25:42 -0000	1.2
--- InfoTab.java	5 Nov 2003 13:28:26 -0000	1.3
***************
*** 7,15 ****
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
! import javax.swing.JTextArea;
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
! import net.sourceforge.queryviewer.Query;
  import net.sourceforge.queryviewer.Connection;
  import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  
--- 7,17 ----
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
! 
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
! import javax.swing.JTextArea;
! 
  import net.sourceforge.queryviewer.Connection;
+ import net.sourceforge.queryviewer.Query;
  import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  

Index: Main.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Main.java	17 Jun 2003 22:48:10 -0000	1.7
--- Main.java	5 Nov 2003 13:28:26 -0000	1.8
***************
*** 8,17 ****
  import java.awt.event.WindowAdapter;
  import java.awt.event.WindowEvent;
! import javax.swing.Action;
  import javax.swing.JFrame;
  import javax.swing.JMenu;
  import javax.swing.JMenuBar;
! import net.sourceforge.queryviewer.QueryException;
! import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  
--- 8,16 ----
  import java.awt.event.WindowAdapter;
  import java.awt.event.WindowEvent;
! 
  import javax.swing.JFrame;
  import javax.swing.JMenu;
  import javax.swing.JMenuBar;
! 
  import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  

Index: QueryJPanel.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/QueryJPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** QueryJPanel.java	23 Jun 2003 14:56:04 -0000	1.10
--- QueryJPanel.java	5 Nov 2003 13:28:26 -0000	1.11
***************
*** 8,13 ****
--- 8,15 ----
  import java.sql.Connection;
  import java.util.Map;
+ 
  import javax.swing.JPanel;
  import javax.swing.JTabbedPane;
+ 
  import net.sourceforge.queryviewer.Query;
  import net.sourceforge.queryviewer.QueryException;
***************
*** 64,87 ****
  
  	/**
-    * ne PLUS UTILISER CETTE METHODE
- 	 * @see net.sourceforge.queryviewer.ui.swing.ConnectionListener#jdbcConnection(java.sql.Connection)
-    * @deprecated use the Actions... {@link net.sourceforge.queryviewer.ui.event.AbstractAction}.
- 	 */
-   public void jdbcConnection(Connection connection) {
-     try {
-       this.it = new InfoTab(this.controlerFactory);
-       this.jtp.addTab(QueryJPanel.INFO_TAB, this.it);
-       Query q = new Query(new net.sourceforge.queryviewer.JDBCConnectionImpl(connection));
-       this.qt = new QueryTab(this.controlerFactory);
-       //TODO Attention à qui écoute qui et quoi?
-       //this.qt.addQueryListener(new JDBCQueryImpl(connection));
-       this.jtp.addTab(QueryJPanel.QUERY_TAB, this.qt);
-     } catch ( QueryException qex ) {
-       // ???
-     } // end of try-catch
- 
- 	}
- 
- 	/**
  	 * @see net.sourceforge.queryviewer.ui.swing.ConnectionListener#disconnected()
     * @deprecated NO MORE!
--- 66,69 ----
***************
*** 108,127 ****
    public ControlerFactory getControlerFactory() {
      return this.controlerFactory;
-   }
- 
-   /**
-    * Récupère les entrées utilisateur.
-    * @return les entrées utilisateur.
-    */
-   public Map getUserInputs() {
-     return null;
-   }
- 
-   /**
-    * Met à jour les entrées utilisateur.
-    * @param inputs les entrées utilisateur.
-    */
-   public void setUserInputs(Map inputs) {
- 
    }
  
--- 90,93 ----

Index: QueryTab.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/QueryTab.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** QueryTab.java	25 Jun 2003 14:51:34 -0000	1.7
--- QueryTab.java	5 Nov 2003 13:28:26 -0000	1.8
***************
*** 6,13 ****
  import java.awt.Component;
  import java.awt.GridLayout;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
  import java.util.HashMap;
  import java.util.Map;
  import javax.swing.JButton;
  import javax.swing.JPanel;
--- 6,12 ----
  import java.awt.Component;
  import java.awt.GridLayout;
  import java.util.HashMap;
  import java.util.Map;
+ 
  import javax.swing.JButton;
  import javax.swing.JPanel;
***************
*** 15,20 ****
  import javax.swing.JTable;
  import javax.swing.JTextField;
! import net.sourceforge.queryviewer.Query;
! import net.sourceforge.queryviewer.QueryException;
  import net.sourceforge.queryviewer.ui.ViewInfo;
  import net.sourceforge.queryviewer.ui.event.AbstractControler;
--- 14,18 ----
  import javax.swing.JTable;
  import javax.swing.JTextField;
! 
  import net.sourceforge.queryviewer.ui.ViewInfo;
  import net.sourceforge.queryviewer.ui.event.AbstractControler;
***************
*** 67,80 ****
  
    /**
-    * Récupère les entrées utilisateur.
-    * @return les entrées utilisateur.
-    */
-   public Map getUserInputs() {
-     Map m = new HashMap( 1 );
-     m.put( QueryActions.TF_QUERY_STRING, this.queryField.getText() );
-     return m;
-   }
- 
-   /**
     * Retourne le texte qu'il y a dans le composant <b>clé</b>.
     * @param key la clé {@link QueryActions#TF_QUERY_STRING}
--- 65,68 ----
***************
*** 87,98 ****
      } // end of if ()
      return result;
-   }
- 
-   /**
-    * Met à jour les entrées utilisateur.
-    * @param inputs les entrées utilisateur.
-    */
-   public void setUserInputs(Map inputs) {
-     this.queryField.setText( (String) inputs.get( QueryActions.TF_QUERY_STRING ) );
    }
  
--- 75,78 ----

Index: QueryTableModel.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/QueryTableModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QueryTableModel.java	22 Jun 2003 21:24:17 -0000	1.3
--- QueryTableModel.java	5 Nov 2003 13:28:26 -0000	1.4
***************
*** 6,10 ****
--- 6,12 ----
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
+ 
  import javax.swing.table.AbstractTableModel;
+ 
  import net.sourceforge.queryviewer.Query;