Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/hydraulique1d/ihmhelper Modified Files: Hydraulique1dIHM_Base.java Log Message: Modif DObjets Index: Hydraulique1dIHM_Base.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Base.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Hydraulique1dIHM_Base.java 8 Dec 2003 18:22:47 -0000 1.6 --- Hydraulique1dIHM_Base.java 27 Apr 2004 16:09:36 -0000 1.7 *************** *** 75,79 **** public void setEtude(IEtude1d _e) { etude_= _e; ! evtSupport_= new DObjetEventListenerSupport(); evtSupport_.clientListener(this); CDodico.findUsine().addObjetEventListener( --- 75,79 ---- public void setEtude(IEtude1d _e) { etude_= _e; ! evtSupport_= DObjetEventListenerSupport.createEventSupport(); evtSupport_.clientListener(this); CDodico.findUsine().addObjetEventListener( |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/hydraulique1d Modified Files: Hydraulique1dProjet.java Log Message: Modif DObjets Index: Hydraulique1dProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Hydraulique1dProjet.java 20 Feb 2004 19:30:23 -0000 1.8 --- Hydraulique1dProjet.java 27 Apr 2004 16:09:36 -0000 1.9 *************** *** 8,13 **** --- 8,17 ---- */ package org.fudaa.fudaa.hydraulique1d; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.hydraulique1d.*; + import org.fudaa.dodico.boony.BoonyXmlDeserializer; + import org.fudaa.dodico.boony.BoonyXmlSerializer; import org.fudaa.dodico.corba.hydraulique1d.*; + import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.hydraulique1d.*; import org.fudaa.fudaa.hydraulique1d.reseau.*; *************** *** 35,39 **** protected int etatMenu_= 0; protected File fichier_; ! private static String FORMAT_DJA_VERSION= "0.01"; protected Hydraulique1dProjet(){} --- 39,47 ---- protected int etatMenu_= 0; protected File fichier_; ! private static String FORMAT_DJA_VERSION= "0.02"; ! private static String FORMAT_DJA_VERSION_OLD_READER= "0.01"; ! private static String FORMAT_DJA_VERSION_NEW_READER= "0.02"; ! ! protected Hydraulique1dProjet(){} *************** *** 94,98 **** String versionEtude= "" + FluxLu.readChar() + FluxLu.readChar() + FluxLu.readChar(); ! if (ietude1d_.versionFormat().compareTo(versionEtude) > 0) { new BuDialogError( (BuCommonInterface)Hydraulique1dBaseApplication.FRAME, --- 102,110 ---- String versionEtude= "" + FluxLu.readChar() + FluxLu.readChar() + FluxLu.readChar(); ! if(versionEtude.equals(DEtude1d.FORMAT_VERSION_WITH_OLD_READER) && DEtude1d.FORMAT_VERSION.equals(DEtude1d.FORMAT_VERSION_WITH_NEW_READER)){ ! System.out.println("ancienne sauv"); ! if(CtuluLib.DEBUG) CtuluLib.debug("ancienne sauvegarde"); ! } ! else if (ietude1d_.versionFormat().compareTo(versionEtude) > 0) { new BuDialogError( (BuCommonInterface)Hydraulique1dBaseApplication.FRAME, *************** *** 122,131 **** .activate(); return false; ! } else { byte[] binaireEtudeServeur= new byte[FluxLu.readInt()]; FluxLu.read(binaireEtudeServeur); ! ietude1d_= ietude1d_.initFromByteArray(binaireEtudeServeur, true); binaireEtudeServeur= null; - } // initialisation de la fenêtre contenant le réseau hydraulique (DJA) String versionDJA= --- 134,143 ---- .activate(); return false; ! } ! byte[] binaireEtudeServeur= new byte[FluxLu.readInt()]; FluxLu.read(binaireEtudeServeur); ! ietude1d_= ietude1d_.initFromByteArray(binaireEtudeServeur, true,versionEtude); binaireEtudeServeur= null; // initialisation de la fenêtre contenant le réseau hydraulique (DJA) String versionDJA= *************** *** 135,139 **** + FluxLu.readChar() + FluxLu.readChar(); ! if (FORMAT_DJA_VERSION.compareTo(versionDJA) > 0) { new BuDialogError( (BuCommonInterface)Hydraulique1dBaseApplication.FRAME, --- 147,156 ---- + FluxLu.readChar() + FluxLu.readChar(); ! //special nouvelle version ! if(versionDJA.equals(FORMAT_DJA_VERSION_OLD_READER) && FORMAT_DJA_VERSION.equals(FORMAT_DJA_VERSION_NEW_READER)){ ! if(CtuluLib.DEBUG) ! CtuluLib.debug("Dja: Read old version"); ! } ! else if (FORMAT_DJA_VERSION.compareTo(versionDJA) > 0) { new BuDialogError( (BuCommonInterface)Hydraulique1dBaseApplication.FRAME, *************** *** 163,172 **** .activate(); return true; ! } else { byte[] binaireDja= new byte[FluxLu.readInt()]; FluxLu.read(binaireDja); ! initDjaFrameFromByteArray(binaireDja); etatMenu_= ietude1d_.etatMenu(); - } FluxLu.close(); } catch (IOException ex) { --- 180,188 ---- .activate(); return true; ! } byte[] binaireDja= new byte[FluxLu.readInt()]; FluxLu.read(binaireDja); ! initDjaFrameFromByteArray(binaireDja,versionDJA); etatMenu_= ietude1d_.etatMenu(); FluxLu.close(); } catch (IOException ex) { *************** *** 236,240 **** in.read(binaireEtude); in.close(); ! ietude1d_= ietude1d_.initFromByteArray(binaireEtude, false); if (fichierReseau != null) { // initialisation de la fenêtre contenant le réseau hydraulique (DJA) --- 252,262 ---- in.read(binaireEtude); in.close(); ! try{ ! ietude1d_= ietude1d_.initFromByteArray(binaireEtude, false,DEtude1d.FORMAT_VERSION); ! } ! catch( NoSuchElementException e){ ! if(ietude1d_==null) ! ietude1d_.initFromByteArray(binaireEtude, false,DEtude1d.FORMAT_VERSION_WITH_OLD_READER); ! } if (fichierReseau != null) { // initialisation de la fenêtre contenant le réseau hydraulique (DJA) *************** *** 245,249 **** FileInputStream fos= new FileInputStream(fichierReseau); fos.read(binaireDja); ! initDjaFrameFromByteArray(binaireDja); fos.close(); } --- 267,280 ---- FileInputStream fos= new FileInputStream(fichierReseau); fos.read(binaireDja); ! //on le met a null pour le test ! f_=null; ! try{ ! initDjaFrameFromByteArray(binaireDja,FORMAT_DJA_VERSION); ! } ! catch(Exception e){ ! //si prob on essaie avec l'ancien reader ! if(f_==null ) initDjaFrameFromByteArray(binaireDja,FORMAT_DJA_VERSION_OLD_READER); ! } ! fos.close(); } *************** *** 314,318 **** infosDja[3]= f_.getGrid().getObjects(); try { ! YapodSerializer fluxEcrit= new YapodXmlSerializer(); fluxEcrit.open(baos); fluxEcrit.write(infosDja); --- 345,349 ---- infosDja[3]= f_.getGrid().getObjects(); try { ! YapodSerializer fluxEcrit= new BoonyXmlSerializer(false); fluxEcrit.open(baos); fluxEcrit.write(infosDja); *************** *** 324,328 **** return baos.toByteArray(); } ! protected void initDjaFrameFromByteArray(byte[] buffer) { if (buffer == null) return; --- 355,359 ---- return baos.toByteArray(); } ! protected void initDjaFrameFromByteArray(byte[] buffer,String _version) { if (buffer == null) return; *************** *** 331,345 **** try { ByteArrayInputStream bais= new ByteArrayInputStream(buffer); ! YapodDeserializer fluxLu= new YapodXmlDeserializer(); fluxLu.open(bais); Object[] infosDja= (Object[])fluxLu.read(); fluxLu.close(); String version= ((String)infosDja[0]).trim(); ! if (FORMAT_DJA_VERSION.compareTo(version) > 0) { System.err.println("le format de fichier est désuet : "); System.err.println(" Version fichier DJA ou Mascaret : " + version); System.err.println( " Version actuel DJA ou Mascaret : " + FORMAT_DJA_VERSION); ! } else if (FORMAT_DJA_VERSION.compareTo(version) > 0) { System.err.println( "le fichier est incorrect (n° version impossible) : "); --- 362,384 ---- try { ByteArrayInputStream bais= new ByteArrayInputStream(buffer); ! boolean isOldVersionReader=(FORMAT_DJA_VERSION.equals(FORMAT_DJA_VERSION_NEW_READER)) && ((_version.compareTo(FORMAT_DJA_VERSION_OLD_READER)<=0)); ! YapodDeserializer fluxLu= null; ! if(isOldVersionReader){ ! System.out.println("Dja ancien reader"); ! fluxLu=new YapodXmlDeserializer(); ! } ! else{ ! fluxLu= new BoonyXmlDeserializer(false); ! } fluxLu.open(bais); Object[] infosDja= (Object[])fluxLu.read(); fluxLu.close(); String version= ((String)infosDja[0]).trim(); ! if (!isOldVersionReader && FORMAT_DJA_VERSION.compareTo(version) > 0) { System.err.println("le format de fichier est désuet : "); System.err.println(" Version fichier DJA ou Mascaret : " + version); System.err.println( " Version actuel DJA ou Mascaret : " + FORMAT_DJA_VERSION); ! } else if (FORMAT_DJA_VERSION.compareTo(version) < 0) { System.err.println( "le fichier est incorrect (n° version impossible) : "); |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/commun/undo Modified Files: FudaaUndoPaneFille.java Log Message: Modif DObjets Index: FudaaUndoPaneFille.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoPaneFille.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FudaaUndoPaneFille.java 31 Mar 2004 08:17:50 -0000 1.5 --- FudaaUndoPaneFille.java 27 Apr 2004 16:09:35 -0000 1.6 *************** *** 122,126 **** */ public void clearCmd(DodicoCommandManager _source) { - System.out.println("clear"); Component[] c= pane_.getComponents(); for (int j= c.length - 1; j >= 0; j--) { --- 122,125 ---- |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/commun Modified Files: FudaaImplementation.java Log Message: Modif DObjets Index: FudaaImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaImplementation.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FudaaImplementation.java 12 Dec 2003 10:58:40 -0000 1.10 --- FudaaImplementation.java 27 Apr 2004 16:09:34 -0000 1.11 *************** *** 232,235 **** --- 232,236 ---- int resp= serverSel.activate(); serverSel.dispose(); + //serverSel=null; if (resp == JOptionPane.CANCEL_OPTION) { *************** *** 240,243 **** --- 241,245 ---- return; } + connecter_setMessage(lb, /* dl,*/ FudaaResource.getS("Connexion au serveur") + espAppName + "..."); *************** *** 280,284 **** calculTemp= ICalculHelper.narrow(r.SERVEUR); } catch (org.omg.CORBA.BAD_PARAM _e) { - System.err.println("it isn't ICalcul"); } if (calculTemp != null) { --- 282,285 ---- |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589/src/org/fudaa/fudaa/hydraulique1d/editor Modified Files: Hydraulique1dParametresResultatsEditor.java Hydraulique1dCustomizer.java Log Message: Modif DObjets Index: Hydraulique1dCustomizer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Hydraulique1dCustomizer.java 25 Nov 2003 10:13:44 -0000 1.4 --- Hydraulique1dCustomizer.java 27 Apr 2004 16:09:34 -0000 1.5 *************** *** 87,91 **** setClosable(false); setModal(false); ! evtSupport_= new DObjetEventListenerSupport(); evtSupport_.clientListener(this); } --- 87,91 ---- setClosable(false); setModal(false); ! evtSupport_= DObjetEventListenerSupport.createEventSupport(); evtSupport_.clientListener(this); } Index: Hydraulique1dParametresResultatsEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsEditor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Hydraulique1dParametresResultatsEditor.java 12 Mar 2004 19:40:49 -0000 1.7 --- Hydraulique1dParametresResultatsEditor.java 27 Apr 2004 16:09:33 -0000 1.8 *************** *** 1,584 **** ! /* ! * @file Hydraulique1dParametresResultatsEditor.java ! * @creation 2000-12-04 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 EDF/LNHE ! * @mail de...@fu... ! */ ! package org.fudaa.fudaa.hydraulique1d.editor; ! import org.fudaa.dodico.corba.objet.*; [...1139 lines suppressed...] ! else ! cbVitesselitMin_.setSelected(false); ! if (param_.existeVariable("ZREF")) ! cbCoteFond_.setSelected(true); ! else ! cbCoteFond_.setSelected(false); ! if (param_.existeVariable("Z")) ! cbCoteEau_.setSelected(true); ! else ! cbCoteEau_.setSelected(false); ! if (param_.existeVariable("QMIN")) ! cbDebitMineur_.setSelected(true); ! else ! cbDebitMineur_.setSelected(false); ! if (param_.existeVariable("QMAJ")) ! cbDebitMajeur_.setSelected(true); ! else ! cbDebitMajeur_.setSelected(false); ! } ! } |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:04
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/utilitaire In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1468/src/org/fudaa/dodico/utilitaire Modified Files: DGestionnaireMessages.java DUtilitaire.java Log Message: Modif DObjets Index: DUtilitaire.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/utilitaire/DUtilitaire.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DUtilitaire.java 25 Nov 2003 10:12:05 -0000 1.5 --- DUtilitaire.java 27 Apr 2004 16:08:55 -0000 1.6 *************** *** 1,3 **** ! /* * @file DUtilitaire.java * @creation 2001-07-13 --- 1,3 ---- ! /** * @file DUtilitaire.java * @creation 2001-07-13 *************** *** 8,14 **** */ package org.fudaa.dodico.utilitaire; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.utilitaire.*; /** * Classe de base. --- 8,14 ---- */ package org.fudaa.dodico.utilitaire; ! import org.fudaa.dodico.corba.utilitaire.IUtilitaire; ! import org.fudaa.dodico.corba.utilitaire.IUtilitaireOperations; ! import org.fudaa.dodico.objet.DObjet; /** * Classe de base. *************** *** 17,21 **** * @author Axel von Arnim */ ! public class DUtilitaire extends DObjet implements IUtilitaireOperations { public DUtilitaire() { super(); --- 17,21 ---- * @author Axel von Arnim */ ! public class DUtilitaire extends DObjet implements IUtilitaire,IUtilitaireOperations { public DUtilitaire() { super(); Index: DGestionnaireMessages.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/utilitaire/DGestionnaireMessages.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DGestionnaireMessages.java 25 Nov 2003 10:12:04 -0000 1.6 --- DGestionnaireMessages.java 27 Apr 2004 16:08:54 -0000 1.7 *************** *** 1,3 **** ! /* * @file DGestionnaireMessages.java * @creation 1998-06-10 --- 1,3 ---- ! /** * @file DGestionnaireMessages.java * @creation 1998-06-10 *************** *** 10,13 **** --- 10,15 ---- import java.util.Date; import java.util.Vector; + + import org.fudaa.dodico.corba.utilitaire.IGestionnaireMessages; import org.fudaa.dodico.corba.utilitaire.IGestionnaireMessagesOperations; import org.fudaa.dodico.objet.CDodico; *************** *** 21,25 **** public class DGestionnaireMessages extends DUtilitaire ! implements IGestionnaireMessagesOperations { protected Vector v; public DGestionnaireMessages() { --- 23,27 ---- public class DGestionnaireMessages extends DUtilitaire ! implements IGestionnaireMessages,IGestionnaireMessagesOperations { protected Vector v; public DGestionnaireMessages() { |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:04
|
Update of /cvsroot/fudaa/fudaa_devel/dodico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1468 Modified Files: build.xml Log Message: Modif DObjets Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 10 Mar 2004 09:08:35 -0000 1.13 --- build.xml 27 Apr 2004 16:08:55 -0000 1.14 *************** *** 348,355 **** <srcfileset dir="${dodico.idl.dir}" includes="**/*.idl"/> <srcfileset dir="${dodico.src.dir}" includes="**/D*.java,**/genereUsine.java" ! excludes="usine,test"/> ! <targetfilelist dir="${dodico.idl.dir}/general/" files="usine.idl"/> ! <targetfilelist dir="${dodico.src.dir}/org/fudaa/dodico/usine/" files="DUsine.java"/> </dependset> <echo> --- 348,358 ---- <srcfileset dir="${dodico.idl.dir}" includes="**/*.idl"/> <srcfileset dir="${dodico.src.dir}" includes="**/D*.java,**/genereUsine.java" ! excludes="boony,test"/> ! <targetfilelist dir="${dodico.idl.dir}/general/" files="boony.idl"/> ! <targetfilelist dir="${dodico.src.dir}/org/fudaa/dodico/boony/" files="DUsine.java"/> ! <!--Temporaire pour effacer les anciens paquetages--> ! <targetfilelist dir="${dodico.idl.dir}/general/" files="usine.idl"/> ! <targetfilelist dir="${dodico.java.genere.dir}/org/fudaa/dodico/usine"/> </dependset> <echo> *************** *** 358,368 **** </echo> <usine ! idlDest="${dodico.idl.dir}/general/usine.idl" pkgPrefixImpl="org.fudaa.dodico" pkgPrefixCorba="org.fudaa.dodico.corba" ! javaDest="${dodico.src.dir}/org/fudaa/dodico/usine/DUsine.java" javaPrefix="D" idlPrefix="I"> <idlFic dir="${dodico.idl.dir}" includes="**/*.idl"/> ! <javaImplDir dir="${dodico.src.dir}/org/fudaa/dodico" includes="**/*,*" excludes="usine,ant,test"/> </usine> </target> --- 361,371 ---- </echo> <usine ! idlDest="${dodico.idl.dir}/general/boony.idl" pkgPrefixImpl="org.fudaa.dodico" pkgPrefixCorba="org.fudaa.dodico.corba" ! javaDest="${dodico.src.dir}/org/fudaa/dodico/boony/DUsine.java" javaPrefix="D" idlPrefix="I"> <idlFic dir="${dodico.idl.dir}" includes="**/*.idl"/> ! <javaImplDir dir="${dodico.src.dir}/org/fudaa/dodico" includes="**/*,*" excludes="boony,ant,test"/> </usine> </target> *************** *** 400,406 **** ---DODICO: dans ${dodico.java.genere.dir} --- </echo> <idlj i="${dodico.idl.dir}" verbose="false" td="${dodico.java.genere.dir}" f="allTIE" defaultPkgPrefix="${defaultPkgPrefix}" oldImplBase="true" ! keep="test" dependance="true" dependanceFile="${dodico.java.genere.dir}/dependances.txt"> <fileset dir="${dodico.idl.dir}" includes="*/*.idl"/> <pkgPrefix t="CosNaming" prefix="org.omg"/> --- 403,419 ---- ---DODICO: dans ${dodico.java.genere.dir} --- </echo> + <!--Essai de fred--> + <!--OLD <idlj i="${dodico.idl.dir}" verbose="false" td="${dodico.java.genere.dir}" f="allTIE" defaultPkgPrefix="${defaultPkgPrefix}" oldImplBase="true" ! keep="test" dependance="true" dependanceFile="${dodico.java.genere.dir}/dependances.txt" ! > ! --> ! ! <idlj i="${dodico.idl.dir}" verbose="false" td="${dodico.java.genere.dir}" f="allTIE" ! defaultPkgPrefix="${defaultPkgPrefix}" tieName="%_Tie" ! keep="test" dependance="true" dependanceFile="${dodico.java.genere.dir}/dependances.txt" ! ! > <fileset dir="${dodico.idl.dir}" includes="*/*.idl"/> <pkgPrefix t="CosNaming" prefix="org.omg"/> |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:09:04
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1468/src/org/fudaa/dodico/vag Modified Files: DCalculVag.java ServeurVag.java DResultatsVag.java DParametresVag.java VagClient.java Log Message: Modif DObjets Index: VagClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/VagClient.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VagClient.java 25 Nov 2003 10:12:05 -0000 1.4 --- VagClient.java 27 Apr 2004 16:08:53 -0000 1.5 *************** *** 8,16 **** */ package org.fudaa.dodico.vag; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.corba.vag.*; ! import java.io.*; /** * Une classe client de VagServeur --- 8,25 ---- */ package org.fudaa.dodico.vag; ! import java.io.File; ! import java.io.FileWriter; ! import java.io.IOException; ! ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.vag.ICalculVag; ! import org.fudaa.dodico.corba.vag.ICalculVagHelper; ! import org.fudaa.dodico.corba.vag.IParametresVag; ! import org.fudaa.dodico.corba.vag.IParametresVagHelper; ! import org.fudaa.dodico.corba.vag.IResultatsVag; ! import org.fudaa.dodico.corba.vag.IResultatsVagHelper; ! import org.fudaa.dodico.corba.vag.SResultats05; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.ServeurPersonne; /** * Une classe client de VagServeur Index: ServeurVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/ServeurVag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurVag.java 25 Nov 2003 10:12:05 -0000 1.5 --- ServeurVag.java 27 Apr 2004 16:08:53 -0000 1.6 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.vag; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 20,25 **** String nom= (args.length > 0 ? args[0] : CDodico.generateName("::vag::ICalculVag")); ! DCalculVag s= new DCalculVag(); ! CDodico.rebind(nom, s.tie()); System.out.println("Vag server running... "); System.out.println("Name: " + nom); --- 22,28 ---- String nom= (args.length > 0 ? args[0] : CDodico.generateName("::vag::ICalculVag")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculVag.class)); System.out.println("Vag server running... "); System.out.println("Name: " + nom); Index: DCalculVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DCalculVag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DCalculVag.java 25 Nov 2003 10:12:05 -0000 1.4 --- DCalculVag.java 27 Apr 2004 16:08:53 -0000 1.5 *************** *** 1,3 **** ! /* * @file DCalculVag.java * @creation 1998-08-11 --- 1,3 ---- ! /** * @file DCalculVag.java * @creation 1998-08-11 *************** *** 8,19 **** */ package org.fudaa.dodico.vag; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.vag.*; ! import org.fudaa.dodico.fortran.*; /** * Classe Calcul de Vag --- 8,22 ---- */ package org.fudaa.dodico.vag; ! import java.io.File; ! import java.io.IOException; ! ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.vag.ICalculVag; ! import org.fudaa.dodico.corba.vag.ICalculVagOperations; ! import org.fudaa.dodico.corba.vag.IParametresVag; ! import org.fudaa.dodico.corba.vag.IResultatsVag; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** * Classe Calcul de Vag *************** *** 22,26 **** * @author Axel von Arnim */ ! public class DCalculVag extends DCalcul implements ICalculVagOperations { public DCalculVag() { super(); --- 25,29 ---- * @author Axel von Arnim */ ! public class DCalculVag extends DCalcul implements ICalculVag,ICalculVagOperations { public DCalculVag() { super(); Index: DResultatsVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DResultatsVag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DResultatsVag.java 25 Nov 2003 10:12:05 -0000 1.4 --- DResultatsVag.java 27 Apr 2004 16:08:53 -0000 1.5 *************** *** 1,3 **** ! /* * @file DResultatsVag.java * @creation 1998-03-12 --- 1,3 ---- ! /** * @file DResultatsVag.java * @creation 1998-03-12 *************** *** 8,20 **** */ package org.fudaa.dodico.vag; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.mathematiques.*; ! import org.fudaa.dodico.corba.vag.*; /** * Les resultats Lido --- 8,28 ---- */ package org.fudaa.dodico.vag; ! import java.io.FileInputStream; ! import java.io.FileReader; ! import java.io.IOException; ! ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.vag.IResultatsVag; ! import org.fudaa.dodico.corba.vag.IResultatsVagOperations; ! import org.fudaa.dodico.corba.vag.SResultatPasCalcul05; ! import org.fudaa.dodico.corba.vag.SResultatPasInterOrth; ! import org.fudaa.dodico.corba.vag.SResultatUnitaire05; ! import org.fudaa.dodico.corba.vag.SResultatUnitaireInterOrth; ! import org.fudaa.dodico.corba.vag.SResultats05; ! import org.fudaa.dodico.corba.vag.SResultatsInterOrth; ! import org.fudaa.dodico.corba.vag.SResultatsOUT; ! import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.mathematiques.CMathReel; ! import org.fudaa.dodico.objet.CDodico; /** * Les resultats Lido *************** *** 25,29 **** public class DResultatsVag extends DResultats ! implements IResultatsVagOperations { private String noEtude; private String path; --- 33,37 ---- public class DResultatsVag extends DResultats ! implements IResultatsVag,IResultatsVagOperations { private String noEtude; private String path; Index: DParametresVag.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DParametresVag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DParametresVag.java 12 Dec 2003 10:30:55 -0000 1.5 --- DParametresVag.java 27 Apr 2004 16:08:53 -0000 1.6 *************** *** 1,3 **** ! /* * @file DParametresVag.java * @creation 1998-08-12 --- 1,3 ---- ! /** * @file DParametresVag.java * @creation 1998-08-12 *************** *** 18,24 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.corba.vag.IParametresVagOperations; import org.fudaa.dodico.corba.vag.SParametres01; --- 18,23 ---- import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.vag.IParametresVag; import org.fudaa.dodico.corba.vag.IParametresVagOperations; import org.fudaa.dodico.corba.vag.SParametres01; *************** *** 39,43 **** public class DParametresVag extends DParametres ! implements IParametresVagOperations { private SParametres01 params01= null; private SParametres02 params02= null; --- 38,42 ---- public class DParametresVag extends DParametres ! implements IParametresVag,IParametresVagOperations { private SParametres01 params01= null; private SParametres02 params02= null; |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:36
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/taucomac Modified Files: DParametresTaucomac.java DResultatsTaucomac.java ServeurTaucomac.java DCalculTaucomac.java Log Message: Modif DObjets Index: ServeurTaucomac.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/ServeurTaucomac.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ServeurTaucomac.java 25 Nov 2003 10:11:56 -0000 1.4 --- ServeurTaucomac.java 27 Apr 2004 16:07:57 -0000 1.5 *************** *** 8,16 **** */ package org.fudaa.dodico.taucomac; ! import java.net.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.lido.*; /** * Une classe serveur pour Taucomac --- 8,15 ---- */ package org.fudaa.dodico.taucomac; ! import java.util.Date; ! ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.objet.CDodico; /** * Une classe serveur pour Taucomac *************** *** 25,30 **** ? args[0] : CDodico.generateName("::taucomac::ICalculTaucomac")); ! DCalculTaucomac s= new DCalculTaucomac(); ! CDodico.rebind(nom, s.tie()); System.out.println("Seuil server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::taucomac::ICalculTaucomac")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculTaucomac.class)); System.out.println("Seuil server running... "); System.out.println("Name: " + nom); Index: DResultatsTaucomac.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DResultatsTaucomac.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DResultatsTaucomac.java 25 Nov 2003 10:11:56 -0000 1.6 --- DResultatsTaucomac.java 27 Apr 2004 16:07:57 -0000 1.7 *************** *** 1,3 **** ! /* * @file DResultatsTaucomac.java * @creation 2000-07-19 --- 1,3 ---- ! /** * @file DResultatsTaucomac.java * @creation 2000-07-19 *************** *** 8,19 **** */ package org.fudaa.dodico.taucomac; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.taucomac.*; /**TaucomacSeuil * --- 8,20 ---- */ package org.fudaa.dodico.taucomac; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.taucomac.IResultatsTaucomac; ! import org.fudaa.dodico.corba.taucomac.IResultatsTaucomacOperations; ! import org.fudaa.dodico.corba.taucomac.SResultatsTAU; /**TaucomacSeuil * *************** *** 23,27 **** public class DResultatsTaucomac extends DResultats ! implements IResultatsTaucomacOperations { private SResultatsTAU resultsTAU= null; public DResultatsTaucomac() { --- 24,28 ---- public class DResultatsTaucomac extends DResultats ! implements IResultatsTaucomac,IResultatsTaucomacOperations { private SResultatsTAU resultsTAU= null; public DResultatsTaucomac() { Index: DCalculTaucomac.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DCalculTaucomac.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DCalculTaucomac.java 25 Nov 2003 10:11:56 -0000 1.6 --- DCalculTaucomac.java 27 Apr 2004 16:07:57 -0000 1.7 *************** *** 1,3 **** ! /* * @file DCalculTaucomac.java * @creation 2000-07-20 --- 1,3 ---- ! /** * @file DCalculTaucomac.java * @creation 2000-07-20 *************** *** 8,19 **** */ package org.fudaa.dodico.taucomac; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.taucomac.*; ! import org.fudaa.dodico.fortran.*; /** * Classe Calcul de Taucomac --- 8,22 ---- */ package org.fudaa.dodico.taucomac; ! import java.io.File; ! ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.taucomac.ICalculTaucomac; ! import org.fudaa.dodico.corba.taucomac.ICalculTaucomacOperations; ! import org.fudaa.dodico.corba.taucomac.IParametresTaucomac; ! import org.fudaa.dodico.corba.taucomac.IResultatsTaucomac; ! import org.fudaa.dodico.corba.taucomac.SResultatsTAU; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** * Classe Calcul de Taucomac *************** *** 24,28 **** public class DCalculTaucomac extends DCalcul ! implements ICalculTaucomacOperations { public DCalculTaucomac() { super(); --- 27,31 ---- public class DCalculTaucomac extends DCalcul ! implements ICalculTaucomac,ICalculTaucomacOperations { public DCalculTaucomac() { super(); Index: DParametresTaucomac.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/taucomac/DParametresTaucomac.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DParametresTaucomac.java 25 Nov 2003 10:11:56 -0000 1.6 --- DParametresTaucomac.java 27 Apr 2004 16:07:57 -0000 1.7 *************** *** 1,3 **** ! /* * @file DParametresSeuil.java * @creation 2000-05-26 --- 1,3 ---- ! /** * @file DParametresSeuil.java * @creation 2000-05-26 *************** *** 24,28 **** public class DParametresTaucomac extends DParametres ! implements IParametresTaucomacOperations { static String chainw; private SParametresTAU paramsTAU= null; --- 24,28 ---- public class DParametresTaucomac extends DParametres ! implements IParametresTaucomac,IParametresTaucomacOperations { static String chainw; private SParametresTAU paramsTAU= null; |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:23
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simboat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/simboat Modified Files: ServeurSimboat.java DSimulateurSimboat.java Log Message: Modif DObjets Index: ServeurSimboat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simboat/ServeurSimboat.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ServeurSimboat.java 25 Nov 2003 10:11:54 -0000 1.6 --- ServeurSimboat.java 27 Apr 2004 16:08:00 -0000 1.7 *************** *** 9,15 **** package org.fudaa.dodico.simboat; import java.util.Date; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.objet.ServeurPersonne; - import org.fudaa.dodico.usine.UsineHelper; /** * Classe Serveur de Simboat. --- 9,15 ---- package org.fudaa.dodico.simboat; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** * Classe Serveur de Simboat. *************** *** 25,41 **** */ public static void main(String[] args) { String nom= (args.length > 0 ? args[0] : CDodico.generateName("::simboat::ISimulateurSimboat")); ! DSimulateurSimboat sim= new DSimulateurSimboat(); ! CDodico.rebind(nom, sim.tie()); ! //essai de fred deniger ! UsineHelper.creeUsineLocale(); ! //fin essai ! ServeurPersonne sp= ! new ServeurPersonne("test-personne-simboat", "test-organisme-simboat"); ! sim.setUtilisateur(sp.p); ! sim.simule(); System.out.println("Simboat server running... "); System.out.println("Name: " + nom); --- 25,38 ---- */ public static void main(String[] args) { + //essai a distance + BoonyLib.setAllLocal(false); String nom= (args.length > 0 ? args[0] : CDodico.generateName("::simboat::ISimulateurSimboat")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DSimulateurSimboat.class)); ! System.out.println("Simboat server running... "); System.out.println("Name: " + nom); Index: DSimulateurSimboat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simboat/DSimulateurSimboat.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSimulateurSimboat.java 25 Nov 2003 10:11:54 -0000 1.5 --- DSimulateurSimboat.java 27 Apr 2004 16:08:00 -0000 1.6 *************** *** 1,3 **** ! /* * @file DSimulateurSimboat.java * @creation 2001-02-01 --- 1,3 ---- ! /** * @file DSimulateurSimboat.java * @creation 2001-02-01 *************** *** 25,29 **** public class DSimulateurSimboat extends DSimulateur ! implements ISimulateurSimboatOperations { //private int numeroSession_; IPersonne personne_= null; --- 25,29 ---- public class DSimulateurSimboat extends DSimulateur ! implements ISimulateurSimboat,ISimulateurSimboatOperations { //private int numeroSession_; IPersonne personne_= null; *************** *** 588,590 **** --- 588,602 ---- } } + /** + * @see org.fudaa.dodico.corba.simboat.ISimulateurSimboatOperations#utilisateur() + */ + public IPersonne utilisateur() { + return personne_; + } + /** + * @see org.fudaa.dodico.corba.simboat.ISimulateurSimboatOperations#utilisateur(org.fudaa.dodico.corba.objet.IPersonne) + */ + public void utilisateur(IPersonne _newUtilisateur) { + setUtilisateur(_newUtilisateur); + } } |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:23
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/sipor Modified Files: ServeurSipor.java DResultatsSipor.java DParametresSipor.java DCalculSipor.java Log Message: Modif DObjets Index: DParametresSipor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DParametresSipor.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DParametresSipor.java 25 Nov 2003 10:11:55 -0000 1.7 --- DParametresSipor.java 27 Apr 2004 16:07:59 -0000 1.8 *************** *** 1,3 **** ! /* * @file DParametresSipor.java * @creation 1999-09-17 --- 1,3 ---- ! /** * @file DParametresSipor.java * @creation 1999-09-17 *************** *** 10,14 **** --- 10,16 ---- import java.io.FileWriter; import java.io.IOException; + import org.fudaa.dodico.calcul.DParametres; + import org.fudaa.dodico.corba.sipor.IParametresSipor; import org.fudaa.dodico.corba.sipor.IParametresSiporOperations; import org.fudaa.dodico.corba.sipor.SParametresBassin; *************** *** 30,34 **** public class DParametresSipor extends DParametres ! implements IParametresSiporOperations { /** * .... --- 32,36 ---- public class DParametresSipor extends DParametres ! implements IParametresSipor,IParametresSiporOperations { /** * .... Index: ServeurSipor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/ServeurSipor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurSipor.java 25 Nov 2003 10:11:55 -0000 1.5 --- ServeurSipor.java 27 Apr 2004 16:07:59 -0000 1.6 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.sipor; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::sipor::ICalculSipor")); ! DCalculSipor s= new DCalculSipor(); ! CDodico.rebind(nom, s.tie()); System.out.println("Sipor server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::sipor::ICalculSipor")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cete Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculSipor.class)); System.out.println("Sipor server running... "); System.out.println("Name: " + nom); Index: DResultatsSipor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DResultatsSipor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DResultatsSipor.java 25 Nov 2003 10:11:55 -0000 1.5 --- DResultatsSipor.java 27 Apr 2004 16:07:59 -0000 1.6 *************** *** 1,3 **** ! /* * @file DResultatsSipor.java * @creation 1999-09-23 --- 1,3 ---- ! /** * @file DResultatsSipor.java * @creation 1999-09-23 *************** *** 22,26 **** public class DResultatsSipor extends DResultats ! implements IResultatsSiporOperations { /** * .... --- 22,26 ---- public class DResultatsSipor extends DResultats ! implements IResultatsSipor,IResultatsSiporOperations { /** * .... Index: DCalculSipor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DCalculSipor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DCalculSipor.java 25 Nov 2003 10:11:55 -0000 1.6 --- DCalculSipor.java 27 Apr 2004 16:07:59 -0000 1.7 *************** *** 1,3 **** ! /* * @file DCalculSipor.java * @creation 1999-09-17 --- 1,3 ---- ! /** * @file DCalculSipor.java * @creation 1999-09-17 *************** *** 8,19 **** */ package org.fudaa.dodico.sipor; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.sipor.*; ! import org.fudaa.dodico.fortran.*; /** * Encapsulation du programme sipor5 ecrit en Fortran. Permet aux classes qui --- 8,22 ---- */ package org.fudaa.dodico.sipor; ! import java.io.File; ! ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.sipor.ICalculSipor; ! import org.fudaa.dodico.corba.sipor.ICalculSiporOperations; ! import org.fudaa.dodico.corba.sipor.IParametresSipor; ! import org.fudaa.dodico.corba.sipor.IResultatsSipor; ! import org.fudaa.dodico.corba.sipor.SParametresSipor; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** * Encapsulation du programme sipor5 ecrit en Fortran. Permet aux classes qui *************** *** 25,29 **** * @author Nicolas Chevalier */ ! public class DCalculSipor extends DCalcul implements ICalculSiporOperations { public DCalculSipor() { super(); --- 28,32 ---- * @author Nicolas Chevalier */ ! public class DCalculSipor extends DCalcul implements ICalculSipor,ICalculSiporOperations { public DCalculSipor() { super(); |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:23
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/sisyphe Modified Files: ServeurSisyphe.java DResultatsSisyphe.java DParametresSisyphe.java DCalculSisyphe.java Log Message: Modif DObjets Index: DParametresSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DParametresSisyphe.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DParametresSisyphe.java 25 Nov 2003 10:11:55 -0000 1.6 --- DParametresSisyphe.java 27 Apr 2004 16:07:58 -0000 1.7 *************** *** 1,3 **** ! /* * @file DParametresSisyphe.java * @creation 1999-07-09 --- 1,3 ---- ! /** * @file DParametresSisyphe.java * @creation 1999-07-09 *************** *** 16,20 **** --- 16,22 ---- import java.util.Hashtable; import java.util.Vector; + import org.fudaa.dodico.calcul.DParametres; + import org.fudaa.dodico.corba.sisyphe.IParametresSisyphe; import org.fudaa.dodico.corba.sisyphe.IParametresSisypheOperations; import org.fudaa.dodico.corba.sisyphe.SParametresCalculCAS; *************** *** 54,58 **** public class DParametresSisyphe extends DParametres ! implements IParametresSisypheOperations { /** * .... --- 56,60 ---- public class DParametresSisyphe extends DParametres ! implements IParametresSisyphe,IParametresSisypheOperations { /** * .... Index: ServeurSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/ServeurSisyphe.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ServeurSisyphe.java 25 Nov 2003 10:11:56 -0000 1.4 --- ServeurSisyphe.java 27 Apr 2004 16:07:58 -0000 1.5 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.sisyphe; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::sisyphe::ICalculSisyphe")); ! DCalculSisyphe s= new DCalculSisyphe(); ! CDodico.rebind(nom, s.tie()); System.out.println("Sisyphe server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::sisyphe::ICalculSisyphe")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculSisyphe.class)); System.out.println("Sisyphe server running... "); System.out.println("Name: " + nom); Index: DResultatsSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DResultatsSisyphe.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DResultatsSisyphe.java 25 Nov 2003 10:11:55 -0000 1.4 --- DResultatsSisyphe.java 27 Apr 2004 16:07:58 -0000 1.5 *************** *** 1,3 **** ! /* * @file DResultatsSisyphe.java * @creation 1999-07-09 --- 1,3 ---- ! /** * @file DResultatsSisyphe.java * @creation 1999-07-09 *************** *** 8,16 **** */ package org.fudaa.dodico.sisyphe; ! import java.io.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.calcul.*; import org.fudaa.dodico.fortran.FortranReader; - import org.fudaa.dodico.corba.sisyphe.*; /** * Les resultats Sisyphe. --- 8,22 ---- */ package org.fudaa.dodico.sisyphe; ! import java.io.File; ! import java.io.FileReader; ! import java.io.IOException; ! ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.sisyphe.IResultatsSisyphe; ! import org.fudaa.dodico.corba.sisyphe.IResultatsSisypheOperations; ! import org.fudaa.dodico.corba.sisyphe.SPasDeTempsSuivantsSOL; ! import org.fudaa.dodico.corba.sisyphe.SResultatsPointsMaillageSOL; ! import org.fudaa.dodico.corba.sisyphe.SResultatsSisypheSOL; import org.fudaa.dodico.fortran.FortranReader; /** * Les resultats Sisyphe. *************** *** 21,25 **** public class DResultatsSisyphe extends DResultats ! implements IResultatsSisypheOperations { /** * .... --- 27,31 ---- public class DResultatsSisyphe extends DResultats ! implements IResultatsSisyphe,IResultatsSisypheOperations { /** * .... Index: DCalculSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DCalculSisyphe.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCalculSisyphe.java 25 Nov 2003 10:11:55 -0000 1.5 --- DCalculSisyphe.java 27 Apr 2004 16:07:58 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCalculSisyphe.java * @creation 1999-07-09 --- 1,3 ---- ! /** * @file DCalculSisyphe.java * @creation 1999-07-09 *************** *** 8,19 **** */ package org.fudaa.dodico.sisyphe; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.sisyphe.*; ! import org.fudaa.dodico.fortran.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,21 ---- */ package org.fudaa.dodico.sisyphe; ! import java.io.File; ! ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.sisyphe.ICalculSisyphe; ! import org.fudaa.dodico.corba.sisyphe.ICalculSisypheOperations; ! import org.fudaa.dodico.corba.sisyphe.IParametresSisyphe; ! import org.fudaa.dodico.corba.sisyphe.IResultatsSisyphe; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** * @version $Revision$ $Date$ by $Author$ *************** *** 22,26 **** public class DCalculSisyphe extends DCalcul ! implements ICalculSisypheOperations { /** * DCalculSisyphe --- 24,28 ---- public class DCalculSisyphe extends DCalcul ! implements ICalculSisyphe,ICalculSisypheOperations { /** * DCalculSisyphe |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:07
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simulation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/simulation Modified Files: DSimulateur.java Log Message: Modif DObjets Index: DSimulateur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simulation/DSimulateur.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSimulateur.java 25 Nov 2003 10:11:54 -0000 1.5 --- DSimulateur.java 27 Apr 2004 16:07:58 -0000 1.6 *************** *** 1,3 **** ! /* * @file DSimulateur.java * @creation --- 1,3 ---- ! /** * @file DSimulateur.java * @creation *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.simulation; + import org.fudaa.dodico.corba.simulation.ISimulateur; import org.fudaa.dodico.corba.simulation.ISimulateurOperations; import org.fudaa.dodico.objet.DService; *************** *** 16,18 **** public abstract class DSimulateur extends DService ! implements ISimulateurOperations {} --- 17,19 ---- public abstract class DSimulateur extends DService ! implements ISimulateur,ISimulateurOperations {} |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:07
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/test Modified Files: TestHydraulique1dLido.java Removed Files: TestServeur.java TestJStrcuture.java Log Message: Modif DObjets --- TestServeur.java DELETED --- --- TestJStrcuture.java DELETED --- Index: TestHydraulique1dLido.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/TestHydraulique1dLido.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TestHydraulique1dLido.java 25 Nov 2003 10:11:59 -0000 1.5 --- TestHydraulique1dLido.java 27 Apr 2004 16:07:58 -0000 1.6 *************** *** 8,21 **** */ package org.fudaa.dodico.test; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.usine.UsineHelper; ! import org.fudaa.dodico.hydraulique1d.*; ! import org.fudaa.dodico.corba.hydraulique1d.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.lido.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.lido.conversion.*; ! import java.io.*; /** * Une classe de test de conversion hydraulique1d <-> lido --- 8,26 ---- */ package org.fudaa.dodico.test; ! import java.io.File; ! import java.io.IOException; ! ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; ! import org.fudaa.dodico.corba.hydraulique1d.ICalculHydraulique1d; ! import org.fudaa.dodico.corba.lido.ICalculLido; ! import org.fudaa.dodico.corba.lido.IParametresLido; ! import org.fudaa.dodico.corba.lido.IResultatsLido; ! import org.fudaa.dodico.corba.lido.SParametresEXT; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.lido.DParametresLido; ! import org.fudaa.dodico.lido.DResultatsLido; ! import org.fudaa.dodico.lido.conversion.CConversionHydraulique1d; ! import org.fudaa.dodico.objet.ServeurPersonne; /** * Une classe de test de conversion hydraulique1d <-> lido *************** *** 26,34 **** public class TestHydraulique1dLido { public static void main(String[] args) { ! ICalculHydraulique1d chydro= ! ICalculHydraulique1dHelper.narrow(new DCalculHydraulique1d().tie()); ! ICalculLido clido= ICalculLidoHelper.narrow(new DCalculLido().tie()); System.out.println("Creation de la connexion"); ! IUsine usine= UsineHelper.creeUsineLocale(); ServeurPersonne sp= new ServeurPersonne("test-personne-lido", "test-organisme-lido"); --- 31,40 ---- public class TestHydraulique1dLido { public static void main(String[] args) { ! BoonyLib.setAllLocal(true); ! IUsine usine= BoonyLib.findUsine(); ! ICalculHydraulique1d chydro=usine.creeHydraulique1dCalculHydraulique1d(); ! ICalculLido clido= usine.creeLidoCalculLido(); System.out.println("Creation de la connexion"); ! ServeurPersonne sp= new ServeurPersonne("test-personne-lido", "test-organisme-lido"); |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:08:06
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/usine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1131/src/org/fudaa/dodico/usine Removed Files: UsineHelper.java DUsine.java.cpy ServeurUsine.java Log Message: Modif DObjets --- UsineHelper.java DELETED --- --- ServeurUsine.java DELETED --- --- DUsine.java.cpy DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv936/src/org/fudaa/dodico/representation Modified Files: DSpectre.java DCarteSpectrale.java DCarteReel.java DCarteHistorique.java DCarteComplexe.java DCarte.java DHistoire.java Log Message: Modif DObjets Index: DCarte.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarte.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DCarte.java 25 Nov 2003 10:11:53 -0000 1.4 --- DCarte.java 27 Apr 2004 16:07:22 -0000 1.5 *************** *** 1,3 **** ! /* * @file DCarte.java * @creation 2001-07-13 --- 1,3 ---- ! /** * @file DCarte.java * @creation 2001-07-13 *************** *** 21,25 **** * @author Axel von Arnim */ ! public class DCarte extends DObjet implements ICarteOperations { protected LGrandeur grandeur_; protected IMaillage maillage_; --- 21,25 ---- * @author Axel von Arnim */ ! public class DCarte extends DObjet implements ICarte,ICarteOperations { protected LGrandeur grandeur_; protected IMaillage maillage_; Index: DCarteHistorique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteHistorique.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCarteHistorique.java 25 Nov 2003 10:11:53 -0000 1.5 --- DCarteHistorique.java 27 Apr 2004 16:07:22 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCarteHistorique.java * @creation 1998-08-04 --- 1,3 ---- ! /** * @file DCarteHistorique.java * @creation 1998-08-04 *************** *** 23,27 **** public class DCarteHistorique extends DCarte ! implements ICarteHistoriqueOperations { protected IHistoire valeurs_[]; // Constructeurs --- 23,27 ---- public class DCarteHistorique extends DCarte ! implements ICarteHistorique,ICarteHistoriqueOperations { protected IHistoire valeurs_[]; // Constructeurs Index: DHistoire.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DHistoire.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DHistoire.java 25 Nov 2003 10:11:53 -0000 1.4 --- DHistoire.java 27 Apr 2004 16:07:22 -0000 1.5 *************** *** 1,3 **** ! /* * @file DHistoire.java * @creation 1998-08-04 --- 1,3 ---- ! /** * @file DHistoire.java * @creation 1998-08-04 *************** *** 8,20 **** */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.mesure.*; ! import org.fudaa.dodico.mesure.*; ! import org.fudaa.dodico.corba.planification.*; ! import org.fudaa.dodico.planification.*; ! import org.fudaa.dodico.corba.interpolateur.*; ! import org.fudaa.dodico.interpolateur.*; ! import org.fudaa.dodico.corba.representation.*; /** * Une classe definissant une histoire. --- 8,17 ---- */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.mesure.LGrandeur; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.planification.ISegmentationTemps; ! import org.fudaa.dodico.corba.representation.IHistoire; ! import org.fudaa.dodico.corba.representation.IHistoireOperations; ! import org.fudaa.dodico.mesure.DEvolutionSerieIrreguliere; /** * Une classe definissant une histoire. *************** *** 25,29 **** public class DHistoire extends DEvolutionSerieIrreguliere ! implements IHistoireOperations { public DHistoire() { super(); --- 22,26 ---- public class DHistoire extends DEvolutionSerieIrreguliere ! implements IHistoire,IHistoireOperations { public DHistoire() { super(); Index: DCarteSpectrale.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteSpectrale.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DCarteSpectrale.java 25 Nov 2003 10:11:53 -0000 1.4 --- DCarteSpectrale.java 27 Apr 2004 16:07:22 -0000 1.5 *************** *** 1,3 **** ! /* * @file DCarteSpectrale.java * @creation 1998-08-04 --- 1,3 ---- ! /** * @file DCarteSpectrale.java * @creation 1998-08-04 *************** *** 8,18 **** */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.ef.*; ! import org.fudaa.dodico.ef.*; ! import org.fudaa.dodico.corba.mesure.*; ! import org.fudaa.dodico.mesure.*; ! import org.fudaa.dodico.corba.representation.*; /** * Une classe definissant une carte spectrale. --- 8,17 ---- */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.ef.IMaillage; ! import org.fudaa.dodico.corba.mesure.LGrandeur; ! import org.fudaa.dodico.corba.representation.ICarteReel; ! import org.fudaa.dodico.corba.representation.ICarteSpectrale; ! import org.fudaa.dodico.corba.representation.ICarteSpectraleOperations; ! import org.fudaa.dodico.corba.representation.ISpectre; /** * Une classe definissant une carte spectrale. *************** *** 23,27 **** public class DCarteSpectrale extends DCarte ! implements ICarteSpectraleOperations { protected ISpectre valeurs_[]; // Constructeurs --- 22,26 ---- public class DCarteSpectrale extends DCarte ! implements ICarteSpectrale,ICarteSpectraleOperations { protected ISpectre valeurs_[]; // Constructeurs Index: DCarteReel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteReel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCarteReel.java 25 Nov 2003 10:11:53 -0000 1.5 --- DCarteReel.java 27 Apr 2004 16:07:22 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCarteReel.java * @creation 1998-08-03 --- 1,3 ---- ! /** * @file DCarteReel.java * @creation 1998-08-03 *************** *** 10,13 **** --- 10,14 ---- import org.fudaa.dodico.corba.ef.IMaillage; import org.fudaa.dodico.corba.mesure.LGrandeur; + import org.fudaa.dodico.corba.representation.ICarteReel; import org.fudaa.dodico.corba.representation.ICarteReelOperations; /** *************** *** 17,21 **** * @author Axel von Arnim */ ! public class DCarteReel extends DCarte implements ICarteReelOperations { // Donnees membres protected double[] valeurs_; --- 18,22 ---- * @author Axel von Arnim */ ! public class DCarteReel extends DCarte implements ICarteReel,ICarteReelOperations { // Donnees membres protected double[] valeurs_; Index: DCarteComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteComplexe.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCarteComplexe.java 25 Nov 2003 10:11:53 -0000 1.5 --- DCarteComplexe.java 27 Apr 2004 16:07:22 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCarteComplexe.java * @creation 1998-08-04 --- 1,3 ---- ! /** * @file DCarteComplexe.java * @creation 1998-08-04 *************** *** 8,19 **** */ package org.fudaa.dodico.representation; import org.fudaa.dodico.corba.ef.IMaillage; import org.fudaa.dodico.corba.mathematiques.SComplexe; import org.fudaa.dodico.corba.mesure.LGrandeur; import org.fudaa.dodico.corba.representation.ICarteComplexeOperations; import org.fudaa.dodico.corba.representation.ICarteReel; import org.fudaa.dodico.mathematiques.CMathComplexe; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * Une classe definissant une carte complexe. --- 8,20 ---- */ package org.fudaa.dodico.representation; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.ef.IMaillage; import org.fudaa.dodico.corba.mathematiques.SComplexe; import org.fudaa.dodico.corba.mesure.LGrandeur; + import org.fudaa.dodico.corba.representation.ICarteComplexe; import org.fudaa.dodico.corba.representation.ICarteComplexeOperations; import org.fudaa.dodico.corba.representation.ICarteReel; import org.fudaa.dodico.mathematiques.CMathComplexe; import org.fudaa.dodico.objet.CDodico; /** * Une classe definissant une carte complexe. *************** *** 24,28 **** public class DCarteComplexe extends DCarte ! implements ICarteComplexeOperations { protected SComplexe valeurs_[]; // Constructeurs --- 25,29 ---- public class DCarteComplexe extends DCarte ! implements ICarteComplexe,ICarteComplexeOperations { protected SComplexe valeurs_[]; // Constructeurs *************** *** 58,62 **** for (int i= 0; i < valeurs_.length; i++) valeurs_re[i]= valeurs_[i].re; ! ICarteReel c= UsineHelper.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); --- 59,63 ---- for (int i= 0; i < valeurs_.length; i++) valeurs_re[i]= valeurs_[i].re; ! ICarteReel c= BoonyLib.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); *************** *** 68,72 **** for (int i= 0; i < valeurs_.length; i++) valeurs_im[i]= valeurs_[i].im; ! ICarteReel c= UsineHelper.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); --- 69,73 ---- for (int i= 0; i < valeurs_.length; i++) valeurs_im[i]= valeurs_[i].im; ! ICarteReel c= BoonyLib.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); *************** *** 78,82 **** for (int i= 0; i < valeurs_.length; i++) valeurs_mod[i]= CMathComplexe.mod(valeurs_[i]); ! ICarteReel c= UsineHelper.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); --- 79,83 ---- for (int i= 0; i < valeurs_.length; i++) valeurs_mod[i]= CMathComplexe.mod(valeurs_[i]); ! ICarteReel c= BoonyLib.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); *************** *** 88,92 **** for (int i= 0; i < valeurs_.length; i++) valeurs_arg[i]= CMathComplexe.arg(valeurs_[i]); ! ICarteReel c= UsineHelper.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); --- 89,93 ---- for (int i= 0; i < valeurs_.length; i++) valeurs_arg[i]= CMathComplexe.arg(valeurs_[i]); ! ICarteReel c= BoonyLib.findUsine().creeRepresentationCarteReel(); c.grandeur(grandeur_); c.maillage((IMaillage)maillage_.creeClone()); Index: DSpectre.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DSpectre.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSpectre.java 25 Nov 2003 10:11:53 -0000 1.4 --- DSpectre.java 27 Apr 2004 16:07:22 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSpectre.java * @creation 1998-08-03 --- 1,3 ---- ! /** * @file DSpectre.java * @creation 1998-08-03 *************** *** 8,16 **** */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.geometrie.*; ! import org.fudaa.dodico.geometrie.*; ! import org.fudaa.dodico.corba.representation.*; /** * Une classe definissant un spectre --- 8,16 ---- */ package org.fudaa.dodico.representation; ! import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliere; ! import org.fudaa.dodico.corba.geometrie.IPoint; ! import org.fudaa.dodico.corba.representation.ISpectre; ! import org.fudaa.dodico.corba.representation.ISpectreOperations; ! import org.fudaa.dodico.geometrie.DGrilleIrreguliere; /** * Une classe definissant un spectre *************** *** 21,25 **** public class DSpectre extends DGrilleIrreguliere ! implements ISpectreOperations { // Constructeurs public DSpectre() { --- 21,25 ---- public class DSpectre extends DGrilleIrreguliere ! implements ISpectre,ISpectreOperations { // Constructeurs public DSpectre() { |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv936/src/org/fudaa/dodico/seuil Modified Files: SeuilClient.java DCalculSeuil.java DResultatsSeuil.java ServeurSeuil.java DParametresSeuil.java Log Message: Modif DObjets Index: ServeurSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/ServeurSeuil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ServeurSeuil.java 25 Nov 2003 10:11:53 -0000 1.6 --- ServeurSeuil.java 27 Apr 2004 16:07:22 -0000 1.7 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.seuil; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::seuil::ICalculSeuil")); ! DCalculSeuil s= new DCalculSeuil(); ! CDodico.rebind(nom, s.tie()); System.out.println("Seuil server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::seuil::ICalculSeuil")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculSeuil.class)); System.out.println("Seuil server running... "); System.out.println("Name: " + nom); Index: DResultatsSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DResultatsSeuil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DResultatsSeuil.java 25 Nov 2003 10:11:53 -0000 1.6 --- DResultatsSeuil.java 27 Apr 2004 16:07:22 -0000 1.7 *************** *** 1,3 **** ! /* * @file DResultatsSeuil.java * @creation 2000-07-19 --- 1,3 ---- ! /** * @file DResultatsSeuil.java * @creation 2000-07-19 *************** *** 8,19 **** */ package org.fudaa.dodico.seuil; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.seuil.*; /** * Les resultats Seuil --- 8,22 ---- */ package org.fudaa.dodico.seuil; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.seuil.IResultatsSeuil; ! import org.fudaa.dodico.corba.seuil.IResultatsSeuilOperations; ! import org.fudaa.dodico.corba.seuil.SResultatsSEU; ! import org.fudaa.dodico.fortran.FortranReader; /** * Les resultats Seuil *************** *** 24,28 **** public class DResultatsSeuil extends DResultats ! implements IResultatsSeuilOperations { private SResultatsSEU resultsSEU= null; public DResultatsSeuil() { --- 27,31 ---- public class DResultatsSeuil extends DResultats ! implements IResultatsSeuil,IResultatsSeuilOperations { private SResultatsSEU resultsSEU= null; public DResultatsSeuil() { Index: SeuilClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/SeuilClient.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SeuilClient.java 25 Nov 2003 10:11:54 -0000 1.6 --- SeuilClient.java 27 Apr 2004 16:07:22 -0000 1.7 *************** *** 8,17 **** */ package org.fudaa.dodico.seuil; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.seuil.*; ! import org.fudaa.dodico.seuil.*; ! import java.io.*; /** * Une classe client de SeuilServeur --- 8,24 ---- */ package org.fudaa.dodico.seuil; ! import java.io.File; ! import java.io.IOException; ! ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.seuil.ICalculSeuil; ! import org.fudaa.dodico.corba.seuil.ICalculSeuilHelper; ! import org.fudaa.dodico.corba.seuil.IParametresSeuil; ! import org.fudaa.dodico.corba.seuil.IParametresSeuilHelper; ! import org.fudaa.dodico.corba.seuil.IResultatsSeuil; ! import org.fudaa.dodico.corba.seuil.IResultatsSeuilHelper; ! import org.fudaa.dodico.corba.seuil.SResultatsSEU; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.ServeurPersonne; /** * Une classe client de SeuilServeur Index: DCalculSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DCalculSeuil.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DCalculSeuil.java 25 Nov 2003 10:11:53 -0000 1.7 --- DCalculSeuil.java 27 Apr 2004 16:07:22 -0000 1.8 *************** *** 1,3 **** ! /* * @file DCalculSeuil.java * @creation 2000-07-20 --- 1,3 ---- ! /** * @file DCalculSeuil.java * @creation 2000-07-20 *************** *** 9,14 **** --- 9,16 ---- package org.fudaa.dodico.seuil; import java.io.File; + import org.fudaa.dodico.calcul.DCalcul; import org.fudaa.dodico.corba.objet.IConnexion; + import org.fudaa.dodico.corba.seuil.ICalculSeuil; import org.fudaa.dodico.corba.seuil.ICalculSeuilOperations; import org.fudaa.dodico.corba.seuil.IParametresSeuil; *************** *** 23,27 **** * @author Jean-Yves Riou */ ! public class DCalculSeuil extends DCalcul implements ICalculSeuilOperations { public DCalculSeuil() { super(); --- 25,29 ---- * @author Jean-Yves Riou */ ! public class DCalculSeuil extends DCalcul implements ICalculSeuil,ICalculSeuilOperations { public DCalculSeuil() { super(); Index: DParametresSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DParametresSeuil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DParametresSeuil.java 25 Nov 2003 10:11:53 -0000 1.6 --- DParametresSeuil.java 27 Apr 2004 16:07:22 -0000 1.7 *************** *** 1,3 **** ! /* * @file DParametresSeuil.java * @creation 2000-05-26 --- 1,3 ---- ! /** * @file DParametresSeuil.java * @creation 2000-05-26 *************** *** 8,19 **** */ package org.fudaa.dodico.seuil; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.corba.seuil.*; ! import org.fudaa.dodico.fortran.*; /** * Les parametres Seuil --- 8,28 ---- */ package org.fudaa.dodico.seuil; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileOutputStream; ! import java.io.IOException; ! import java.io.InputStream; ! import java.io.InputStreamReader; ! import java.io.OutputStream; ! import java.io.OutputStreamWriter; ! ! import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.seuil.IParametresSeuil; ! import org.fudaa.dodico.corba.seuil.IParametresSeuilOperations; ! import org.fudaa.dodico.corba.seuil.SParametresSEU; ! import org.fudaa.dodico.corba.seuil.SPoint01; ! import org.fudaa.dodico.corba.seuil.SProfelem01; ! import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.fortran.FortranWriter; /** * Les parametres Seuil *************** *** 24,28 **** public class DParametresSeuil extends DParametres ! implements IParametresSeuilOperations { static int nptmax= 80; // nbre pts max par profil (dans le fortran = 75 ) static String chainw; --- 33,37 ---- public class DParametresSeuil extends DParametres ! implements IParametresSeuil,IParametresSeuilOperations { static int nptmax= 80; // nbre pts max par profil (dans le fortran = 75 ) static String chainw; |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:07:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv936/src/org/fudaa/dodico/refonde Modified Files: DParametresRefonde.java DResultatsRefonde.java ServeurRefonde.java DCalculRefonde.java Log Message: Modif DObjets Index: DParametresRefonde.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde/DParametresRefonde.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DParametresRefonde.java 15 Apr 2004 07:55:37 -0000 1.7 --- DParametresRefonde.java 27 Apr 2004 16:07:21 -0000 1.8 *************** *** 1,3 **** ! /* * @file DParametresRefonde.java * @creation 1998-04-15 --- 1,3 ---- ! /** * @file DParametresRefonde.java * @creation 1998-04-15 *************** *** 23,27 **** public class DParametresRefonde extends DParametres ! implements IParametresRefondeOperations { /** Type calcul : Houle régulière. */ --- 23,27 ---- public class DParametresRefonde extends DParametres ! implements IParametresRefonde,IParametresRefondeOperations { /** Type calcul : Houle régulière. */ Index: DResultatsRefonde.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde/DResultatsRefonde.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DResultatsRefonde.java 15 Apr 2004 07:55:37 -0000 1.5 --- DResultatsRefonde.java 27 Apr 2004 16:07:21 -0000 1.6 *************** *** 1,3 **** ! /* * @file DResultatsRefonde.java * @creation 1998-04-16 --- 1,3 ---- ! /** * @file DResultatsRefonde.java * @creation 1998-04-16 *************** *** 24,28 **** public class DResultatsRefonde extends DResultats ! implements IResultatsRefondeOperations { private String fichier_= ""; --- 24,28 ---- public class DResultatsRefonde extends DResultats ! implements IResultatsRefonde,IResultatsRefondeOperations { private String fichier_= ""; Index: DCalculRefonde.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde/DCalculRefonde.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DCalculRefonde.java 15 Apr 2004 07:55:37 -0000 1.7 --- DCalculRefonde.java 27 Apr 2004 16:07:21 -0000 1.8 *************** *** 1,3 **** ! /* * @file DCalculRefonde.java * @creation 1998-04-16 --- 1,3 ---- ! /** * @file DCalculRefonde.java * @creation 1998-04-16 *************** *** 25,29 **** public class DCalculRefonde extends DCalcul ! implements ICalculRefondeOperations { private StringBuffer traceBuffer_= new StringBuffer(); private boolean succes_= false; --- 25,29 ---- public class DCalculRefonde extends DCalcul ! implements ICalculRefonde,ICalculRefondeOperations { private StringBuffer traceBuffer_= new StringBuffer(); private boolean succes_= false; Index: ServeurRefonde.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde/ServeurRefonde.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurRefonde.java 25 Nov 2003 10:11:53 -0000 1.5 --- ServeurRefonde.java 27 Apr 2004 16:07:21 -0000 1.6 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.refonde; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::refonde::ICalculRefonde")); ! DCalculRefonde s= new DCalculRefonde(); ! CDodico.rebind(nom, s.tie()); System.out.println("Refonde server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::refonde::ICalculRefonde")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculRefonde.class)); System.out.println("Refonde server running... "); System.out.println("Name: " + nom); |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:07:09
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv680/src/org/fudaa/dodico/oscar Modified Files: OscarClient.java DResultatsOscar.java ServeurOscar.java DCalculOscar.java DParametresOscar.java Log Message: Modif DObjets Index: DCalculOscar.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DCalculOscar.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DCalculOscar.java 25 Nov 2003 10:11:47 -0000 1.6 --- DCalculOscar.java 27 Apr 2004 16:06:25 -0000 1.7 *************** *** 1,3 **** ! /* * @file DCalculOscar.java * @creation 1997-12-10 --- 1,3 ---- ! /** * @file DCalculOscar.java * @creation 1997-12-10 *************** *** 8,24 **** */ package org.fudaa.dodico.oscar; import org.fudaa.dodico.corba.oscar.ICalculOscarOperations; import org.fudaa.dodico.corba.oscar.IParametresOscar; - import org.fudaa.dodico.corba.oscar.IResultatsOscar; import org.fudaa.dodico.corba.oscar.IParametresOscarHelper; import org.fudaa.dodico.corba.oscar.IResultatsOscarHelper; - import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.oscar.SParametresOscar; - import org.fudaa.dodico.calcul.DCalcul; - import org.fudaa.dodico.objet.CDodico; import org.fudaa.dodico.objet.CExec; - import java.io.File; - import java.io.FileReader; - import java.io.LineNumberReader; /** * Gestion du lancement du code de calcul <code>Oscar</code>. --- 8,23 ---- */ package org.fudaa.dodico.oscar; + import java.io.File; + + import org.fudaa.dodico.calcul.DCalcul; + import org.fudaa.dodico.corba.objet.IConnexion; + import org.fudaa.dodico.corba.oscar.ICalculOscar; import org.fudaa.dodico.corba.oscar.ICalculOscarOperations; import org.fudaa.dodico.corba.oscar.IParametresOscar; import org.fudaa.dodico.corba.oscar.IParametresOscarHelper; + import org.fudaa.dodico.corba.oscar.IResultatsOscar; import org.fudaa.dodico.corba.oscar.IResultatsOscarHelper; import org.fudaa.dodico.corba.oscar.SParametresOscar; import org.fudaa.dodico.objet.CExec; /** * Gestion du lancement du code de calcul <code>Oscar</code>. *************** *** 27,31 **** * @author Guillaume Desnoix */ ! public class DCalculOscar extends DCalcul implements ICalculOscarOperations { /** * Initialisation des extensions des fichiers --- 26,30 ---- * @author Guillaume Desnoix */ ! public class DCalculOscar extends DCalcul implements ICalculOscar,ICalculOscarOperations { /** * Initialisation des extensions des fichiers Index: DResultatsOscar.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DResultatsOscar.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DResultatsOscar.java 25 Nov 2003 10:11:47 -0000 1.5 --- DResultatsOscar.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DResultatsOscar.java * @creation 1998-03-12 --- 1,3 ---- ! /** * @file DResultatsOscar.java * @creation 1998-03-12 *************** *** 12,16 **** --- 12,18 ---- import java.io.FileReader; import java.io.IOException; + import org.fudaa.dodico.calcul.DResultats; + import org.fudaa.dodico.corba.oscar.IResultatsOscar; import org.fudaa.dodico.corba.oscar.IResultatsOscarOperations; import org.fudaa.dodico.corba.oscar.SPointCoteValeur; *************** *** 32,36 **** public class DResultatsOscar extends DResultats ! implements IResultatsOscarOperations { /** * mettre 10.0 pour "unité en Tonne" et 1.0 pour "unité en kN" --- 34,38 ---- public class DResultatsOscar extends DResultats ! implements IResultatsOscar,IResultatsOscarOperations { /** * mettre 10.0 pour "unité en Tonne" et 1.0 pour "unité en kN" Index: ServeurOscar.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/ServeurOscar.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurOscar.java 25 Nov 2003 10:11:47 -0000 1.5 --- ServeurOscar.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.oscar; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::oscar::ICalculOscar")); ! DCalculOscar s= new DCalculOscar(); ! CDodico.rebind(nom, s.tie()); System.out.println("Oscar server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::oscar::ICalculOscar")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculOscar.class)); System.out.println("Oscar server running... "); System.out.println("Name: " + nom); Index: OscarClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/OscarClient.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OscarClient.java 25 Nov 2003 10:11:47 -0000 1.5 --- OscarClient.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 8,17 **** */ package org.fudaa.dodico.oscar; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.usine.UsineHelper; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.corba.oscar.*; ! import java.io.*; /** * Une classe cliente pour Oscar --- 8,21 ---- */ package org.fudaa.dodico.oscar; ! import java.io.File; ! ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.objet.IOrganisme; ! import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.corba.oscar.ICalculOscar; ! import org.fudaa.dodico.corba.oscar.IParametresOscar; ! import org.fudaa.dodico.corba.oscar.IParametresOscarHelper; /** * Une classe cliente pour Oscar *************** *** 41,45 **** // Création du serveur System.out.println("creation du serveur"); ! IUsine usine= UsineHelper.creeUsineLocale(); IPersonne p= usine.creeObjetPersonne(); IOrganisme o= usine.creeObjetOrganisme(); --- 45,50 ---- // Création du serveur System.out.println("creation du serveur"); ! BoonyLib.setAllLocal(true); ! IUsine usine= BoonyLib.findUsine(); IPersonne p= usine.creeObjetPersonne(); IOrganisme o= usine.creeObjetOrganisme(); Index: DParametresOscar.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/DParametresOscar.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DParametresOscar.java 25 Nov 2003 10:11:47 -0000 1.5 --- DParametresOscar.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DParametresOscar.java * @creation 2000-09-21 --- 1,3 ---- ! /** * @file DParametresOscar.java * @creation 2000-09-21 *************** *** 8,20 **** */ package org.fudaa.dodico.oscar; - import org.fudaa.dodico.corba.objet.IConnexion; - import org.fudaa.dodico.corba.oscar.*; - import org.fudaa.dodico.calcul.DParametres; - import org.fudaa.dodico.fortran.FortranReader; - import org.fudaa.dodico.fortran.FortranWriter; - import java.io.File; - import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; /** * Classe implémentant l'interface IParametresOscar gérant les parametres du --- 8,21 ---- */ package org.fudaa.dodico.oscar; import java.io.FileWriter; import java.io.IOException; + + import org.fudaa.dodico.calcul.DParametres; + import org.fudaa.dodico.corba.oscar.IParametresOscar; + import org.fudaa.dodico.corba.oscar.IParametresOscarOperations; + import org.fudaa.dodico.corba.oscar.SFichierDiagramme; + import org.fudaa.dodico.corba.oscar.SParametresOscar; + import org.fudaa.dodico.corba.oscar.VALEUR_NULLE; + import org.fudaa.dodico.fortran.FortranWriter; /** * Classe implémentant l'interface IParametresOscar gérant les parametres du *************** *** 26,30 **** public class DParametresOscar extends DParametres ! implements IParametresOscarOperations { /** * mettre 10.0 pour "unité en Tonne" et 1.0 pour "unité en kN" --- 27,31 ---- public class DParametresOscar extends DParametres ! implements IParametresOscar,IParametresOscarOperations { /** * mettre 10.0 pour "unité en Tonne" et 1.0 pour "unité en kN" |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:07:09
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv680/src/org/fudaa/dodico/reflux3d Modified Files: DCalculReflux3d.java DResultatsReflux3d.java DParametresReflux3d.java ServeurReflux3d.java Log Message: Modif DObjets Index: DParametresReflux3d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d/DParametresReflux3d.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DParametresReflux3d.java 25 Nov 2003 10:11:51 -0000 1.5 --- DParametresReflux3d.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DParametresReflux3d.java * @creation 2001-01-08 --- 1,3 ---- ! /** * @file DParametresReflux3d.java * @creation 2001-01-08 *************** *** 24,28 **** public class DParametresReflux3d extends DParametres ! implements IParametresReflux3dOperations { // Numéro de version. A GENERALISER // private static String version_="5.0"; --- 24,28 ---- public class DParametresReflux3d extends DParametres ! implements IParametresReflux3d,IParametresReflux3dOperations { // Numéro de version. A GENERALISER // private static String version_="5.0"; Index: ServeurReflux3d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d/ServeurReflux3d.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ServeurReflux3d.java 25 Nov 2003 10:11:52 -0000 1.4 --- ServeurReflux3d.java 27 Apr 2004 16:06:25 -0000 1.5 *************** *** 8,16 **** */ package org.fudaa.dodico.reflux3d; ! import java.net.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.reflux3d.*; /** * Un serveur Reflux 3D. --- 8,15 ---- */ package org.fudaa.dodico.reflux3d; ! import java.util.Date; ! ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.objet.CDodico; /** * Un serveur Reflux 3D. *************** *** 25,30 **** ? args[0] : CDodico.generateName("::reflux3d::ICalculReflux3d")); ! DCalculReflux3d s= new DCalculReflux3d(); ! CDodico.rebind(nom, s.tie()); System.out.println("Reflux3d server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::reflux3d::ICalculReflux3d")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculReflux3d.class)); System.out.println("Reflux3d server running... "); System.out.println("Name: " + nom); Index: DResultatsReflux3d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d/DResultatsReflux3d.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DResultatsReflux3d.java 25 Nov 2003 10:11:52 -0000 1.6 --- DResultatsReflux3d.java 27 Apr 2004 16:06:24 -0000 1.7 *************** *** 1,3 **** ! /* * @file DResultatsReflux3d.java * @creation 2001-01-08 --- 1,3 ---- ! /** * @file DResultatsReflux3d.java * @creation 2001-01-08 *************** *** 18,21 **** --- 18,22 ---- import org.fudaa.dodico.calcul.DResultats; import org.fudaa.dodico.corba.reflux3d.IParametresReflux3d; + import org.fudaa.dodico.corba.reflux3d.IResultatsReflux3d; import org.fudaa.dodico.corba.reflux3d.IResultatsReflux3dOperations; import org.fudaa.dodico.corba.reflux3d.SResultatsEtapeR3dSOL; *************** *** 35,39 **** public class DResultatsReflux3d extends DResultats ! implements IResultatsReflux3dOperations { private IParametresReflux3d params_; // Nom du fichier correspondant aux résultats --- 36,40 ---- public class DResultatsReflux3d extends DResultats ! implements IResultatsReflux3d,IResultatsReflux3dOperations { private IParametresReflux3d params_; // Nom du fichier correspondant aux résultats Index: DCalculReflux3d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d/DCalculReflux3d.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCalculReflux3d.java 25 Nov 2003 10:11:51 -0000 1.5 --- DCalculReflux3d.java 27 Apr 2004 16:06:24 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCalculReflux3d.java * @creation 2001-01-08 --- 1,3 ---- ! /** * @file DCalculReflux3d.java * @creation 2001-01-08 *************** *** 26,30 **** public class DCalculReflux3d extends DCalcul ! implements ICalculReflux3dOperations { private String traceExecution_= ""; private boolean succes_= false; --- 26,30 ---- public class DCalculReflux3d extends DCalcul ! implements ICalculReflux3d,ICalculReflux3dOperations { private String traceExecution_= ""; private boolean succes_= false; |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv680/src/org/fudaa/dodico/planification Modified Files: DSegmentationTemps.java DHorloge.java DBoucleTemps.java DChronometre.java DInstants.java DIntervalleTemps.java Log Message: Modif DObjets Index: DInstants.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DInstants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DInstants.java 25 Nov 2003 10:11:48 -0000 1.4 --- DInstants.java 27 Apr 2004 16:06:25 -0000 1.5 *************** *** 1,3 **** ! /* * @file DInstants.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DInstants.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.planification; + import org.fudaa.dodico.corba.planification.IInstants; import org.fudaa.dodico.corba.planification.IInstantsOperations; import org.fudaa.dodico.objet.DObjet; *************** *** 16,18 **** public abstract class DInstants extends DObjet ! implements IInstantsOperations {} --- 17,19 ---- public abstract class DInstants extends DObjet ! implements IInstants,IInstantsOperations {} Index: DBoucleTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DBoucleTemps.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DBoucleTemps.java 25 Nov 2003 10:11:48 -0000 1.4 --- DBoucleTemps.java 27 Apr 2004 16:06:25 -0000 1.5 *************** *** 1,3 **** ! /* * @file DBoucleTemps.java * @creation 1998-05-27 --- 1,3 ---- ! /** * @file DBoucleTemps.java * @creation 1998-05-27 *************** *** 8,13 **** */ package org.fudaa.dodico.planification; import org.fudaa.dodico.corba.planification.IBoucleTempsOperations; - import org.fudaa.dodico.objet.DObjet; import org.fudaa.dodico.objet.CDodico; /** --- 8,13 ---- */ package org.fudaa.dodico.planification; + import org.fudaa.dodico.corba.planification.IBoucleTemps; import org.fudaa.dodico.corba.planification.IBoucleTempsOperations; import org.fudaa.dodico.objet.CDodico; /** *************** *** 15,19 **** * @author Guillaume Desnoix */ ! public class DBoucleTemps extends DInstants implements IBoucleTempsOperations { /** * debut de la boucle. --- 15,19 ---- * @author Guillaume Desnoix */ ! public class DBoucleTemps extends DInstants implements IBoucleTemps,IBoucleTempsOperations { /** * debut de la boucle. Index: DChronometre.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DChronometre.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DChronometre.java 25 Nov 2003 10:11:48 -0000 1.4 --- DChronometre.java 27 Apr 2004 16:06:25 -0000 1.5 *************** *** 1,3 **** ! /* * @file DChronometre.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DChronometre.java * @creation 2001-07-17 *************** *** 8,13 **** */ package org.fudaa.dodico.planification; import org.fudaa.dodico.corba.planification.IChronometreOperations; - import org.fudaa.dodico.objet.DObjet; /** * @version $Revision$ $Date$ by $Author$ --- 8,13 ---- */ package org.fudaa.dodico.planification; + import org.fudaa.dodico.corba.planification.IChronometre; import org.fudaa.dodico.corba.planification.IChronometreOperations; /** * @version $Revision$ $Date$ by $Author$ *************** *** 16,18 **** public abstract class DChronometre extends DHorloge ! implements IChronometreOperations {} --- 16,18 ---- public abstract class DChronometre extends DHorloge ! implements IChronometre,IChronometreOperations {} Index: DIntervalleTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DIntervalleTemps.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DIntervalleTemps.java 25 Nov 2003 10:11:48 -0000 1.5 --- DIntervalleTemps.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DIntervalleTemps.java * @creation 1998-05-27 --- 1,3 ---- ! /** * @file DIntervalleTemps.java * @creation 1998-05-27 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.planification; + import org.fudaa.dodico.corba.planification.IIntervalleTemps; import org.fudaa.dodico.corba.planification.IIntervalleTempsOperations; /** *************** *** 15,19 **** public class DIntervalleTemps extends DInstants ! implements IIntervalleTempsOperations { /** * Debut de l'intervalle. --- 16,20 ---- public class DIntervalleTemps extends DInstants ! implements IIntervalleTemps,IIntervalleTempsOperations { /** * Debut de l'intervalle. Index: DHorloge.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DHorloge.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DHorloge.java 25 Nov 2003 10:11:48 -0000 1.5 --- DHorloge.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DHorloge.java * @creation 1998-02-18 --- 1,3 ---- ! /** * @file DHorloge.java * @creation 1998-02-18 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.planification; import java.util.Calendar; + + import org.fudaa.dodico.corba.planification.IHorloge; import org.fudaa.dodico.corba.planification.IHorlogeOperations; import org.fudaa.dodico.objet.DService; *************** *** 17,21 **** * @author Guillaume Desnoix */ ! public class DHorloge extends DService implements IHorlogeOperations { public DHorloge() { super(); --- 19,23 ---- * @author Guillaume Desnoix */ ! public class DHorloge extends DService implements IHorloge,IHorlogeOperations { public DHorloge() { super(); Index: DSegmentationTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DSegmentationTemps.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSegmentationTemps.java 25 Nov 2003 10:11:48 -0000 1.5 --- DSegmentationTemps.java 27 Apr 2004 16:06:25 -0000 1.6 *************** *** 1,3 **** ! /* * @file DSegmentationTemps.java * @creation 1998-06-12 --- 1,3 ---- ! /** * @file DSegmentationTemps.java * @creation 1998-06-12 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.planification; + import org.fudaa.dodico.corba.planification.ISegmentationTemps; import org.fudaa.dodico.corba.planification.ISegmentationTempsOperations; /** *************** *** 15,19 **** public class DSegmentationTemps extends DInstants ! implements ISegmentationTempsOperations { /** * Description du champ --- 16,20 ---- public class DSegmentationTemps extends DInstants ! implements ISegmentationTemps,ISegmentationTempsOperations { /** * Description du champ |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:06:42
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/probabilite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv680/src/org/fudaa/dodico/probabilite Modified Files: DLoi.java DGenerateur.java DGenerateurLoiErlang.java DLoiErlang.java Log Message: Modif DObjets Index: DGenerateurLoiErlang.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/probabilite/DGenerateurLoiErlang.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DGenerateurLoiErlang.java 16 Mar 2004 16:47:30 -0000 1.5 --- DGenerateurLoiErlang.java 27 Apr 2004 16:06:33 -0000 1.6 *************** *** 1,3 **** ! /* * @file DGenerateurLoiErlang.java * @creation 2001-04-12 --- 1,3 ---- ! /** * @file DGenerateurLoiErlang.java * @creation 2001-04-12 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.probabilite; //java + import org.fudaa.dodico.corba.probabilite.IGenerateurLoiErlang; import org.fudaa.dodico.corba.probabilite.IGenerateurLoiErlangOperations; import org.fudaa.dodico.corba.probabilite.SParametresGenerateurLoiErlang; *************** *** 23,27 **** public class DGenerateurLoiErlang extends DGenerateur ! implements IGenerateurLoiErlangOperations { /** * DGenerateurLoiErlang --- 24,28 ---- public class DGenerateurLoiErlang extends DGenerateur ! implements IGenerateurLoiErlang,IGenerateurLoiErlangOperations { /** * DGenerateurLoiErlang Index: DLoiErlang.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/probabilite/DLoiErlang.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DLoiErlang.java 25 Nov 2003 10:11:48 -0000 1.4 --- DLoiErlang.java 27 Apr 2004 16:06:33 -0000 1.5 *************** *** 1,3 **** ! /* * @file DLoiErlang.java * @creation 2001-04-06 --- 1,3 ---- ! /** * @file DLoiErlang.java * @creation 2001-04-06 *************** *** 8,13 **** */ package org.fudaa.dodico.probabilite; ! //java ! //dodico import org.fudaa.dodico.corba.probabilite.ILoiErlangOperations; /** --- 8,12 ---- */ package org.fudaa.dodico.probabilite; ! import org.fudaa.dodico.corba.probabilite.ILoiErlang; import org.fudaa.dodico.corba.probabilite.ILoiErlangOperations; /** *************** *** 17,21 **** * @author */ ! public class DLoiErlang extends DLoi implements ILoiErlangOperations { /** * Ordre de la loi d'Erlang. --- 16,20 ---- * @author */ ! public class DLoiErlang extends DLoi implements ILoiErlang,ILoiErlangOperations { /** * Ordre de la loi d'Erlang. Index: DLoi.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/probabilite/DLoi.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DLoi.java 25 Nov 2003 10:11:48 -0000 1.4 --- DLoi.java 27 Apr 2004 16:06:33 -0000 1.5 *************** *** 1,3 **** ! /* * @file DLoi.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DLoi.java * @creation 2001-07-17 *************** *** 9,14 **** package org.fudaa.dodico.probabilite; //java ! import java.lang.Math; ! //dodico import org.fudaa.dodico.corba.probabilite.ILoiOperations; import org.fudaa.dodico.objet.DObjet; --- 9,13 ---- package org.fudaa.dodico.probabilite; //java ! import org.fudaa.dodico.corba.probabilite.ILoi; import org.fudaa.dodico.corba.probabilite.ILoiOperations; import org.fudaa.dodico.objet.DObjet; *************** *** 19,23 **** * @author */ ! public abstract class DLoi extends DObjet implements ILoiOperations { public abstract double variance(); /** --- 18,22 ---- * @author */ ! public abstract class DLoi extends DObjet implements ILoi,ILoiOperations { public abstract double variance(); /** Index: DGenerateur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/probabilite/DGenerateur.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DGenerateur.java 25 Nov 2003 10:11:48 -0000 1.4 --- DGenerateur.java 27 Apr 2004 16:06:33 -0000 1.5 *************** *** 1,3 **** ! /* * @file DGenerateur.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DGenerateur.java * @creation 2001-07-17 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.probabilite; //dodico + import org.fudaa.dodico.corba.probabilite.IGenerateur; import org.fudaa.dodico.corba.probabilite.IGenerateurOperations; import org.fudaa.dodico.objet.DService; *************** *** 17,19 **** public abstract class DGenerateur extends DService ! implements IGenerateurOperations {} --- 18,20 ---- public abstract class DGenerateur extends DService ! implements IGenerateur,IGenerateurOperations {} |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:05:49
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv361/src/org/fudaa/dodico/objet Modified Files: DService.java ServeurPersonne.java CDodico.java CGestionnaireConnexion.java DDiffuseur.java RequeteServeurDodico.java DOrganisme.java DObjet.java DActivateur.java DConnexion.java DTransfertFichierASCII.java ServeurDefaut.java DTache.java DPersonne.java Log Message: Modif DObjets Index: DActivateur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DActivateur.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DActivateur.java 31 Mar 2004 08:14:30 -0000 1.7 --- DActivateur.java 27 Apr 2004 16:05:37 -0000 1.8 *************** *** 1,3 **** ! /* * @file DActivateur.java * @creation 2000-02-21 --- 1,3 ---- ! /** * @file DActivateur.java * @creation 2000-02-21 *************** *** 18,21 **** --- 18,22 ---- import java.util.Vector; + import org.fudaa.dodico.corba.objet.IActivateur; import org.fudaa.dodico.corba.objet.IActivateurOperations; /** *************** *** 27,31 **** final public class DActivateur extends DService ! implements IActivateurOperations { private static DActivateur INSTANCE= null; private final static DActivateur instance() { --- 28,32 ---- final public class DActivateur extends DService ! implements IActivateur,IActivateurOperations { private static DActivateur INSTANCE= null; private final static DActivateur instance() { Index: DTache.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DTache.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DTache.java 25 Nov 2003 10:11:46 -0000 1.5 --- DTache.java 27 Apr 2004 16:05:37 -0000 1.6 *************** *** 1,3 **** ! /* * @file DTache.java * @creation 2001-06-25 --- 1,3 ---- ! /** * @file DTache.java * @creation 2001-06-25 *************** *** 10,13 **** --- 10,14 ---- import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; + import org.fudaa.dodico.corba.objet.ITache; import org.fudaa.dodico.corba.objet.ITacheOperations; /** *************** *** 17,21 **** * @author Axel von Arnim */ ! public class DTache extends DObjet implements ITacheOperations { private CGestionnaireConnexion gestConnexions_; private int instantCreation_; --- 18,22 ---- * @author Axel von Arnim */ ! public class DTache extends DObjet implements ITache,ITacheOperations { private CGestionnaireConnexion gestConnexions_; private int instantCreation_; Index: DService.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DService.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DService.java 25 Nov 2003 10:11:46 -0000 1.5 --- DService.java 27 Apr 2004 16:05:36 -0000 1.6 *************** *** 1,3 **** ! /* * @file DService.java * @creation --- 1,3 ---- ! /** * @file DService.java * @creation *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.objet; + import org.fudaa.dodico.corba.objet.IService; import org.fudaa.dodico.corba.objet.IServiceOperations; /** *************** *** 15,19 **** * @author */ ! public abstract class DService extends DTache implements IServiceOperations { /** * Constructor for the DService object --- 16,20 ---- * @author */ ! public abstract class DService extends DTache implements IService,IServiceOperations { /** * Constructor for the DService object Index: CGestionnaireConnexion.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CGestionnaireConnexion.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CGestionnaireConnexion.java 25 Nov 2003 10:11:46 -0000 1.5 --- CGestionnaireConnexion.java 27 Apr 2004 16:05:36 -0000 1.6 *************** *** 8,17 **** */ package org.fudaa.dodico.objet; - import java.util.Enumeration; import java.util.Hashtable; import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; - import org.fudaa.dodico.corba.usine.IUsine; - import org.fudaa.dodico.usine.UsineHelper; /** * Connexion manager --- 8,17 ---- */ package org.fudaa.dodico.objet; import java.util.Hashtable; + + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.corba.objet.IPersonne; /** * Connexion manager *************** *** 39,43 **** } public IConnexion connexion(IPersonne p) { ! IUsine u= UsineHelper.findUsine(); IConnexion c= u.creeObjetConnexion(); c.utilisateur(p); --- 39,43 ---- } public IConnexion connexion(IPersonne p) { ! IUsine u= BoonyLib.findUsine(); IConnexion c= u.creeObjetConnexion(); c.utilisateur(p); Index: DConnexion.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DConnexion.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DConnexion.java 25 Nov 2003 10:11:46 -0000 1.5 --- DConnexion.java 27 Apr 2004 16:05:37 -0000 1.6 *************** *** 1,3 **** ! /* * @file DConnexion.java * @creation 2001-05-15 --- 1,3 ---- ! /** * @file DConnexion.java * @creation 2001-05-15 *************** *** 8,14 **** */ package org.fudaa.dodico.objet; ! import org.fudaa.dodico.corba.objet.*; ! import java.util.*; ! import java.text.*; /** * Une classe representant une connexion. --- 8,19 ---- */ package org.fudaa.dodico.objet; ! import java.text.DateFormat; ! import java.util.Date; ! import java.util.Vector; ! ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.objet.IConnexionOperations; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.IPersonne; /** * Une classe representant une connexion. *************** *** 17,21 **** * @author Axel von Arnim */ ! public class DConnexion extends DObjet implements IConnexionOperations { public static java.util.Random RAND= new java.util.Random(); DateFormat df_; --- 22,26 ---- * @author Axel von Arnim */ ! public class DConnexion extends DObjet implements IConnexion,IConnexionOperations { public static java.util.Random RAND= new java.util.Random(); DateFormat df_; Index: DOrganisme.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DOrganisme.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DOrganisme.java 25 Nov 2003 10:11:46 -0000 1.5 --- DOrganisme.java 27 Apr 2004 16:05:37 -0000 1.6 *************** *** 17,21 **** * @author Guillaume Desnoix */ ! public class DOrganisme extends DObjet implements IOrganismeOperations { public DOrganisme() { super(); --- 17,21 ---- * @author Guillaume Desnoix */ ! public class DOrganisme extends DObjet implements IOrganisme,IOrganismeOperations { public DOrganisme() { super(); Index: DObjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DObjet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DObjet.java 25 Nov 2003 10:11:46 -0000 1.5 --- DObjet.java 27 Apr 2004 16:05:37 -0000 1.6 *************** *** 8,21 **** */ package org.fudaa.dodico.objet; ! import java.lang.reflect.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; /** * Classe déléguée pour l'interface IObjet * ! * @version $Revision$ $Date$ by $Author$ * @author Frederic Deniger */ ! public abstract class DObjet implements IObjetOperations { /** * Description of the Field. --- 8,30 ---- */ package org.fudaa.dodico.objet; ! import org.omg.CORBA.Context; ! import org.omg.CORBA.ContextList; ! import org.omg.CORBA.DomainManager; ! import org.omg.CORBA.ExceptionList; ! import org.omg.CORBA.NVList; ! import org.omg.CORBA.NamedValue; ! import org.omg.CORBA.Policy; ! import org.omg.CORBA.Request; ! import org.omg.CORBA.SetOverrideType; ! ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.IObjetOperations; /** * Classe déléguée pour l'interface IObjet * ! * @version $Id$ * @author Frederic Deniger */ ! public abstract class DObjet implements IObjetOperations,IObjet { /** * Description of the Field. *************** *** 26,52 **** */ protected DObjet() { ! try { ! String classname= getClass().getName(); ! String tieClassname= null; ! String delegateClassname= null; ! String packagename= classname.substring("org.fudaa.dodico.".length()); ! packagename= packagename.substring(0, packagename.lastIndexOf('.')); ! classname= classname.substring(classname.lastIndexOf('.') + 2); ! tieClassname= ! "org.fudaa.dodico.corba." + packagename + ".I" + classname + "_Tie"; ! Class tieClass= Class.forName(tieClassname); ! delegateClassname= ! "org.fudaa.dodico.corba." ! + packagename ! + ".I" ! + classname ! + "Operations"; ! Class delegateClass= Class.forName(delegateClassname); ! Constructor c= tieClass.getConstructor(new Class[] { delegateClass }); ! tie_= (IObjet)c.newInstance(new Object[] { this }); ! CDodico.rebind(null, tie_); ! } catch (Exception e) { ! e.printStackTrace(); ! } } /** --- 35,48 ---- */ protected DObjet() { ! ! } ! ! ! /** ! * Normalement devrait etre utilise par l'usine ! * @param _tie le tie de ce delegue ! */ ! public void setTie(IObjet _tie){ ! tie_=_tie; } /** *************** *** 155,157 **** --- 151,245 ---- CDodico.rebind(_name, tie()); } + /** + * @see org.omg.CORBA.Object#_create_request(org.omg.CORBA.Context, java.lang.String, org.omg.CORBA.NVList, org.omg.CORBA.NamedValue, org.omg.CORBA.ExceptionList, org.omg.CORBA.ContextList) + */ + public Request _create_request(Context _ctx, String _operation, NVList _arg_list, + NamedValue _result, ExceptionList _exclist, ContextList _ctxlist) { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_create_request(org.omg.CORBA.Context, java.lang.String, org.omg.CORBA.NVList, org.omg.CORBA.NamedValue) + */ + public Request _create_request(Context _ctx, String _operation, NVList _arg_list, + NamedValue _result) { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_duplicate() + */ + public org.omg.CORBA.Object _duplicate() { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_get_domain_managers() + */ + public DomainManager[] _get_domain_managers() { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_get_interface_def() + */ + public org.omg.CORBA.Object _get_interface_def() { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_get_policy(int) + */ + public Policy _get_policy(int _policy_type) { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_hash(int) + */ + public int _hash(int _maximum) { + new Throwable("DO NOT CALL").printStackTrace(); + return 0; + } + /** + * @see org.omg.CORBA.Object#_is_a(java.lang.String) + */ + public boolean _is_a(String _repositoryIdentifier) { + // new Throwable("DO NOT CALL").printStackTrace(); + return false; + } + /** + * @see org.omg.CORBA.Object#_is_equivalent(org.omg.CORBA.Object) + */ + public boolean _is_equivalent(org.omg.CORBA.Object _other) { + new Throwable("DO NOT CALL").printStackTrace(); + return false; + } + /** + * @see org.omg.CORBA.Object#_non_existent() + */ + public boolean _non_existent() { + new Throwable("DO NOT CALL").printStackTrace(); + return false; + } + /** + * @see org.omg.CORBA.Object#_release() + */ + public void _release() { + // new Throwable("DO NOT CALL").printStackTrace(); + } + /** + * @see org.omg.CORBA.Object#_request(java.lang.String) + */ + public Request _request(String _operation) { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } + /** + * @see org.omg.CORBA.Object#_set_policy_override(org.omg.CORBA.Policy[], org.omg.CORBA.SetOverrideType) + */ + public org.omg.CORBA.Object _set_policy_override(Policy[] _policies, SetOverrideType _set_add) { + new Throwable("DO NOT CALL").printStackTrace(); + return null; + } } Index: DPersonne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DPersonne.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DPersonne.java 25 Nov 2003 10:11:46 -0000 1.4 --- DPersonne.java 27 Apr 2004 16:05:37 -0000 1.5 *************** *** 1,3 **** ! /* * @file DPersonne.java * @creation 1998-04-20 --- 1,3 ---- ! /** * @file DPersonne.java * @creation 1998-04-20 *************** *** 8,20 **** */ package org.fudaa.dodico.objet; ! import java.lang.reflect.*; ! import org.fudaa.dodico.corba.objet.*; /** * Une classe representant une personne. * ! * @version $Revision$ $Date$ by $Author$ * @author Guillaume Desnoix */ ! public class DPersonne extends DObjet implements IPersonneOperations { public DPersonne() { super(); --- 8,22 ---- */ package org.fudaa.dodico.objet; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.IOrganisme; ! import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.corba.objet.IPersonneOperations; /** * Une classe representant une personne. * ! * @version $Id$ * @author Guillaume Desnoix */ ! public class DPersonne extends DObjet implements IPersonne,IPersonneOperations { public DPersonne() { super(); Index: DDiffuseur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DDiffuseur.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DDiffuseur.java 25 Nov 2003 10:11:46 -0000 1.7 --- DDiffuseur.java 27 Apr 2004 16:05:36 -0000 1.8 *************** *** 1,3 **** ! /* * @file DDiffuseur.java * @creation 2000-02-16 --- 1,3 ---- ! /** * @file DDiffuseur.java * @creation 2000-02-16 *************** *** 20,23 **** --- 20,24 ---- import java.util.Hashtable; import java.util.Vector; + import org.omg.CORBA.BAD_PARAM; import org.omg.CosNaming.Binding; *************** *** 28,32 **** --- 29,35 ---- import org.omg.CosNaming.NamingContextHelper; import org.omg.CosNaming.NamingContextOperations; + import org.fudaa.dodico.commun.DodicoPreferencesPanel; + import org.fudaa.dodico.corba.objet.IDiffuseur; import org.fudaa.dodico.corba.objet.IDiffuseurOperations; import org.fudaa.dodico.corba.objet.IObjet; *************** *** 40,51 **** public class DDiffuseur extends DService ! implements IDiffuseurOperations, NamingContextOperations { private static DDiffuseur INSTANCE= null; private final static DDiffuseur instance() { if (INSTANCE == null) { INSTANCE= new DDiffuseur(); ! CDodico.rebind( CDodico.generateName("::objet::IDiffuseur"), ! INSTANCE.tie()); } return INSTANCE; --- 43,55 ---- public class DDiffuseur extends DService ! implements IDiffuseur,IDiffuseurOperations, NamingContextOperations { private static DDiffuseur INSTANCE= null; private final static DDiffuseur instance() { if (INSTANCE == null) { INSTANCE= new DDiffuseur(); ! //pourquoi cree un diffuseur en tant que objet corba ! /*CDodico.rebind( CDodico.generateName("::objet::IDiffuseur"), ! INSTANCE.tie());*/ } return INSTANCE; Index: ServeurPersonne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/ServeurPersonne.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ServeurPersonne.java 31 Mar 2004 08:14:30 -0000 1.6 --- ServeurPersonne.java 27 Apr 2004 16:05:36 -0000 1.7 *************** *** 10,17 **** import java.util.Date; import org.fudaa.dodico.corba.objet.IOrganisme; import org.fudaa.dodico.corba.objet.IOrganismeHelper; import org.fudaa.dodico.corba.objet.IPersonne; - import org.fudaa.dodico.corba.usine.IUsine; /** * Une classe serveur pour Personne --- 10,17 ---- import java.util.Date; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.objet.IOrganisme; import org.fudaa.dodico.corba.objet.IOrganismeHelper; import org.fudaa.dodico.corba.objet.IPersonne; /** * Une classe serveur pour Personne Index: ServeurDefaut.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/ServeurDefaut.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurDefaut.java 25 Nov 2003 10:11:46 -0000 1.5 --- ServeurDefaut.java 27 Apr 2004 16:05:37 -0000 1.6 *************** *** 8,13 **** */ package org.fudaa.dodico.objet; import org.fudaa.dodico.lido.ServeurLido; - import org.fudaa.dodico.usine.ServeurUsine; import org.fudaa.dodico.vag.ServeurVag; /** --- 8,13 ---- */ package org.fudaa.dodico.objet; + import org.fudaa.dodico.boony.ServeurUsine; import org.fudaa.dodico.lido.ServeurLido; import org.fudaa.dodico.vag.ServeurVag; /** Index: RequeteServeurDodico.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodico.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RequeteServeurDodico.java 12 Mar 2004 10:16:13 -0000 1.8 --- RequeteServeurDodico.java 27 Apr 2004 16:05:36 -0000 1.9 *************** *** 8,19 **** */ package org.fudaa.dodico.objet; ! import java.io.*; ! import java.lang.reflect.*; ! import java.net.*; ! import java.text.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.usine.*; ! import org.fudaa.dodico.usine.UsineHelper; /** * Une classe cliente pour interroger et creer les serveurs Dodico --- 8,27 ---- */ package org.fudaa.dodico.objet; ! import java.lang.reflect.Method; ! import java.text.DateFormat; ! import java.util.Date; ! import java.util.Vector; ! ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.IObjetHelper; ! import org.fudaa.dodico.corba.objet.IOrganisme; ! import org.fudaa.dodico.corba.objet.IOrganismeHelper; ! import org.fudaa.dodico.corba.objet.IPersonne; ! import org.fudaa.dodico.corba.objet.IPersonneHelper; ! import org.fudaa.dodico.corba.objet.ITache; ! import org.fudaa.dodico.corba.objet.ITacheHelper; /** * Une classe cliente pour interroger et creer les serveurs Dodico *************** *** 28,32 **** /** */ public RequeteServeurDodico() { - creeUsine(); } /** --- 36,39 ---- *************** *** 44,65 **** return "::" + _serv.toLowerCase() + "::ICalcul" + capitalize(_serv); } - /** */ - private void creeUsine() { - IUsine u= UsineHelper.findUsine(); - if (u == null) { - u= UsineHelper.creeUsineLocale(); - System.out.println( - "Attention usine locale : elle sera détruite avec la machine virtuelle"); - } - u.reconnecte(CDodico.generateName("objet::IUsine")); - } /** * @return */ private IUsine findUsine() { ! IUsine usine= UsineHelper.findUsine(); if (usine == null) { ! creeUsine(); ! usine= UsineHelper.findUsine(); } return usine; --- 51,61 ---- return "::" + _serv.toLowerCase() + "::ICalcul" + capitalize(_serv); } /** * @return */ private IUsine findUsine() { ! IUsine usine= BoonyLib.findUsine(); if (usine == null) { ! usine= BoonyLib.findUsine(); } return usine; Index: CDodico.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CDodico.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CDodico.java 12 Dec 2003 10:30:54 -0000 1.8 --- CDodico.java 27 Apr 2004 16:05:36 -0000 1.9 *************** *** 1,11 **** /* ! * @file CDodico.java ! * @creation 1998-02-18 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... */ package org.fudaa.dodico.objet; import java.io.BufferedWriter; [...1497 lines suppressed...] + * * @see #exception * @param _e une exception *************** *** 864,869 **** exception(null, _e); } public static int getTimeInS() { return ((int) (System.currentTimeMillis() / 1000l)); } ! } --- 816,822 ---- exception(null, _e); } + public static int getTimeInS() { return ((int) (System.currentTimeMillis() / 1000l)); } ! } \ No newline at end of file Index: DTransfertFichierASCII.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DTransfertFichierASCII.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DTransfertFichierASCII.java 25 Nov 2003 10:11:46 -0000 1.4 --- DTransfertFichierASCII.java 27 Apr 2004 16:05:37 -0000 1.5 *************** *** 8,13 **** */ package org.fudaa.dodico.objet; ! import org.fudaa.dodico.corba.objet.*; ! import java.io.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,19 ---- */ package org.fudaa.dodico.objet; ! import java.io.BufferedWriter; ! import java.io.File; ! import java.io.FileWriter; ! import java.io.IOException; ! ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.objet.ITransfertFichierASCII; ! import org.fudaa.dodico.corba.objet.ITransfertFichierASCIIOperations; /** * @version $Revision$ $Date$ by $Author$ *************** *** 16,20 **** public class DTransfertFichierASCII extends DObjet ! implements ITransfertFichierASCIIOperations { public DTransfertFichierASCII() { super(); --- 22,26 ---- public class DTransfertFichierASCII extends DObjet ! implements ITransfertFichierASCII,ITransfertFichierASCIIOperations { public DTransfertFichierASCII() { super(); |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:05:48
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv361/src/org/fudaa/dodico/olb Modified Files: DResultatsOLB.java DParametresOLB.java DCalculOLB.java ServeurOLB.java Log Message: Modif DObjets Index: DParametresOLB.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/DParametresOLB.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DParametresOLB.java 22 Mar 2004 10:16:11 -0000 1.6 --- DParametresOLB.java 27 Apr 2004 16:05:39 -0000 1.7 *************** *** 1,3 **** ! /* * @file DParametresOLB.java * @creation 1999-11-25 --- 1,3 ---- ! /** * @file DParametresOLB.java * @creation 1999-11-25 *************** *** 8,20 **** */ package org.fudaa.dodico.olb; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.corba.olb.*; ! import org.fudaa.dodico.corba.geometrie.*; ! import org.fudaa.dodico.fortran.*; /** * Les parametres Olb --- 8,23 ---- */ package org.fudaa.dodico.olb; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.io.PrintWriter; ! ! import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.geometrie.SElement; ! import org.fudaa.dodico.corba.geometrie.SMaillage; ! import org.fudaa.dodico.corba.geometrie.SNoeud; ! import org.fudaa.dodico.corba.geometrie.SPoint; ! import org.fudaa.dodico.corba.olb.IParametresOLB; ! import org.fudaa.dodico.corba.olb.IParametresOLBOperations; ! import org.fudaa.dodico.objet.CDodico; /** * Les parametres Olb *************** *** 25,29 **** public class DParametresOLB extends DParametres ! implements IParametresOLBOperations { private SMaillage sMaillage_; public DParametresOLB() { --- 28,32 ---- public class DParametresOLB extends DParametres ! implements IParametresOLB,IParametresOLBOperations { private SMaillage sMaillage_; public DParametresOLB() { Index: ServeurOLB.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/ServeurOLB.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServeurOLB.java 25 Nov 2003 10:11:47 -0000 1.5 --- ServeurOLB.java 27 Apr 2004 16:05:39 -0000 1.6 *************** *** 1,3 **** ! /* * @file ServeurOLB.java * @creation 2000-02-16 --- 1,3 ---- ! /** * @file ServeurOLB.java * @creation 2000-02-16 *************** *** 8,13 **** */ package org.fudaa.dodico.olb; - import org.fudaa.dodico.objet.CDodico; import java.util.Date; /** * Lance le serveur du code de calcul <code>olb</code> (optimisation de largeur --- 8,15 ---- */ package org.fudaa.dodico.olb; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.objet.CDodico; /** * Lance le serveur du code de calcul <code>olb</code> (optimisation de largeur *************** *** 29,34 **** String nom= (args.length > 0 ? args[0] : CDodico.generateName("::dunes::ICalculOLB")); ! DCalculOLB s= new DCalculOLB(); ! CDodico.rebind(nom, s.tie()); System.out.println("OLB server running... "); System.out.println("Name: " + nom); --- 31,37 ---- String nom= (args.length > 0 ? args[0] : CDodico.generateName("::dunes::ICalculOLB")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculOLB.class)); System.out.println("OLB server running... "); System.out.println("Name: " + nom); Index: DResultatsOLB.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/DResultatsOLB.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DResultatsOLB.java 22 Mar 2004 10:16:11 -0000 1.7 --- DResultatsOLB.java 27 Apr 2004 16:05:38 -0000 1.8 *************** *** 1,3 **** ! /* * @file DResultatsOLB.java * @creation 1999-11-25 --- 1,3 ---- ! /** * @file DResultatsOLB.java * @creation 1999-11-25 *************** *** 8,19 **** */ package org.fudaa.dodico.olb; ! import java.io.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.olb.*; ! import org.fudaa.dodico.corba.geometrie.*; /** * Les resultats OLB --- 8,25 ---- */ package org.fudaa.dodico.olb; ! import java.io.File; ! import java.io.FileReader; ! import java.io.IOException; ! ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.geometrie.LTypeElement; ! import org.fudaa.dodico.corba.geometrie.SElement; ! import org.fudaa.dodico.corba.geometrie.SMaillage; ! import org.fudaa.dodico.corba.geometrie.SNoeud; ! import org.fudaa.dodico.corba.geometrie.SPoint; ! import org.fudaa.dodico.corba.olb.IResultatsOLB; ! import org.fudaa.dodico.corba.olb.IResultatsOLBOperations; ! import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.objet.CDodico; /** * Les resultats OLB *************** *** 24,28 **** public class DResultatsOLB extends DResultats ! implements IResultatsOLBOperations { private String fichier_= ""; private SMaillage sMai_= null; --- 30,34 ---- public class DResultatsOLB extends DResultats ! implements IResultatsOLB,IResultatsOLBOperations { private String fichier_= ""; private SMaillage sMai_= null; Index: DCalculOLB.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/DCalculOLB.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DCalculOLB.java 25 Nov 2003 10:11:47 -0000 1.6 --- DCalculOLB.java 27 Apr 2004 16:05:39 -0000 1.7 *************** *** 1,3 **** ! /* * @file DCalculOLB.java * @creation 1999-11-25 --- 1,3 ---- ! /** * @file DCalculOLB.java * @creation 1999-11-25 *************** *** 24,28 **** * @author Bertrand Marchand */ ! public class DCalculOLB extends DCalcul implements ICalculOLBOperations { private StringBuffer traceBuffer_= new StringBuffer(); private boolean succes_= false; --- 24,28 ---- * @author Bertrand Marchand */ ! public class DCalculOLB extends DCalcul implements ICalculOLB,ICalculOLBOperations { private StringBuffer traceBuffer_= new StringBuffer(); private boolean succes_= false; |
|
From: Frederic D. <de...@us...> - 2004-04-27 16:05:48
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv361/src/org/fudaa/dodico/navmer Modified Files: ServeurNavmer.java DResultatsNavmer.java DCalculNavmer.java DParametresNavmer.java Log Message: Modif DObjets Index: DResultatsNavmer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DResultatsNavmer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DResultatsNavmer.java 25 Nov 2003 10:11:46 -0000 1.5 --- DResultatsNavmer.java 27 Apr 2004 16:05:38 -0000 1.6 *************** *** 1,3 **** ! /* * @file DResultatsNavmer.java * @creation 2000-09-21 --- 1,3 ---- ! /** * @file DResultatsNavmer.java * @creation 2000-09-21 *************** *** 22,26 **** public class DResultatsNavmer extends DResultats ! implements IResultatsNavmerOperations { /** * Nom du fichier resultats. --- 22,26 ---- public class DResultatsNavmer extends DResultats ! implements IResultatsNavmer,IResultatsNavmerOperations { /** * Nom du fichier resultats. Index: ServeurNavmer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/ServeurNavmer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ServeurNavmer.java 25 Nov 2003 10:11:46 -0000 1.4 --- ServeurNavmer.java 27 Apr 2004 16:05:38 -0000 1.5 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.navmer; import java.util.Date; + + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.objet.CDodico; /** *************** *** 22,27 **** ? args[0] : CDodico.generateName("::navmer::ICalculNavmer")); ! DCalculNavmer s= new DCalculNavmer(); ! CDodico.rebind(nom, s.tie()); System.out.println("Navmer server running... "); System.out.println("Name: " + nom); --- 24,30 ---- ? args[0] : CDodico.generateName("::navmer::ICalculNavmer")); ! //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne ! //Cete Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba. ! CDodico.rebind(nom, BoonyLib.createService(DCalculNavmer.class)); System.out.println("Navmer server running... "); System.out.println("Name: " + nom); Index: DParametresNavmer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DParametresNavmer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DParametresNavmer.java 25 Nov 2003 10:11:46 -0000 1.5 --- DParametresNavmer.java 27 Apr 2004 16:05:38 -0000 1.6 *************** *** 1,3 **** ! /* * @file DParametresNavmer.java * @creation 2000-09-21 --- 1,3 ---- ! /** * @file DParametresNavmer.java * @creation 2000-09-21 *************** *** 8,17 **** */ package org.fudaa.dodico.navmer; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.navmer.*; ! import org.fudaa.dodico.fortran.*; /** * Lecture/Ecriture des Parametres de Navmer --- 8,44 ---- */ package org.fudaa.dodico.navmer; ! import java.io.BufferedReader; ! import java.io.BufferedWriter; ! import java.io.FileInputStream; ! import java.io.FileOutputStream; ! import java.io.FileReader; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.io.StreamTokenizer; ! import java.util.Vector; ! ! import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.navmer.IParametresNavmer; ! import org.fudaa.dodico.corba.navmer.IParametresNavmerOperations; ! import org.fudaa.dodico.corba.navmer.SCaracteristiquesNavire; ! import org.fudaa.dodico.corba.navmer.SCinematiqueCourant; ! import org.fudaa.dodico.corba.navmer.SCinematiqueNavire; ! import org.fudaa.dodico.corba.navmer.SCoefficientsNavire; ! import org.fudaa.dodico.corba.navmer.SCommandeNavire; ! import org.fudaa.dodico.corba.navmer.SCommandeRemorqueur; ! import org.fudaa.dodico.corba.navmer.SEnteteINI; ! import org.fudaa.dodico.corba.navmer.SEnvironnement; ! import org.fudaa.dodico.corba.navmer.SEtatNavire; ! import org.fudaa.dodico.corba.navmer.SIndexZonesCourant; ! import org.fudaa.dodico.corba.navmer.SLigneIndexZoneCourant; ! import org.fudaa.dodico.corba.navmer.SOrdreNavire; ! import org.fudaa.dodico.corba.navmer.SOrdreRemorqueur; ! import org.fudaa.dodico.corba.navmer.SParametresINI; ! import org.fudaa.dodico.corba.navmer.SParametresProgramme; ! import org.fudaa.dodico.corba.navmer.SPassageOrdre; ! import org.fudaa.dodico.corba.navmer.SZoneCourant; ! import org.fudaa.dodico.corba.navmer.nombreRemorqueurs; ! import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.fortran.NativeBinaryOutputStream; /** * Lecture/Ecriture des Parametres de Navmer *************** *** 22,26 **** public class DParametresNavmer extends DParametres ! implements IParametresNavmerOperations { /** * fichier ini. --- 49,53 ---- public class DParametresNavmer extends DParametres ! implements IParametresNavmer,IParametresNavmerOperations { /** * fichier ini. Index: DCalculNavmer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/DCalculNavmer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCalculNavmer.java 25 Nov 2003 10:11:45 -0000 1.5 --- DCalculNavmer.java 27 Apr 2004 16:05:38 -0000 1.6 *************** *** 1,3 **** ! /* * @file DCalculNavmer.java * @creation 2000-09-21 --- 1,3 ---- ! /** * @file DCalculNavmer.java * @creation 2000-09-21 *************** *** 21,25 **** * @author Nicolas Maillot */ ! public class DCalculNavmer extends DCalcul implements ICalculNavmerOperations { /** * .... --- 21,25 ---- * @author Nicolas Maillot */ ! public class DCalculNavmer extends DCalcul implements ICalculNavmer,ICalculNavmerOperations { /** * .... |
