Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi SinaviImplementation.java,1.6,1.7 SinaviDefinitionXmlListener.java,1.6,1.7 SinaviFilleTrajetBateau.java,1.5,1.6 SinaviReseauGridAdapter.java,1.6,1.7 SinaviBateauxParametres.java,1.6,1.7 SinaviFilleLoiAleatoireTrajet.java,1.6,1.7 SinaviFilleLoiDeterministeTrajet.java,1.7,1.8 SinaviReseauFrame.java,1.6,1.7
|
From: Frederic D. <de...@us...> - 2004-04-30 07:33:57
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5002/src/org/fudaa/fudaa/sinavi Modified Files: SinaviImplementation.java SinaviDefinitionXmlListener.java SinaviFilleTrajetBateau.java SinaviReseauGridAdapter.java SinaviBateauxParametres.java SinaviFilleLoiAleatoireTrajet.java SinaviFilleLoiDeterministeTrajet.java SinaviReseauFrame.java Log Message: Connexion automatique Index: SinaviImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviImplementation.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviImplementation.java 27 Apr 2004 16:10:41 -0000 1.6 --- SinaviImplementation.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 8,32 **** */ package org.fudaa.fudaa.sinavi; ! import java.awt.*; ! import java.util.*; ! import java.io.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import javax.swing.event.*; ! import org.fudaa.fudaa.commun.*; ! import org.fudaa.fudaa.commun.dodico.*; ! import com.memoire.bu.*; ! import com.memoire.dja.*; import com.memoire.fu.FuLib; ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.navigation.*; ! //import org.fudaa.dodico.navigation.*; import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.sinavi.*; ! import org.fudaa.dodico.objet.DService; /** * Implementation de l'application. --- 8,50 ---- */ package org.fudaa.fudaa.sinavi; ! import java.awt.Container; ! import java.awt.Dimension; ! import java.awt.event.ActionEvent; ! import java.util.Map; ! ! import com.memoire.bu.BuAssistant; ! import com.memoire.bu.BuBrowserPreferencesPanel; ! import com.memoire.bu.BuDesktopPreferencesPanel; ! import com.memoire.bu.BuDialogError; ! import com.memoire.bu.BuDialogMessage; ! import com.memoire.bu.BuGlassPaneStop; ! import com.memoire.bu.BuHelpFrame; ! import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInformationsSoftware; ! import com.memoire.bu.BuLanguagePreferencesPanel; ! import com.memoire.bu.BuMainPanel; ! import com.memoire.bu.BuMenu; ! import com.memoire.bu.BuMenuBar; ! import com.memoire.bu.BuPreferences; ! import com.memoire.bu.BuPreferencesFrame; ! import com.memoire.bu.BuPrinter; ! import com.memoire.bu.BuResource; ! import com.memoire.bu.BuScrollPane; ! import com.memoire.bu.BuTaskView; ! import com.memoire.bu.BuToolBar; ! import com.memoire.dja.DjaGridInteractive; ! import com.memoire.dja.DjaRegistry; import com.memoire.fu.FuLib; ! import org.fudaa.dodico.corba.navigation.IEtudeNavigationFluviale; ! import org.fudaa.dodico.corba.navigation.IServiceSinavi; ! import org.fudaa.dodico.corba.navigation.IServiceSinaviHelper; import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.navigation.DServiceSinavi; ! import org.fudaa.dodico.objet.UsineLib; ! import org.fudaa.fudaa.commun.FudaaImplementation; ! import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion; /** * Implementation de l'application. *************** *** 35,39 **** * @author Aline Marechalle , Franck Lejeune */ ! public class SinaviImplementation extends BuCommonImplementation { /** * .... --- 53,57 ---- * @author Aline Marechalle , Franck Lejeune */ ! public class SinaviImplementation extends FudaaImplementation { /** * .... *************** *** 311,315 **** // Application des préférences BuPreferences.BU.applyOn(this); - connecter(); //SinaviPreferences.SINAVI.applyOn(this); } --- 329,332 ---- *************** *** 348,353 **** else if (action.equals("VOIR_RESEAU")) voir_reseau(); - else if (action.equals("CONNECTER")) - connecter(); else if (action.equals("GENERER")) genererNavires(); --- 365,368 ---- *************** *** 418,423 **** // Création d'une nouvelle usine et d'un nouveau reseau ETUDE_SINAVI= ! BoonyLib.findUsine().creeNavigationEtudeNavigationFluviale(); ! ETUDE_SINAVI.reseau(BoonyLib.findUsine().creeNavigationReseauFluvial()); if (ETUDE_SINAVI == null) System.err.println("Etude nulle!!!!!"); --- 433,438 ---- // Création d'une nouvelle usine et d'un nouveau reseau ETUDE_SINAVI= ! UsineLib.findUsine().creeNavigationEtudeNavigationFluviale(); ! ETUDE_SINAVI.reseau(UsineLib.findUsine().creeNavigationReseauFluvial()); if (ETUDE_SINAVI == null) System.err.println("Etude nulle!!!!!"); *************** *** 497,508 **** * Création ou affichage de la fenetre pour les préférences. */ ! protected void preferences() { ! if (preferences_ == null) { preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuBrowserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); - } - addInternalFrame(preferences_); } /** --- 512,520 ---- * Création ou affichage de la fenetre pour les préférences. */ ! protected void buildPreferences() { preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuBrowserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); } /** *************** *** 563,567 **** */ protected void calculer() { ! if (!connecte()) { new BuDialogError( getApp(), --- 575,579 ---- */ protected void calculer() { ! if (!isConnected()) { new BuDialogError( getApp(), *************** *** 627,655 **** public void exit() { fermer(); - closeConnection(); super.exit(); } - public void finalize() { - closeConnection(); - } - private boolean connecte() { - boolean res= CONNEXION_SINAVI == null || SERVICE_SINAVI == null; - try { - res= res || !CONNEXION_SINAVI.connecte(); - } catch (org.omg.CORBA.SystemException ce) {} - if (res) - closeConnection(); - return !res; - } - private void closeConnection() { - if (CONNEXION_SINAVI != null) { - try { - SERVICE_SINAVI.deconnexion(CONNEXION_SINAVI); - } catch (org.omg.CORBA.SystemException ce) { - System.err.println("Unable to close connexion"); - } - CONNEXION_SINAVI= null; - } - } public boolean confirmExit() { return true; --- 639,644 ---- *************** *** 658,689 **** return false; } ! private void setInfoConnexion(FudaaInfoConnexion r) { ! SERVICE_SINAVI= IServiceSinaviHelper.narrow(r.SERVEUR); ! CONNEXION_SINAVI= r.CONNEXION; ! PERSONNE= r.PERSONNE; } ! protected void connecter() { ! if (connecte()) { ! new BuDialogMessage( ! getApp(), ! informationsSoftware(), ! "Vous êtes déjà connecté") ! .activate(); ! return; ! } ! setEnabledForAction("CONNECTER", false); ! final FudaaInfoConnexion r= ! FudaaImplementation.popConnexion( ! "navigation", ! "IServiceSinavi", ! this, ! informationsSoftware()); ! r.addChangeListener(new ChangeListener() { ! public void stateChanged(ChangeEvent e) { ! if (!r.errorOccurred()) ! setInfoConnexion(r); ! setEnabledForAction("CONNECTER", true); ! } ! }); } } --- 647,685 ---- return false; } ! /** ! * @see org.fudaa.fudaa.commun.FudaaImplementation#clearVariables() ! */ ! protected void clearVariables() { ! CONNEXION_SINAVI=null; ! SERVICE_SINAVI=null; } ! /** ! * @see org.fudaa.fudaa.commun.FudaaImplementation#getTacheConnexionMap() ! */ ! protected FudaaDodicoTacheConnexion[] getTacheConnexionMap() { ! FudaaDodicoTacheConnexion c=new FudaaDodicoTacheConnexion(SERVICE_SINAVI,CONNEXION_SINAVI); ! return new FudaaDodicoTacheConnexion[]{c}; ! } ! /** ! * @see org.fudaa.fudaa.commun.FudaaImplementation#getTacheDelegateClass() ! */ ! protected Class[] getTacheDelegateClass() { ! return new Class[]{DServiceSinavi.class}; ! } ! /** ! * @see org.fudaa.fudaa.commun.FudaaImplementation#initConnexions(java.util.Map) ! */ ! protected void initConnexions(Map _r) { ! FudaaDodicoTacheConnexion c=(FudaaDodicoTacheConnexion)_r.get(DServiceSinavi.class); ! CONNEXION_SINAVI=c.getPersonne(); ! SERVICE_SINAVI=IServiceSinaviHelper.narrow(c.getTache()); ! } ! ! ! /** ! * @see org.fudaa.fudaa.commun.FudaaCommonImplementation#getApplicationPreferences() ! */ ! public BuPreferences getApplicationPreferences() { ! return SinaviPreferences.SINAVIPREFS; } } Index: SinaviFilleLoiDeterministeTrajet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiDeterministeTrajet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SinaviFilleLoiDeterministeTrajet.java 27 Apr 2004 16:10:42 -0000 1.7 --- SinaviFilleLoiDeterministeTrajet.java 30 Apr 2004 07:33:17 -0000 1.8 *************** *** 17,22 **** import org.omg.CORBA.Object.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.objet.CDodico; /** --- 17,22 ---- import org.omg.CORBA.Object.*; import org.fudaa.dodico.corba.navigation.*; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 153,157 **** //FD:fin:temporaire if (loi_ == null) { ! loi_= BoonyLib.findUsine().creeNavigationGenerationDeterministe(); //loi_.definitInstants(instants_.toArray()); loi_.definitInstants(instantsLong); --- 153,157 ---- //FD:fin:temporaire if (loi_ == null) { ! loi_= UsineLib.findUsine().creeNavigationGenerationDeterministe(); //loi_.definitInstants(instants_.toArray()); loi_.definitInstants(instantsLong); Index: SinaviReseauGridAdapter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauGridAdapter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviReseauGridAdapter.java 27 Apr 2004 16:10:41 -0000 1.6 --- SinaviReseauGridAdapter.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 8,13 **** */ package org.fudaa.fudaa.sinavi; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.IGare; import com.memoire.bu.*; --- 8,13 ---- */ package org.fudaa.fudaa.sinavi; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; import org.fudaa.dodico.corba.navigation.IGare; import com.memoire.bu.*; *************** *** 51,55 **** } if (_evt.getObject() instanceof SinaviReseauGare) { ! BoonyLib.findUsine().supprimeNavigationGare( ((SinaviReseauGare)_evt.getObject()).getGare()); } --- 51,55 ---- } if (_evt.getObject() instanceof SinaviReseauGare) { ! UsineLib.findUsine().supprimeNavigationGare( ((SinaviReseauGare)_evt.getObject()).getGare()); } Index: SinaviBateauxParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauxParametres.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviBateauxParametres.java 27 Apr 2004 16:10:41 -0000 1.6 --- SinaviBateauxParametres.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 21,27 **** import org.omg.CORBA.Object.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.navigation.*; import org.fudaa.dodico.objet.CDodico; /** --- 21,27 ---- import org.omg.CORBA.Object.*; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.navigation.*; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 328,332 **** if (validBateauParametres()) { INavireType bateautemp_= ! BoonyLib.findUsine().creeNavigationNavireType(); setBateauParametres(bateautemp_); SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_); --- 328,332 ---- if (validBateauParametres()) { INavireType bateautemp_= ! UsineLib.findUsine().creeNavigationNavireType(); setBateauParametres(bateautemp_); SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_); Index: SinaviReseauFrame.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauFrame.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviReseauFrame.java 27 Apr 2004 16:10:42 -0000 1.6 --- SinaviReseauFrame.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 15,19 **** import javax.swing.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.navigation.*; --- 15,18 ---- *************** *** 122,126 **** */ public void ajouteGare() { ! IGare gare= BoonyLib.findUsine().creeNavigationGare(); SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare); grid_.add(new SinaviReseauGare(gare)); --- 121,125 ---- */ public void ajouteGare() { ! IGare gare= UsineLib.findUsine().creeNavigationGare(); SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare); grid_.add(new SinaviReseauGare(gare)); *************** *** 136,142 **** public void ajouteBief(DjaGridInteractive _grilleinteractive) { IBiefNavigation bief_= ! BoonyLib.findUsine().creeNavigationBiefNavigation(); bief_.regle( ! BoonyLib.findUsine().creeNavigationRegleNavigationFluviale()); if (_grilleinteractive.getSelection().size() == 2) { DjaObject obj1_= --- 135,141 ---- public void ajouteBief(DjaGridInteractive _grilleinteractive) { IBiefNavigation bief_= ! UsineLib.findUsine().creeNavigationBiefNavigation(); bief_.regle( ! UsineLib.findUsine().creeNavigationRegleNavigationFluviale()); if (_grilleinteractive.getSelection().size() == 2) { DjaObject obj1_= *************** *** 239,243 **** public void ajouteEcluse(DjaGridInteractive _grilleinteractive) { IEcluseFluviale eclusefluviale_= ! BoonyLib.findUsine().creeNavigationEcluseFluviale(); if (_grilleinteractive.getSelection().size() == 2) { DjaObject obj1_= --- 238,242 ---- public void ajouteEcluse(DjaGridInteractive _grilleinteractive) { IEcluseFluviale eclusefluviale_= ! UsineLib.findUsine().creeNavigationEcluseFluviale(); if (_grilleinteractive.getSelection().size() == 2) { DjaObject obj1_= Index: SinaviDefinitionXmlListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDefinitionXmlListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviDefinitionXmlListener.java 27 Apr 2004 16:10:42 -0000 1.6 --- SinaviDefinitionXmlListener.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 13,18 **** import org.omg.CORBA.Object.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.objet.CDodico; /** --- 13,18 ---- import org.omg.CORBA.Object.*; import org.fudaa.dodico.corba.navigation.*; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 70,74 **** if (_tag.equals("NAVIRE")) { navires_[nbcat_].addElement( ! BoonyLib.findUsine().creeNavigationNavireType()); nbnavire_++; } --- 70,74 ---- if (_tag.equals("NAVIRE")) { navires_[nbcat_].addElement( ! UsineLib.findUsine().creeNavigationNavireType()); nbnavire_++; } Index: SinaviFilleLoiAleatoireTrajet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiAleatoireTrajet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinaviFilleLoiAleatoireTrajet.java 27 Apr 2004 16:10:42 -0000 1.6 --- SinaviFilleLoiAleatoireTrajet.java 30 Apr 2004 07:33:17 -0000 1.7 *************** *** 16,21 **** import org.omg.CORBA.Object.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.objet.CDodico; /** --- 16,21 ---- import org.omg.CORBA.Object.*; import org.fudaa.dodico.corba.navigation.*; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 268,272 **** if (loi_ == null) { IGenerationJournaliereAleatoire creneauGenerationAleatoire_= ! BoonyLib .findUsine() .creeNavigationGenerationJournaliereAleatoire(); --- 268,272 ---- if (loi_ == null) { IGenerationJournaliereAleatoire creneauGenerationAleatoire_= ! UsineLib .findUsine() .creeNavigationGenerationJournaliereAleatoire(); Index: SinaviFilleTrajetBateau.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleTrajetBateau.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SinaviFilleTrajetBateau.java 27 Apr 2004 16:35:40 -0000 1.5 --- SinaviFilleTrajetBateau.java 30 Apr 2004 07:33:17 -0000 1.6 *************** *** 16,21 **** import org.omg.CORBA.Object.*; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.navigation.*; import org.fudaa.dodico.objet.CDodico; /** --- 16,21 ---- import org.omg.CORBA.Object.*; import org.fudaa.dodico.corba.navigation.*; + import org.fudaa.dodico.objet.UsineLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 128,132 **** && (lGaresCreees_.getSelectedValue() != null)) { ITrajetFluvial trajet_= ! BoonyLib.findUsine().creeNavigationTrajetFluvial(); trajet_.vitesse(((Double)tfVitesseBateau_.getValue()).doubleValue()); trajet_.gareArrivee( --- 128,132 ---- && (lGaresCreees_.getSelectedValue() != null)) { ITrajetFluvial trajet_= ! UsineLib.findUsine().creeNavigationTrajetFluvial(); trajet_.vitesse(((Double)tfVitesseBateau_.getValue()).doubleValue()); trajet_.gareArrivee( |
