[queryviewer-devel] queryviewer/src/net/sourceforge/queryviewer/ui/swing ConnectionTab.java,1.1,1.2 Main.java,1.4,1.5 QueryJPanel.java,1.4,1.5

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

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

Modified Files:
	ConnectionTab.java Main.java QueryJPanel.java 
Log Message:
mises à jour...

Index: ConnectionTab.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/ConnectionTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectionTab.java	12 Jun 2003 07:43:35 -0000	1.1
--- ConnectionTab.java	16 Jun 2003 07:45:22 -0000	1.2
***************
*** 3,14 ****
  package net.sourceforge.queryviewer.ui.swing;
  
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.util.Vector;
! 
  import javax.swing.JPanel;
- 
  import net.sourceforge.queryviewer.ConnectionListener;
  import net.sourceforge.queryviewer.JDBCQueryImpl;
  
  /**
--- 3,18 ----
  package net.sourceforge.queryviewer.ui.swing;
  
+ import java.awt.FlowLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.util.Vector;
! import javax.swing.Action;
! import javax.swing.Box;
! import javax.swing.BoxLayout;
  import javax.swing.JPanel;
  import net.sourceforge.queryviewer.ConnectionListener;
  import net.sourceforge.queryviewer.JDBCQueryImpl;
+ import net.sourceforge.queryviewer.ui.ViewInfo;
+ import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  
  /**
***************
*** 17,84 ****
   * @version $Id$
   */
! public class ConnectionTab extends JPanel implements ActionListener {
  
- 	protected Vector listeners = new Vector();
- 	
  	/**
  	 * 
  	 */
! 	public ConnectionTab() {
! 		super(/*LayoutManager arg0*/);
! 		// TODO Constructeur du ConnectionTab
! 	}
  
! 	/**
! 	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
! 	 */
! 	public void actionPerformed(ActionEvent arg0) {
! 		// TODO Auto-generated method stub
  
! 	}
  
! 	/**
! 	 * Ajoute un écouteur de connexion.
! 	 * @param listener l'écouteur de connexion.
! 	 */
! 	public void addConnectionListener(ConnectionListener listener) {
! 		this.listeners.add(listener);
  	}
  
! 	/**
! 	 * 
! 	 * @return les écouteur de requêtes enregistrés
! 	 */
! 	public ConnectionListener[] getQueryListeners() {
! 		ConnectionListener[] ql = null;
! 		if(!this.listeners.isEmpty()) {
! 			ql = new ConnectionListener[this.listeners.size()];
! 			ql = (ConnectionListener[]) this.listeners.toArray(ql);
! 		}
! 		return ql;
! 	}
! 	
! 	/**
! 	 * 
! 	 * @param l'écouteur à supprimer
! 	 */
! 	public void removeConnectionListener(ConnectionListener ql) {
! 		if(!this.listeners.isEmpty()) {
! 			this.listeners.remove(ql);
! 		}
! 	}
  
! 	/**
! 	 * @param event
! 	 */
! 	protected void fireConnectionPerformed(java.sql.Connection connection) {
! 		if (!this.listeners.isEmpty()) {
! 			java.util.Iterator it = this.listeners.iterator();
! 			while(it.hasNext()) {
! 				ConnectionListener cl = (ConnectionListener)it.next();
! 				net.sourceforge.queryviewer.Connection qconn = new JDBCQueryImpl(connection);
! 				cl.connection(qconn);
! 			}
! 		}
! 	}
  
  }
--- 21,107 ----
   * @version $Id$
   */
