[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/objet RequeteServeurDodicoGUI.java,1.2,1.3 ServeurPersonne.java,1.1,1.2 RequeteServeurDodicoTUI.java,1.1,1.2 DDiffuseur.java,1.2,1.3 DActivateur.java,1.1,1.2 CExec.java,1.1,1.2 RequeteServeurDodico.java,1.2,1.3

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv8222/dodico/src/org/fudaa/dodico/objet

Modified Files:
	RequeteServeurDodicoGUI.java ServeurPersonne.java 
	RequeteServeurDodicoTUI.java DDiffuseur.java DActivateur.java 
	CExec.java RequeteServeurDodico.java 
Log Message:
suppression des variables inutiles

Index: RequeteServeurDodicoGUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodicoGUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RequeteServeurDodicoGUI.java	21 Feb 2003 16:15:02 -0000	1.2
--- RequeteServeurDodicoGUI.java	18 Mar 2003 13:19:28 -0000	1.3
***************
*** 402,406 ****
    public static void main(String[] args)
    {
!     RequeteServeurDodicoGUI gui  = new RequeteServeurDodicoGUI("Requete serveur Dodico", new RequeteServeurDodico());
    }
  }
--- 402,406 ----
    public static void main(String[] args)
    {
!     new RequeteServeurDodicoGUI("Requete serveur Dodico", new RequeteServeurDodico());
    }
  }

Index: ServeurPersonne.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/ServeurPersonne.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ServeurPersonne.java	29 Jan 2003 12:14:25 -0000	1.1
--- ServeurPersonne.java	18 Mar 2003 13:19:28 -0000	1.2
***************
*** 57,61 ****
      }
  
!     ServeurPersonne s=new ServeurPersonne(args[0], args[1]);
  
      System.out.println("Personne server running... ");
--- 57,61 ----
      }
  
!     new ServeurPersonne(args[0], args[1]);
  
      System.out.println("Personne server running... ");

Index: RequeteServeurDodicoTUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodicoTUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequeteServeurDodicoTUI.java	29 Jan 2003 12:14:25 -0000	1.1
--- RequeteServeurDodicoTUI.java	18 Mar 2003 13:19:28 -0000	1.2
***************
*** 49,52 ****
--- 49,60 ----
      }
    }
+   
+   private static void outNewLine()
+   {
+     System.out.println("");
+   }
+  
+   
+  
  
  
***************
*** 55,59 ****
    {
      System.out.println("* Commandes        * Raccourcis   * Fonctions");
!     System.out.println("");
      System.out.println("* creeOrganisme    * co           * Creer un Organisme");
      System.out.println("* creePersonne     * cp           * Creer une Personne");
--- 63,67 ----
    {
      System.out.println("* Commandes        * Raccourcis   * Fonctions");
!     outNewLine();
      System.out.println("* creeOrganisme    * co           * Creer un Organisme");
      System.out.println("* creePersonne     * cp           * Creer une Personne");
***************
*** 67,71 ****
      System.out.println("* Aide             * ?            * Afficher cette liste");
      System.out.println("* quit             * q            * Quitter");
!     System.out.println("");
    }
  
--- 75,79 ----
      System.out.println("* Aide             * ?            * Afficher cette liste");
      System.out.println("* quit             * q            * Quitter");
!     outNewLine();
    }
  
***************
*** 75,79 ****
    {
      String[] r  = moteur_.listePersonne();
!     System.out.println("");
      System.out.println
        ("* Liste des Personnes **********************************************************");
--- 83,87 ----
    {
      String[] r  = moteur_.listePersonne();
!     outNewLine();
      System.out.println
        ("* Liste des Personnes **********************************************************");
***************
*** 81,85 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 89,93 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 116,124 ****
        }
      }
!     System.out.println("");
      print(moteur_.serveurEtat(idInt));
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 124,132 ----
        }
      }
!     outNewLine();
      print(moteur_.serveurEtat(idInt));
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 173,177 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 181,185 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 213,217 ****
      System.out.println
        ("*********************************************************************************");
!     System.out.println("");
    }
  
--- 221,225 ----
      System.out.println
        ("*********************************************************************************");
!     outNewLine();
    }
  
