[Castore-commits] InterfaceGraphique.java 1.1 1.2

[Mohamed Yenje Ould Elkhadir]

Update of /cvsroot/castore/castore-applets/src/java/fr/emn/castor/applets/gestionWorkflows/applet
In directory adullact1:/tmp/cvs-serv2002/src/java/fr/emn/castor/applets/gestionWorkflows/applet

Modified Files:
	InterfaceGraphique.java 
Log Message:
optimisation de code

Index: InterfaceGraphique.java
===================================================================
RCS file: /cvsroot/castore/castore-applets/src/java/fr/emn/castor/applets/gestionWorkflows/applet/InterfaceGraphique.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceGraphique.java	18 Jul 2006 14:44:12 -0000	1.1
--- InterfaceGraphique.java	14 Aug 2006 08:12:45 -0000	1.2
***************
*** 60,63 ****
--- 60,64 ----
  import javax.swing.JOptionPane;
  import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
  import javax.swing.JTextField;
  import javax.swing.ListSelectionModel;
***************
*** 67,71 ****
   * (qui lui initialise avec les composants prinicipales).
   * 
!  * @author $Author$
   * @version $Revision$
   */
--- 68,72 ----
   * (qui lui initialise avec les composants prinicipales).
   * 
!  * @author $Mohamed$
   * @version $Revision$
   */
***************
*** 78,81 ****
--- 79,84 ----
  
      ModelWorkflow mf;
+     
+     ModelWorkflow md;
  
      /**
***************
*** 90,96 ****
  
      JPanel panel_centre = new JPanel();
- 
-     JPanel panel_fermeture = new JPanel();
- 
      /** 
       * panel central d'information sur un WF( visible qd on clique un id WF). 
--- 93,96 ----
***************
*** 118,122 ****
  
      final JButton annuler = new JButton("Annuler");
- 
      /**
       * declaration des champs de text
--- 118,121 ----
***************
*** 132,135 ****
--- 131,136 ----
  
      JInfoList liste;
+     
+     JScrollPane scrollPane;
  
      public String identifiant_Workflow;
***************
*** 143,146 ****
--- 144,148 ----
  
      {
+         scrollPane = new JScrollPane(panel_gauche,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED );
  
          mf = new ModelWorkflow();
***************
*** 377,383 ****
                           * la communication avec la servlet.
                           */
! 
                          try {
! 
                              URL url = new URL(
                                  "http://localhost:8080/castore/ServletGestionWorkflows?ajout=non&supprimer=oui");
--- 379,389 ----
                           * la communication avec la servlet.
                           */
!                     	if(!mf.getWFcourant().isUtilisé())
!                     		
!                     	{
!                     	
                          try {
!                     
!                         
                              URL url = new URL(
                                  "http://localhost:8080/castore/ServletGestionWorkflows?ajout=non&supprimer=oui");
***************
*** 410,414 ****
                                  .getInputStream());
  
!                             ModelWorkflow md = (ModelWorkflow) in
                                  .readObject();
  
--- 416,420 ----
                                  .getInputStream());
  
!                              md = (ModelWorkflow) in
                                  .readObject();
  
***************
*** 421,429 ****
                              System.out.println("classe non trouvée");
                          }
! 
                          liste.supprimerWF(mf.getIndexWFcourant());
  
!                         mf.SupprimerWFcourant();
! 
                          panelInfosWF.setVisible(false);
  
--- 427,444 ----
                              System.out.println("classe non trouvée");
                          }
!                       
                          liste.supprimerWF(mf.getIndexWFcourant());
  
!                         mf.SupprimerWFcourant();                 
!                              	
!                         }
!                         else
!                         	JOptionPane
!                             .showConfirmDialog(
!                             	 panelInfosWF,
!                                 "La suppression a été echouée car le workflow est en cours d'utilisation",
!                                 "suppression echouée",
!                                 JOptionPane.CLOSED_OPTION);
!                        
                          panelInfosWF.setVisible(false);
  
***************
*** 444,448 ****
  
          Build_panel_droite();
! 
      }
  
--- 459,464 ----
  
          Build_panel_droite();
!         
!         
      }
  
***************
*** 475,481 ****
      public void Build_panel_centre() {
  
!         panel_centre.setPreferredSize(new Dimension(680, 545));
  
!         panel_centre.setMaximumSize(new Dimension(680, 540));
  
          panel_centre.setLayout(new FlowLayout(0, 0, 0));
--- 491,497 ----
      public void Build_panel_centre() {
  
!         panel_centre.setPreferredSize(new Dimension(680, 550));
  
!         panel_centre.setMaximumSize(new Dimension(680, 550));
  
          panel_centre.setLayout(new FlowLayout(0, 0, 0));
***************
*** 515,519 ****
          panel_gauche.setBorder(BorderFactory.createLineBorder(Color.black));
  
!         panel_gauche.setPreferredSize(new Dimension(160, 200));
  
          panel_gauche.setLayout(new BorderLayout());
--- 531,535 ----
          panel_gauche.setBorder(BorderFactory.createLineBorder(Color.black));
  
!         scrollPane.setPreferredSize(new Dimension(160,200));
  
          panel_gauche.setLayout(new BorderLayout());
***************
*** 539,556 ****
          panel_principale.setLayout(new BorderLayout());
  
!         panel_principale.add(panel_gauche, BorderLayout.WEST);
  
          panel_principale.add(panel_droite, BorderLayout.CENTER);
  
-         panel_fermeture.setLayout(new FlowLayout(50, 400, 10));
- 
-         panel_fermeture.setBackground(Color.white);
- 
-         panel_fermeture
-             .setBorder(BorderFactory.createLineBorder(Color.gray));
- 
-         panel_principale.add(panel_fermeture, BorderLayout.SOUTH);
  
      }
  
  }
\ No newline at end of file
--- 555,568 ----
          panel_principale.setLayout(new BorderLayout());
  
!         panel_principale.add(scrollPane, BorderLayout.WEST);
  
          panel_principale.add(panel_droite, BorderLayout.CENTER);
  
  
      }
+     public void stop() {   
+ 	    System.exit(0);
+ 	}
+ 
  
  }
\ No newline at end of file