! public class ConnectionTab extends JPanel implements ViewInfo {
! 
!   protected Map userInputs;
  
  	/**
  	 * 
  	 */
! 	public ConnectionTab( ControlerFactory controler ) {
! 		super( new BorderLayout( 1, 1 ) );
!     super.add( this.getNorth( controler ), BorderLayout.NORTH );
!     super.add( this.getCenter( controler ), BorderLayout.CENTER );
  
!     AbstractControler openConnection = controler.getAction( ControlerFactory.OPEN_CONNECTION );
!     openConnection.setViewInfo( this );
!     AbstractControler closeConnection = controler.getAction( ControlerFactory.CLOSE_CONNECTION );
!     closeConnection.setViewInfo( this );
  
! 		// TODO 
!     /*
!       exemple pour un driver jdbc
!       +------------------------------------------------+
!       |   +---------------------------------------+    |
!       |   | liste des types de connexions      \/ |    |
!       |   +---------------------------------------+    |
!       +------------------------------------------------+
!       |                                                |
!       |                                                |
!       |       JDBC Driver: ___________________         |
!       |       URL        : ___________________         |
!       |       Username   : ___________________         |
!       |       Password   : ___________________         |
!       |                                                |
!       |                                                |
!       |                                                |
!       |                                                |
!       |                                                |
!       +------------------------------------------------+
  
!     */
  	}
  
!   protected JPanel getNorth( ControlerFactory controler ) {
!     JPanel result = new JPanel( new FlowLayout( FlowLayout.CENTER ) );
!     result.add( new JLabel( "JDBC Driver") );
!     return result;
!   }
  
!   protected JPanel getCenter( ControlerFactory controler ) {
!     //TODO here is a cardLayout!
!     return getJDBCPanel( controler );
!   }
! 
!   protected JPanel getJDBCPanel( ControlerFactory controler ) {
!     /*
!       JDBC Driver: ___________________
!       URL        : ___________________
!       Username   : ___________________
!       Password   : ___________________
!     */
!     JPanel result = new JPanel( new GridLayout( 1, 1 ) );
!     Box b = new Box( BoxLayout.Y_AXIS );
! 
!     
! 
!     result.add( b );
!     return result;
!   }
! 
!   /**
!    * Get the UserInputs value.
!    * @return the UserInputs value.
!    */
!   public Map getUserInputs() {
!     return userInputs;
!   }
! 
!   /**
!    * Set the UserInputs value.
!    * @param newUserInputs The new UserInputs value.
!    */
!   public void setUserInputs(Map newUserInputs) {
!     this.userInputs = newUserInputs;
!   }
  
  }

Index: Main.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/Main.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Main.java	12 Jun 2003 07:43:35 -0000	1.4
--- Main.java	16 Jun 2003 07:45:22 -0000	1.5
***************
*** 3,15 ****
  package net.sourceforge.queryviewer.ui.swing;
  
  import java.awt.event.ActionEvent;
  import java.awt.event.WindowEvent;
! 
  import javax.swing.JFrame;
  import javax.swing.JMenuBar;
- 
  import net.sourceforge.queryviewer.QueryEvent;
  import net.sourceforge.queryviewer.QueryException;
  import net.sourceforge.queryviewer.QueryListener;
  
  /**
--- 3,20 ----
  package net.sourceforge.queryviewer.ui.swing;
  
+ 
+ 
  import java.awt.event.ActionEvent;
+ 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.QueryEvent;
  import net.sourceforge.queryviewer.QueryException;
  import net.sourceforge.queryviewer.QueryListener;
+ import net.sourceforge.queryviewer.ui.event.ControlerFactory;
+ import net.sourceforge.queryviewer.ui.event.ControlerFactory;
  
  /**
***************
*** 18,22 ****
   * @version $Id$
   */