***************
*** 221,225 ****
    {
      String[] r  = moteur_.listeOrganisme();
!     System.out.println("");
      System.out.println
        ("Liste des Organismes ***********************************************************");
--- 229,233 ----
    {
      String[] r  = moteur_.listeOrganisme();
!     outNewLine();
      System.out.println
        ("Liste des Organismes ***********************************************************");
***************
*** 227,231 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 235,239 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 235,239 ****
    {
      String[] r  = moteur_.listeServeur();
!     System.out.println("");
      System.out.println
      ("Liste des Serveurs *************************************************************");
--- 243,247 ----
    {
      String[] r  = moteur_.listeServeur();
!     outNewLine();
      System.out.println
      ("Liste des Serveurs *************************************************************");
***************
*** 249,253 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 257,261 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 257,261 ****
    {
      String[] r  = moteur_.listeDisponible();
!     System.out.println("");
      System.out.println
        ("Liste des serveurs pouvant etre cree *******************************************");
--- 265,269 ----
    {
      String[] r  = moteur_.listeDisponible();
!     outNewLine();
      System.out.println
        ("Liste des serveurs pouvant etre cree *******************************************");
***************
*** 266,270 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 274,278 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 292,296 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
  
    }
--- 300,304 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
  
    }
***************
*** 319,323 ****
      System.out.println
        ("********************************************************************************");
!     System.out.println("");
    }
  
--- 327,331 ----
      System.out.println
        ("********************************************************************************");
!     outNewLine();
    }
  
***************
*** 335,339 ****
     *  } catch(IOException e) {}
     *  }
!    *  System.out.println("");
     *  System.out.println
     *  ("Etat du serveur Dodico-1 *******************************************************");
--- 343,347 ----
     *  } catch(IOException e) {}
     *  }
!    *  outNewLine();
     *  System.out.println
     *  ("Etat du serveur Dodico-1 *******************************************************");
***************
*** 386,390 ****
     *  {
     *  String[] r=moteur_.serverStatus();
!    *  System.out.println("");
     *  for(int i=0; i<r.length; i++) {
     *  System.out.println(r[i]);
--- 394,398 ----
     *  {
     *  String[] r=moteur_.serverStatus();
!    *  outNewLine();
     *  for(int i=0; i<r.length; i++) {
     *  System.out.println(r[i]);
***************
*** 392,396 ****
     *  System.out.println(
     *  "********************************************************************************");
!    *  System.out.println("");
     *  }
     */
--- 400,404 ----
     *  System.out.println(
     *  "********************************************************************************");
!    *  outNewLine();
     *  }
     */
***************
*** 406,414 ****
     *  }
     *  String[] r=moteur_.connectionStatus(cxid);
!    *  System.out.println("");
     *  for(int i=0; i<r.length; i++) {
     *  System.out.println(r[i]);
     *  }
!    *  System.out.println("");
     *  }
     */
--- 414,422 ----
     *  }
     *  String[] r=moteur_.connectionStatus(cxid);
!    *  outNewLine();
     *  for(int i=0; i<r.length; i++) {
     *  System.out.println(r[i]);
     *  }
!    *  outNewLine();
     *  }
     */
***************
*** 419,426 ****
    {
      RequeteServeurDodicoTUI tui  = new RequeteServeurDodicoTUI(new RequeteServeurDodico());
!     System.out.println("");
      System.out.println
        ("REQUETE SERVEUR DODICO *********************************************************");
!     System.out.println("");
      tui.usage();
  
--- 427,434 ----
    {
      RequeteServeurDodicoTUI tui  = new RequeteServeurDodicoTUI(new RequeteServeurDodico());
!     outNewLine();
      System.out.println
        ("REQUETE SERVEUR DODICO *********************************************************");
!     outNewLine();
      tui.usage();
  
***************
*** 492,499 ****
          else
          {
!           System.out.println("");
            System.out.println("    commande '" + cmd + "' inconnue");
            System.out.println(" Taper \"?\" pour la liste des commandes ");
!           System.out.println("");
          }
        }
--- 500,507 ----
          else
          {
!           outNewLine();
            System.out.println("    commande '" + cmd + "' inconnue");
            System.out.println(" Taper \"?\" pour la liste des commandes ");
!           outNewLine();
          }
        }

Index: DDiffuseur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DDiffuseur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DDiffuseur.java	21 Feb 2003 16:15:02 -0000	1.2
--- DDiffuseur.java	18 Mar 2003 13:19:28 -0000	1.3
***************
*** 42,45 ****
--- 42,51 ----
      return INSTANCE;
    }
+   
+   private static void outNewLine()
+   {
+     System.out.println("");
+   }
+ 
  
    public final int    CYCLE=2000; // ms