! public class Main extends JFrame implements QueryListener {
  
  	/**
--- 23,27 ----
   * @version $Id$
   */
! public class Main extends JFrame {
  
  	/**
***************
*** 29,38 ****
  		super( "QueryViewer" );
  		setSize( 600, 500 );
! 		super.addWindowListener( new java.awt.event.WindowAdapter() {
  				public void windowClosing( WindowEvent e ) {System.exit(0);}
- 				public void windowOpened( WindowEvent e ) {}
  			});
! 		setJMenuBar( this.createMenu() );
! 		QueryJPanel qp = new QueryJPanel();
  		getContentPane().add( qp );
  	}
--- 34,42 ----
  		super( "QueryViewer" );
  		setSize( 600, 500 );
! 		super.addWindowListener( new WindowAdapter() {
  				public void windowClosing( WindowEvent e ) {System.exit(0);}
  			});
!     QueryJPanel qp = new QueryJPanel();
! 		setJMenuBar( this.createJMenu( qp.getControlerFactory()  ) );
  		getContentPane().add( qp );
  	}
***************
*** 42,62 ****
  	 * @return une JMenuBar
  	 */
! 	private JMenuBar createMenu() {
! 		javax.swing.JMenuBar mb = new javax.swing.JMenuBar();
! 		javax.swing.JMenu file = new javax.swing.JMenu( "File" );
! 		file.add( new javax.swing.AbstractAction( "Exit" ) {
  				public void actionPerformed(ActionEvent event) {
- 					System.exit(0);
  				}
! 			});
! 		mb.add( file );
! 		return mb;
! 	}
  
! 	/**
! 	 * @see net.sourceforge.queryviewer.QueryListener#queryPerformed(net.sourceforge.queryviewer.QueryEvent)
! 	 */
! 	public void queryPerformed(QueryEvent eve) throws QueryException {
! 		System.out.println("net.sourceforge.queryviewer.ui.swing.Main: OUPS!");
  	}
  
--- 46,83 ----
  	 * @return une JMenuBar
  	 */
! 	private JMenuBar createJMenu( ControlerFactory controler ) {
! 		JMenuBar mb = new JMenuBar();
! 		JMenu file = new JMenu( "File" );
! 		//file.add( controler.getAction( ControlerFactory.OPEN_CONNECTION ) );
! 		file.add( controler.getAction( ControlerFactory.CLOSE_CONNECTION ) );
! 		file.add( controler.getAction( ControlerFactory.CLOSE_CONNECTION ) );
! 
! 		mb.add( file );
! 
!     JMenu edition = new JMenu( "Edition" );
!     edition.add( new javax.swing.AbstractAction( "Couper" ) {
  				public void actionPerformed(ActionEvent event) {
  				}
!         public boolean isEnabled() { return false; }
! 			}); 
!     edition.add( new javax.swing.AbstractAction( "Copier" ) {
! 				public void actionPerformed(ActionEvent event) {
! 				}
!         public boolean isEnabled() { return false; }
! 			}); 
!     edition.add( new javax.swing.AbstractAction( "Coller" ) {
! 				public void actionPerformed(ActionEvent event) {
! 				}
!         public boolean isEnabled() { return false; }
! 			}); 
  
!     mb.add( edition );
! 
!     JMenu action = new JMenu( "Action" );
!     action.add( controler.getAction( ControlerFactory.EXECUTE_QUERY ) );
! 
!     mb.add( action );
! 
! 		return mb;
  	}
  

Index: QueryJPanel.java
===================================================================
RCS file: /cvsroot/queryviewer/queryviewer/src/net/sourceforge/queryviewer/ui/swing/QueryJPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryJPanel.java	12 Jun 2003 07:43:35 -0000	1.4
--- QueryJPanel.java	16 Jun 2003 07:45:22 -0000	1.5
***************
*** 3,13 ****
  package net.sourceforge.queryviewer.ui.swing;
  
  import java.awt.GridLayout;
  import java.sql.Connection;
- 
  import javax.swing.JPanel;
  import javax.swing.JTabbedPane;
- 
  import net.sourceforge.queryviewer.Query;
  
  /**
--- 3,14 ----
  package net.sourceforge.queryviewer.ui.swing;
  
+ 
+ 
  import java.awt.GridLayout;
  import java.sql.Connection;
  import javax.swing.JPanel;
  import javax.swing.JTabbedPane;
  import net.sourceforge.queryviewer.Query;
+ import net.sourceforge.queryviewer.ui.event.ControlFactory;
  
  /**
***************
*** 35,46 ****
  	protected QueryTab qt;
  	
  	
  	/**
  	 * Construction du panel principal. Ajouter dans un TabbedPane le premier tableau.
  	 */
! 	public QueryJPanel() {
  		super(new GridLayout( 1, 1 ));
  		this.jtp = new JTabbedPane();
! 		this.ct = new ConnectionTab();
  		// TODO Ajouter un  écouteur pour la connexion!
  		//this.ct.addConnectionListener(this);
--- 36,49 ----
  	protected QueryTab qt;
  	
+   protected ControlerFactory controlerFactory;
  	
  	/**
  	 * Construction du panel principal. Ajouter dans un TabbedPane le premier tableau.
  	 */
! 	public QueryJPanel( ) {
  		super(new GridLayout( 1, 1 ));
+     this.controlerFactory = new ControlerFactory();
  		this.jtp = new JTabbedPane();
! 		this.ct = new ConnectionTab( this.controlerFactory );
  		// TODO Ajouter un  écouteur pour la connexion!
  		//this.ct.addConnectionListener(this);
***************
*** 51,54 ****
--- 54,58 ----
  	/**
  	 * @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) {