***************
*** 229,233 ****
    private synchronized void _internal_list()
    {
!     System.out.println("");
      System.out.println
      ("object *********************** state *** interfaces ******************");
--- 235,239 ----
    private synchronized void _internal_list()
    {
!     outNewLine();
      System.out.println
      ("object *********************** state *** interfaces ******************");
***************
*** 255,264 ****
      System.out.println
      ("**********************************************************************");
!     System.out.println("");
    }
  
    private synchronized void _internal_display()
    {
!     System.out.println("");
      System.out.println
      ("objects **************************************************************");
--- 261,270 ----
      System.out.println
      ("**********************************************************************");
!     outNewLine();
    }
  
    private synchronized void _internal_display()
    {
!     outNewLine();
      System.out.println
      ("objects **************************************************************");
***************
*** 266,270 ****
      {
        String k=(String)e.nextElement();
!       java.lang.Object o=objs_.get(k);
        String s=(iors_.get(k)==null ? "unbound" : "bound");
        String t=""+ttls_.get(k);
--- 272,276 ----
      {
        String k=(String)e.nextElement();
! //      java.lang.Object o=objs_.get(k);
        String s=(iors_.get(k)==null ? "unbound" : "bound");
        String t=""+ttls_.get(k);
***************
*** 280,284 ****
      ("**********************************************************************");
      }
!     System.out.println("");
    }
  
--- 286,290 ----
      ("**********************************************************************");
      }
!     outNewLine();
    }
  
***************
*** 943,947 ****
        if(listing&&interactive_)
        {
!         System.out.println("");
          _internal_list();
          if(!"".equals(info)) System.out.println(info);
--- 949,953 ----
        if(listing&&interactive_)
        {
!         outNewLine();
          _internal_list();
          if(!"".equals(info)) System.out.println(info);
***************
*** 1103,1107 ****
    public static void usage()
    {
!     System.out.println("");
      System.out.println("bind    : bind an ior to a name");
      System.out.println("display : display informations");
--- 1109,1113 ----
    public static void usage()
    {
!     outNewLine();
      System.out.println("bind    : bind an ior to a name");
      System.out.println("display : display informations");
***************
*** 1112,1124 ****
      System.out.println("toggle  : toggle log mode");
      System.out.println("unbind  : unbind an ior");
!     System.out.println("");
    }
  
    public static void main(String[] args)
    {
!     System.out.println("");
      System.out.println
      ("DISPATCHER ***********************************************************");
!     System.out.println("");
  
      instance();
--- 1118,1130 ----
      System.out.println("toggle  : toggle log mode");
      System.out.println("unbind  : unbind an ior");
!     outNewLine();
    }
  
    public static void main(String[] args)
    {
!     outNewLine();
      System.out.println
      ("DISPATCHER ***********************************************************");
!     outNewLine();
  
      instance();
***************
*** 1212,1224 ****
  	{
  	  interactive_=!interactive_;
! 	  System.out.println("");
  	  System.out.println("Log mode is "+(interactive_ ? "ON" : "OFF"));
! 	  System.out.println("");
  	}
  	else
  	{
! 	  System.out.println("");
  	  System.out.println("    command '"+cmd+"' not reconized");
! 	  System.out.println("");
  	}
        }
--- 1218,1230 ----
  	{
  	  interactive_=!interactive_;
! 	  outNewLine();
  	  System.out.println("Log mode is "+(interactive_ ? "ON" : "OFF"));
! 	  outNewLine();
  	}
  	else
  	{
! 	  outNewLine();
  	  System.out.println("    command '"+cmd+"' not reconized");
! 	  outNewLine();
  	}
        }
***************
*** 1227,1230 ****
--- 1233,1237 ----
    }
  }
+ 
  
  

Index: DActivateur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DActivateur.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DActivateur.java	29 Jan 2003 12:14:24 -0000	1.1
--- DActivateur.java	18 Mar 2003 13:19:28 -0000	1.2
***************
*** 96,99 ****
--- 96,105 ----
      objs_.put(_interface,_object);
    }
+   
+   private static void outNewLine()
+   {
+     System.out.println("");
+   }
+     
  
    private synchronized org.omg.CORBA.Object _internal_request
***************
*** 102,108 ****
      if(interactive_)
      {
!       System.out.println("");
        System.out.println("Request "+_interface);
!       System.out.println("");
      }
  
--- 108,114 ----
      if(interactive_)
      {
!       outNewLine();
        System.out.println("Request "+_interface);
!       outNewLine();
      }
  
***************
*** 189,193 ****
    private synchronized void _internal_list()
    {
!     System.out.println("");
      System.out.println
      ("interface ******************** mode *** informations *****************");
--- 195,199 ----
    private synchronized void _internal_list()
    {
!     outNewLine();
      System.out.println
      ("interface ******************** mode *** informations *****************");
***************
*** 225,234 ****
      System.out.println
      ("**********************************************************************");
!     System.out.println("");
    }
  
    private synchronized void _internal_process()
    {
!     System.out.println("");
      System.out.println
      ("process ********************** state ********** command **************");
--- 231,240 ----
      System.out.println
      ("**********************************************************************");
!     outNewLine();
    }
  
    private synchronized void _internal_process()
    {
!     outNewLine();
      System.out.println
      ("process ********************** state ********** command **************");
***************
*** 268,272 ****
      System.out.println
      ("**********************************************************************");
!     System.out.println("");
    }
  
--- 274,278 ----
      System.out.println
      ("**********************************************************************");
!     outNewLine();
    }
  
***************
*** 383,387 ****
    public static void usage()
    {
!     System.out.println("");
      System.out.println("class   : define a class");
      System.out.println("exec    : define an executable");
--- 389,393 ----
    public static void usage()
    {
!     outNewLine();
      System.out.println("class   : define a class");
      System.out.println("exec    : define an executable");
***************
*** 395,407 ****
      System.out.println("quit    : quit this software");
      System.out.println("toggle  : toggle log mode");
!     System.out.println("");
    }
  
    public static void main(String[] args)
    {
!     System.out.println("");
      System.out.println
      ("ACTIVATOR ************************************************************");
!     System.out.println("");
  
      interactive_=true;
--- 401,413 ----
      System.out.println("quit    : quit this software");
      System.out.println("toggle  : toggle log mode");
!     outNewLine();
    }
  
    public static void main(String[] args)
    {
!     outNewLine();
      System.out.println
      ("ACTIVATOR ************************************************************");
!     outNewLine();
  
      interactive_=true;
***************
*** 544,556 ****
  	{
  	  interactive_=!interactive_;
! 	  System.out.println("");
  	  System.out.println("Log mode is "+(interactive_ ? "ON" : "OFF"));
! 	  System.out.println("");
  	}
  	else
  	{
! 	  System.out.println("");
  	  System.out.println("    command '"+cmd+"' not reconized");
! 	  System.out.println("");
  	}
        }
--- 550,562 ----
  	{
  	  interactive_=!interactive_;
! 	  outNewLine();
  	  System.out.println("Log mode is "+(interactive_ ? "ON" : "OFF"));
! 	  outNewLine();
  	}
  	else
  	{
! 	  outNewLine();
  	  System.out.println("    command '"+cmd+"' not reconized");
! 	  outNewLine();
  	}
        }

Index: CExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CExec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CExec.java	29 Jan 2003 12:14:24 -0000	1.1
--- CExec.java	18 Mar 2003 13:19:28 -0000	1.2
***************
*** 442,460 ****
    }
  
-   /**
-    * Ferme simplement le buffer. Cette methode doit avoir pour resultat
-    * d'arreter le thread par lui-meme.
-    */
-   private void closeBuffer()
-   {
-     try
-     {
-       if (br_ != null)
-         br_.close();
-     }
-     catch (IOException e)
-     {
-     }
-   }
  
    /**
--- 442,445 ----

Index: RequeteServeurDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodico.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RequeteServeurDodico.java	21 Feb 2003 16:15:02 -0000	1.2
--- RequeteServeurDodico.java	18 Mar 2003 13:19:28 -0000	1.3
***************
*** 364,368 ****
      if(usine == null)
        return new String[]{"! Usine non trouvee"};
!     Vector v        = new Vector();
      IOrganisme org  = usine.creeObjetOrganisme();
      org.sigle(_nom);
--- 364,368 ----
      if(usine == null)
        return new String[]{"! Usine non trouvee"};
! //    Vector v        = new Vector();
      IOrganisme org  = usine.creeObjetOrganisme();
      org.sigle(_nom);
***************
*** 530,534 ****
    public String[] listeOrganismeSimple()
    {
-     Vector v                   = new Vector();
      org.omg.CORBA.Object[] lo  = _listObjet("::objet::IOrganisme");
      String[] r                 = new String[lo.length];
--- 530,533 ----