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: <de...@us...> - 2003-07-04 16:07:37
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv18014
Modified Files:
distribution.xml build.xml .cvsignore
Log Message:
les jar sont realises a l'aide de GenJar
Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** distribution.xml 1 Apr 2003 15:56:25 -0000 1.3
--- distribution.xml 4 Jul 2003 16:07:34 -0000 1.4
***************
*** 74,77 ****
--- 74,87 ----
<echo message="Vous devez utiliser java 1.3"/>
<echo message="version utilisee: ${ant.java.version}"/>
+
+ <path id="fudaaDist.classpath.id">
+ <pathelement path="${fudaa.dist.classes.dir}"/>
+ <fileset dir="${ctulu.lib.dir}" includes="*.jar"/>
+ </path>
+ <property name="fudaaDist.classpath" refid="fudaaDist.classpath.id"/>
+ <patternset id="ressources.fic"
+ excludes="*.properties,*.xml,**/*.txt,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
+ **/CVS/**,**/Cvs/**,**/cvs/**,**/*.class,**/*.NEW" />
+ <taskdef resource="genjar.properties"/>
</target>
***************
*** 208,212 ****
! <target name="jar_lido" depends="build"
description="cree fudaa_lido.jar">
<property name="fudaa.lido.jar.file" value="${fudaa.dist.jar.dir}/fudaa_lido.jar"/>
--- 218,222 ----
! <target name="jar_lido" depends=".initialisationCheck"
description="cree fudaa_lido.jar">
<property name="fudaa.lido.jar.file" value="${fudaa.dist.jar.dir}/fudaa_lido.jar"/>
***************
*** 216,262 ****
<mkdir dir="${fudaa.dist.jar.dir}"/>
<delete file="${fudaa.lido.jar.file}"/>
! <jar jarfile="${fudaa.lido.jar.file}" compress="true" update="false">
<fileset dir="${fudaa.dist.classes.dir}">
! <!-- ctulu -->
! <include name="com/memoire/"/>
! <include name="com/diaam/"/>
! <exclude name="com/memoire/alma/"/>
! <exclude name="com/memoire/agl/"/>
! <exclude name="com/memoire/ant/"/>
! <exclude name="com/memoire/vacvs/"/>
! <exclude name="com/memoire/jedit/"/>
! <exclude name="com/jdistro/"/>
! <!-- dodico -->
! <exclude name="org/fudaa/dodico/test"/>
! <include name="org/fudaa/dodico/fortran/"/>
! <include name="org/omg/"/>
! <include name="org/fudaa/dodico/**/base/"/>
! <include name="org/fudaa/dodico/**/calcul/"/>
! <include name="org/fudaa/dodico/**/evenement/"/>
! <include name="org/fudaa/dodico/**/association/"/>
! <include name="org/fudaa/dodico/**/collection/"/>
! <include name="org/fudaa/dodico/commun/"/>
! <include name="org/fudaa/dodico/**/usine/"/>
! <include name="org/fudaa/dodico/**/objet/"/>
! <include name="org/fudaa/dodico/**/lido/"/>
! <!-- ebli -->
! <include name="org/fudaa/ebli/"/>
! <exclude name="org/fudaa/ebli/test/"/>
! <exclude name="org/fudaa/ebli/volume/"/>
! <!-- fudaa -->
! <include name="org/fudaa/fudaa/lido/"/>
! <include name="org/fudaa/fudaa/commun/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
! </fileset>
! <fileset dir="${fudaa.dist.classes.dir}">
! <include name="org/fudaa/dodico/corba/**/I*.class"/>
! <exclude name="org/fudaa/dodico/corba/**/I*_*.class"/>
! <exclude name="org/fudaa/dodico/corba/**/I*Holder.class"/>
! <exclude name="org/fudaa/dodico/corba/**/I*Helper.class"/>
</fileset>
! <!-- librairies -->
! <zipfileset src="${ctulu.lib.dir}/koml.jar" includes="**/**"/>
! </jar>
</target>
--- 226,288 ----
<mkdir dir="${fudaa.dist.jar.dir}"/>
<delete file="${fudaa.lido.jar.file}"/>
! <genjar jarfile="${fudaa.lido.jar.file}">
! <classpath path="${fudaaDist.classpath}"/>
! <class name="org.fudaa.fudaa.lido.Lido"/>
+ <class>
<fileset dir="${fudaa.dist.classes.dir}">
! <include name="org/fudaa/dodico/corba/base/*.class"/>
! <include name="org/fudaa/dodico/corba/calcul/*.class"/>
! <include name="org/fudaa/dodico/corba/association/*.class"/>
! <include name="org/fudaa/dodico/corba/evenement/*.class"/>
! <include name="org/fudaa/dodico/corba/objet/*.class"/>
! <include name="org/fudaa/dodico/corba/lido/*.class"/>
! <include name="org/fudaa/dodico/corba/usine/*.class"/>
</fileset>
! </class>
!
! <resource>
! <fileset dir="${fudaa.dist.classes.dir}">
! <patternset refid="ressources.fic"/>
! <include name="com/memoire/bu/"/>
! <include name="org/fudaa/ebli/ressource/"/>
! <include name="org/fudaa/fudaa/ressource/"/>
!
! <include name="org/fudaa/fudaa/lido/"/>
! </fileset>
! </resource>
!
! <classfilter>
! <exclude name="org.fudaa.dodico.corba."/>
! <exclude name="org.fudaa.dodico."/>
!
! <include name="org.fudaa.dodico.corba.base."/>
!
! <include name="org.fudaa.dodico.corba.calcul."/>
! <include name="org.fudaa.dodico.calcul."/>
!
! <include name="org.fudaa.dodico.corba.evenement."/>
! <include name="org.fudaa.dodico.evenement."/>
!
! <include name="org.fudaa.dodico.corba.association."/>
! <include name="org.fudaa.dodico.association."/>
!
! <include name="org.fudaa.dodico.corba.usine."/>
! <include name="org.fudaa.dodico.usine."/>
!
! <include name="org.fudaa.dodico.corba.objet."/>
! <include name="org.fudaa.dodico.objet."/>
!
! <include name="org.fudaa.dodico.fortran."/>
! <include name="org.fudaa.dodico.commun."/>
!
! <include name="org.fudaa.dodico.corba.lido."/>
! <include name="org.fudaa.dodico.lido."/>
! </classfilter>
!
!
!
! </genjar>
!
</target>
Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml 1 Apr 2003 15:54:32 -0000 1.2
--- build.xml 4 Jul 2003 16:07:34 -0000 1.3
***************
*** 80,84 ****
<!--definition des pattern-->
<patternset id="ressources.fic"
! excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
**/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<condition property="sourcesAvailable">
--- 80,84 ----
<!--definition des pattern-->
<patternset id="ressources.fic"
! excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
**/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
<condition property="sourcesAvailable">
Index: .cvsignore
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore 4 Feb 2003 17:41:44 -0000 1.3
--- .cvsignore 4 Jul 2003 16:07:34 -0000 1.4
***************
*** 11,12 ****
--- 11,15 ----
purge
uncvs
+ .uml
+ .project
+ .classpath
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv17702
Added Files:
FudaaCommonImplementation.java FudaaPanelNavigation.java
FudaaPreferencesAbstract.java FudaaUI.java
Log Message:
Ajout classe de bases pour fudaa
--- NEW FILE: FudaaCommonImplementation.java ---
/*
* @file FudaaCommonImplementation.java
* @creation 12 juin 2003
* @modification $Date: 2003/07/04 16:05:04 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.commun;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.print.PrinterJob;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import javax.swing.JInternalFrame;
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuDesktopPreferencesPanel;
import com.memoire.bu.BuDialogWarning;
import com.memoire.bu.BuFileChooser;
import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuHelpFrame;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLanguagePreferencesPanel;
import com.memoire.bu.BuLookPreferencesPanel;
import com.memoire.bu.BuMainPanel;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuPreferencesFrame;
import com.memoire.bu.BuResource;
import com.memoire.bu.BuTaskOperation;
import com.memoire.bu.BuUserPreferencesPanel;
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.ebli.impression.EbliFillePrevisualisation;
import org.fudaa.ebli.impression.EbliMiseEnPageDialog;
import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.impression.EbliPageable;
import org.fudaa.fudaa.commun.aide.FudaaAidePreferencesPanel;
import org.fudaa.fudaa.commun.aide.FudaaAstuces;
import org.fudaa.fudaa.commun.fileChooser.FudaaFileChooser;
/**
* @author deniger
* @version $Id: FudaaCommonImplementation.java,v 1.1 2003/07/04 16:05:04 deniger Exp $
*/
public abstract class FudaaCommonImplementation
extends BuCommonImplementation
implements FudaaUI
{
/**
* Description du champ
*/
protected BuPreferencesFrame preferences_;
protected EbliFillePrevisualisation previsuFille_;
/**
* Description du champ
*/
protected BuHelpFrame aide_;
public final static String LOCAL_MAN = getUserDirUrl() + "/aide/";
public final static String REMOTE_MAN =
"http://www.utc.fr/fudaa/aide/aide_html/";
public static String getUserDirUrl()
{
return FudaaLib.pathToUrl(System.getProperty("user.dir"));
}
/**
* Permet d'afficher une url <code>_url</code> dans un browser. Le
* browser est choisi en fonction des preferences (<code>browser.type</code>)
*
*/
public void displayURL(String _url)
{
if ((_url == null) || (_url.length() == 0))
_url = FudaaImplementation.LOCAL_MAN;
if ((_url.startsWith("file")) && (_url.endsWith("/")))
_url = _url + "index.html";
if (FudaaLib.DEBUG)
System.out.println("FudaaCommonImplementation.displayURL " + _url);
if (BuPreferences.BU.getIntegerProperty("browser.type") == 1)
{
if (aide_ == null)
aide_ = new BuHelpFrame();
addInternalFrame(aide_);
aide_.setDocumentUrl(_url);
}
else
{
if (_url == null)
{
BuInformationsSoftware il = getInformationsSoftware();
_url = il.http;
}
FudaaBrowserControl.displayURL(_url);
}
}
/**
* Permet d'afficher l'url correspondant a la chaine <code>_s</code>.
* Si la chaine n'est pas une URL valide un panneau d'erreur est
* renvoye.
* @see #displayURL(String)
*/
public void displayURLFormString(String _s)
{
try
{
String url = new URL(_s).toString();
if (FudaaLib.DEBUG)
System.err.println(getClass().getName() + " " + "url= " + url);
if (url != null)
displayURL(url);
}
catch (MalformedURLException e)
{
FudaaLib.showError(
this,
FudaaLib.geti18n("Erreur"),
FudaaLib.geti18n("impossible d'afficher la page ") + _s);
e.printStackTrace();
}
}
/**
* Permet d'afficher le contenu du fichier f dans un browser.
* @see #displayURL(String)
*/
public void displayURL(File _f)
{
try
{
String url = _f.toURL().toString();
if (FudaaLib.DEBUG)
System.err.println(getClass().getName() + " " + "url= " + url);
if (url != null)
displayURL(url);
}
catch (MalformedURLException e)
{
FudaaLib.showError(
this,
FudaaLib.geti18n("Erreur"),
FudaaLib.geti18n("impossible d'afficher la page ")
+ _f.getAbsolutePath());
e.printStackTrace();
}
}
/**
* @return valeur Astuces
*/
public FudaaAstuces getAstuces()
{
return FudaaAstuces.FUDAA;
}
/**
* Renvoie les preferences de l'application
*/
public abstract BuPreferences getApplicationPreferences();
/**
* Description de la methode
*
* @param _evt
*/
public void actionPerformed(ActionEvent _evt)
{
String action = _evt.getActionCommand();
String arg = "";
int i = action.indexOf('(');
if (i >= 0)
{
arg = action.substring(i + 1, action.length() - 1);
action = action.substring(0, i);
}
if (("PREVISUALISER".equals(action))
|| ("MISEENPAGE".equals(action))
|| ("IMPRIMER".equals(action)))
{
gestionnaireImpression(action);
}
else if (action.equals("PREFERENCE"))
{
preferences();
}
else
{
super.actionPerformed(_evt);
}
}
/**
* Description de la methode
*/
public final void print()
{
// Systeme d'impression du JDK1.1
// Ne doit plus etre utiliser dans Fudaa
try
{
throw new Exception("The method FudaaImplementation.print() is deprecated.");
}
catch (Exception ex)
{
ex.printStackTrace();
}
super.print();
}
private void gestionnaireImpression(String _commande)
{
JInternalFrame frame = getCurrentInternalFrame();
final EbliPageable target;
if (frame instanceof EbliPageable)
target = (EbliPageable) frame;
else if (frame instanceof EbliFillePrevisualisation)
target = ((EbliFillePrevisualisation) frame).getEbliPageable();
else
{
new BuDialogWarning(
this,
getInformationsSoftware(),
FudaaLib.geti18n("Cette fenêtre n'est pas imprimable"))
.activate();
return;
}
if ("IMPRIMER".equals(_commande))
{
cmdImprimer(target);
}
else if ("MISEENPAGE".equals(_commande))
cmdMiseEnPage(target);
else if ("PREVISUALISER".equals(_commande))
cmdPrevisualisation(target);
}
/**
* Impression de la page <code>_target</code> dans un nouveau thread.
*/
public void cmdImprimer(EbliPageable _target)
{
final PrinterJob printJob = PrinterJob.getPrinterJob();
final BuMainPanel mp = getMainPanel();
printJob.setPageable(_target);
if (printJob.printDialog())
{
mp.setProgression(5);
new BuTaskOperation(this, BuResource.BU.getString("Impression"))
{
public void act()
{
try
{
mp.setProgression(10);
printJob.print();
mp.setProgression(100);
}
catch (Exception PrintException)
{
mp.setProgression(0);
PrintException.printStackTrace();
}
}
}
.start();
}
}
public void cmdMiseEnPage(EbliPageable _target)
{
new EbliMiseEnPageDialog(_target, getApp(), getInformationsSoftware())
.activate();
}
public void cmdPrevisualisation(EbliPageable _target)
{
if (previsuFille_ == null)
{
previsuFille_ = new EbliFillePrevisualisation(getApp(), _target);
}
else
{
System.out.println("setEblipageable");
previsuFille_.setEbliPageable(_target);
}
addInternalFrame(previsuFille_);
}
public void contextHelp(String _url)
{
String url = new String(_url.trim());
if ((url == null) || (url.length() == 0) || (url.startsWith("#")))
{
url = "index.html";
}
super.contextHelp(url);
}
protected void buildPreferences()
{
preferences_ = new BuPreferencesFrame();
preferences_.addTab(new BuUserPreferencesPanel(this));
preferences_.addTab(new BuLanguagePreferencesPanel(this));
preferences_.addTab(new BuDesktopPreferencesPanel(this));
preferences_.addTab(new BuLookPreferencesPanel(this));
preferences_.addTab(new BuBrowserPreferencesPanel(this));
preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
preferences_.addTab(
new FudaaAidePreferencesPanel(this, getApplicationPreferences()));
}
/**
* Description de la methode
*/
protected final void preferences()
{
if (preferences_ == null)
buildPreferences();
addInternalFrame(preferences_);
}
/**
*
*/
public void error(String _titre, String _text)
{
FudaaLib.showError(this, _titre, _text);
System.err.println(_titre + " " + _text);
}
/**
*
*/
public void message(String _titre, String _text)
{
FudaaLib.showMessage(this, _titre, _text);
}
/**
*
*/
public boolean confirmation(String _titre, String _text)
{
return FudaaLib.showConfirmation(this, _titre, _text);
}
/**
*
*/
public boolean manageErrorOperation(FileOperationSynthese _opResult)
{
if (_opResult.getClosingException() != null)
{
System.err.println(
"FATAL :erreur lors de la fermeture de " + _opResult.getFile());
}
if (_opResult.getAnalyze() != null)
{
if (_opResult.getAnalyze().getFatalError() != null)
{
DodicoAnalyze.Field f = _opResult.getAnalyze().getFatalError();
error(
_opResult.getDesc(),
f.getOffset() < 0 ? f.getMessage() : f.toString());
return true;
}
else
{
FudaaLib.showError(
this,
_opResult.getDesc(),
_opResult.getAnalyze().getResume());
}
}
return false;
}
/**
* @param _msg
*/
public void error(String _msg)
{
error("Erreur", _msg);
}
/**
* @param _msg
*/
public void message(String _msg)
{
message("Message", _msg);
}
public File ouvrirFileChooser(String[] _extension, String _desc)
{
return ouvrirFileChooser(_extension, _desc, getFrame(), false);
}
public File ouvrirFileChooser(
String[] _extension,
String _desc,
boolean _newFile)
{
return ouvrirFileChooser(_extension, _desc, getFrame(), _newFile);
}
public static File ouvrirFileChooser(
String[] _extension,
String _desc,
Component _parent)
{
return ouvrirFileChooser(_extension, _desc, _parent, false);
}
public static File ouvrirFileChooser(
String[] _extension,
String _desc,
Component _parent,boolean _saveDialog)
{
BuFileFilter flt = null;
String titre = _desc;
if (_extension != null)
{
flt = new BuFileFilter(_extension, _desc);
}
return ouvrirFileChooser(titre, flt, _parent, _saveDialog);
}
public static File ouvrirFileChooser(
String _titre,
BuFileFilter _filtre,
Component _parent,
boolean _saveDialog)
{
BuFileChooser fileChooser = new FudaaFileChooser();
fileChooser.setFileHidingEnabled(true);
if (FudaaLib.getLastDir() != null)
{
fileChooser.setCurrentDirectory(FudaaLib.getLastDir());
}
fileChooser.setMultiSelectionEnabled(false);
fileChooser.setDialogTitle(_titre);
if (_filtre != null)
fileChooser.setFileFilter(_filtre);
int returnVal =
_saveDialog
? fileChooser.showSaveDialog(_parent)
: fileChooser.showOpenDialog(_parent);
if (returnVal == BuFileChooser.APPROVE_OPTION)
{
File f = fileChooser.getSelectedFile();
FudaaLib.setLastDir(f);
return f;
}
else
return null;
}
}
--- NEW FILE: FudaaPanelNavigation.java ---
/*
* @file FudaaPanneauNavigation.java
* @creation 1999-04-27
* @modification $Date: 2003/07/04 16:05:04 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.commun;
import com.memoire.bu.*;
import javax.swing.*;
import javax.swing.border.*;
import java.awt.event.*;
import java.awt.*;
/**
* @version $Revision: 1.1 $ $Date: 2003/07/04 16:05:04 $ by $Author: deniger $
* @author Axel von Arnim
*/
public class FudaaPanelNavigation
extends BuPanel
{
public final static int INSETS_SIZE=5;
public final static int AUCUN =0x00;
public final static int VALIDER =0x01;
public final static int FERMER =0x02;
public final static int PRECEDENT =0x04;
public final static int SUIVANT =0x08;
public final static int TERMINER =0x10;
public final static int ANNULER =0x20;
public final static int ALIGN_LEFT =0x40;
public final static int ALIGN_RIGHT =0x80;
public final static int ALIGN_CENTER=0x100;
BuButton btNavValider_;
BuButton btNavFermer_;
BuButton btNavPrecedent_;
BuButton btNavSuivant_;
BuButton btNavTerminer_;
BuPanel pnNav_;
public FudaaPanelNavigation()
{ this(0); }
public FudaaPanelNavigation(int mode)
{
btNavValider_=null;
btNavFermer_=null;
btNavPrecedent_=null;
btNavSuivant_=null;
btNavTerminer_=null;
pnNav_=new BuPanel();
setLayout(new BorderLayout());
setBorder(new EmptyBorder(new Insets(0, 0, INSETS_SIZE, 0)));
if( (mode&VALIDER)!=0 ) {
btNavValider_=new BuButton("Valider");
btNavValider_.setName("btNAVVALIDER");
btNavValider_.setActionCommand("VALIDER");
pnNav_.add(btNavValider_);
}
if( (mode&FERMER)!=0 ) {
btNavFermer_=new BuButton("Fermer");
btNavFermer_.setName("btNAVFERMER");
btNavFermer_.setActionCommand("FERMER");
pnNav_.add(btNavFermer_);
}
if( (mode&PRECEDENT)!=0 ) {
btNavPrecedent_=new BuButton("Précédent");
btNavPrecedent_.setName("btNAVPRECEDENT");
btNavPrecedent_.setActionCommand("PRECEDENT");
pnNav_.add(btNavPrecedent_);
}
if( (mode&SUIVANT)!=0 ) {
btNavSuivant_=new BuButton("Suivant");
btNavSuivant_.setName("btNAVSUIVANT");
btNavSuivant_.setActionCommand("SUIVANT");
pnNav_.add(btNavSuivant_);
}
if( (mode&TERMINER)!=0 ) {
btNavTerminer_=new BuButton("Terminer");
btNavTerminer_.setName("btNAVTERMINER");
btNavTerminer_.setActionCommand("TERMINER");
pnNav_.add(btNavTerminer_);
}
// Layout
if( (mode&ALIGN_LEFT)!=0 )
add(BorderLayout.WEST, pnNav_);
else
if( (mode&ALIGN_RIGHT)!=0 )
add(BorderLayout.EAST, pnNav_);
else
add(BorderLayout.CENTER, pnNav_);
}
public void setName(String n)
{
if( btNavValider_!=null ) btNavValider_.setName(n+":VALIDER");
if( btNavFermer_!=null ) btNavFermer_.setName(n+":FERMER");
if( btNavPrecedent_!=null ) btNavPrecedent_.setName(n+":PRECEDENT");
if( btNavSuivant_!=null ) btNavSuivant_.setName(n+":SUIVANT");
if( btNavTerminer_!=null ) btNavTerminer_.setName(n+":TERMINER");
super.setName(n);
}
public void addActionListener(ActionListener _l)
{
if( btNavValider_!=null ) btNavValider_ .addActionListener(_l);
if( btNavFermer_!=null ) btNavFermer_ .addActionListener(_l);
if( btNavPrecedent_!=null ) btNavPrecedent_ .addActionListener(_l);
if( btNavSuivant_!=null ) btNavSuivant_ .addActionListener(_l);
if( btNavTerminer_!=null ) btNavTerminer_ .addActionListener(_l);
}
public void removeActionListener(ActionListener _l)
{
if( btNavValider_!=null ) btNavValider_ .removeActionListener(_l);
if( btNavFermer_!=null ) btNavFermer_ .removeActionListener(_l);
if( btNavPrecedent_!=null ) btNavPrecedent_ .removeActionListener(_l);
if( btNavSuivant_!=null ) btNavSuivant_ .removeActionListener(_l);
if( btNavTerminer_!=null ) btNavTerminer_ .removeActionListener(_l);
}
}
--- NEW FILE: FudaaPreferencesAbstract.java ---
/*
* @file FudaaPreferencesAbstract.java
* @creation 11 juin 2003
* @modification $Date: 2003/07/04 16:05:04 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.commun;
import java.util.Enumeration;
import java.util.Properties;
import com.memoire.bu.BuPreferences;
/**
* @author deniger
* @version $Id: FudaaPreferencesAbstract.java,v 1.1 2003/07/04 16:05:04 deniger Exp $
*/
public abstract class FudaaPreferencesAbstract extends BuPreferences
{
protected Properties defaultValues_;
public FudaaPreferencesAbstract()
{
super();
defaultValues_=new Properties();
values_=new Properties(defaultValues_);
readIniFile();
}
}
--- NEW FILE: FudaaUI.java ---
/*
* @file TrDicoUI.java
* @creation 6 juin 2003
* @modification $Date: 2003/07/04 16:05:04 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.commun;
import org.fudaa.dodico.commun.DodicoUI;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
/**
* @author deniger
* @version $Id: FudaaUI.java,v 1.1 2003/07/04 16:05:04 deniger Exp $
*/
public interface FudaaUI extends DodicoUI
{
public boolean confirmation(String titre_,String text_);
/**
* Gere les erreurs survenues pour l'operation et renvoie true si erreur fatale.
*/
public boolean manageErrorOperation(FileOperationSynthese _opResult);
}
|
|
From: <de...@us...> - 2003-07-04 16:03:25
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test
In directory sc8-pr-cvs1:/tmp/cvs-serv17426
Added Files:
TestTextField.java
Log Message:
test des textfiled
--- NEW FILE: TestTextField.java ---
/*
* @file TestTextField.java
* @creation 19 juin 2003
* @modification $Date: 2003/07/04 16:03:22 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.test;
import java.awt.event.FocusEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.BorderFactory;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuTextField;
import org.fudaa.fudaa.lido.ihmhelper.gestion.LidoParamsHelper;
/**
* @author deniger
* @version $Id: TestTextField.java,v 1.1 2003/07/04 16:03:22 deniger Exp $
*/
public class TestTextField
{
/**
*
*/
public TestTextField()
{
super();
}
public static void main(String[] args)
{
JFrame frame=new JFrame();
frame.addWindowListener(new WindowAdapter()
{
public void windowClosing(WindowEvent _e){ System.exit(0);}
});
JPanel p=new JPanel(new BuGridLayout(2,5,5,false,false,false,false));
p.setBorder(BorderFactory.createEmptyBorder(5, 5,5,5));
BuTextField butxt=BuTextField.createDoubleField();
butxt.setText("123,456");
butxt.setColumns(8);
butxt.setDisplayFormat(LidoParamsHelper.NUMBER_FORMAT_DOUBLE);
p.add(new JLabel("bu"));
p.add(butxt);
JTextField jtxt=new JTextField()
{
protected void processFocusEvent(FocusEvent _evt)
{
System.out.println("");
super.processFocusEvent(_evt);
}
};
jtxt.setText("123,456");
jtxt.setColumns(8);
p.add(new JLabel("jt"));
p.add(jtxt);
frame.setContentPane(p);
frame.pack();
frame.setSize(800, 800);
frame.setVisible(true);
}
}
|
|
From: <de...@us...> - 2003-07-04 16:01:50
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test In directory sc8-pr-cvs1:/tmp/cvs-serv17289 Added Files: semis.txt Log Message: petit fichier semis pour test --- NEW FILE: semis.txt --- 0 0 0 0 10 0 0 20 0 0 30 0 0 40 0 0 50 0 |
|
From: <de...@us...> - 2003-07-04 16:00:34
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv17137/tr
Added Files:
TestTrMaillage.java
Log Message:
Ajout test
--- NEW FILE: TestTrMaillage.java ---
/*
* @file TestTrMaillage.java
* @creation 30 juin 2003
* @modification $Date: 2003/07/04 16:00:32 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.fudaa.test.tr;
import java.awt.Color;
import java.awt.Dimension;
import java.io.File;
import java.util.HashMap;
import javax.swing.JFrame;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuDesktop;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuSplit2Pane;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fichiers.FileOperationSynthese;
import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.telemac.io.SerafinFileFormat;
import org.fudaa.dodico.telemac.io.SerafinInterface;
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.calque.BGroupeCalque;
import org.fudaa.ebli.calque.BVueCalque;
import org.fudaa.ebli.calque.EbliFilleCalques;
import org.fudaa.ebli.calque.ZCalqueLongPolygone;
import org.fudaa.ebli.calque.ZCalquePoint;
import org.fudaa.ebli.calque.ZCalquePolygone;
import org.fudaa.ebli.calque.ZEbliFilleCalques;
import org.fudaa.ebli.trace.TracePoint;
import org.fudaa.fudaa.tr.data.TrMaillage;
/**
* @author deniger
* @version $Id: TestTrMaillage.java,v 1.1 2003/07/04 16:00:32 deniger Exp $
*/
public class TestTrMaillage {
ZEbliFilleCalques fc_;
BVueCalque vue_;
BArbreCalque arbre_;
/**
*
*/
public TestTrMaillage(TrMaillage _maillage) {
vue_ = new BVueCalque();
vue_.setBackground(Color.white);
vue_.setPreferredSize(new Dimension(500, 400));
arbre_ = new BArbreCalque();
BGroupeCalque gc = new BGroupeCalque();
gc.setTitle("Mailleur");
ZCalquePoint zpt = new ZCalquePoint(_maillage.getModelePoint());
ZCalquePolygone zpoly = new ZCalquePolygone(_maillage.getModelePolygone());
ZCalqueLongPolygone zlpoly =
new ZCalqueLongPolygone(_maillage.getModeleBord());
zpt.setIcone(TracePoint.getIcone(TracePoint.POINT, 1, Color.black));
zpt.setName("cqPOINTMAILLEUR");
zpt.setTitle("points");
gc.add(zpt);
gc.add(zpoly);
gc.add(zlpoly);
fc_ = new ZEbliFilleCalques(vue_, arbre_, null, null);
// fc_.setSelectionVisible(true);
fc_.setName("MAILLEUR");
fc_.setTitle("Modele");
fc_.setCalque(gc);
fc_.setCalqueInteractionActif(fc_.getCalqueSelection(), true);
fc_.restaurer();
}
public static void main(String[] args) {
HashMap arg = DodicoLib.parseArgs(args);
String fileName = (String) arg.get("-f");
if (fileName == null)
fileName = (String) arg.get("-file");
if (fileName == null) {
System.err.println("Fichier non trouve");
System.exit(1);
}
File f = new File(fileName);
FileOperationSynthese op = new FileOperationSynthese();
System.out.println("Debut Lecture");
SerafinInterface inter = SerafinFileFormat.getInstance().read(f, op, null);
System.out.println("fin Lecture");
if (op.containsFatalError()) {
op.getAnalyze().printResume("!! ");
System.exit(1);
}
else if (op.containsMessages()) {
op.getAnalyze().printResume(" ");
}
// TrMaillage maillage =
// new TrMaillage(
// H2dLib.createFor(inter.getMaillage(), inter.getPtsFrontiere(), null));
System.out.println(inter.getPtsFrontiere()[0]);
long t1=System.currentTimeMillis();
inter.getMaillage().computeBordFast(null);
long t2=System.currentTimeMillis();
System.out.println("temps "+(t2-t1));
TrMaillage maillage = new TrMaillage(inter.getMaillage());
TestTrMaillage test = new TestTrMaillage(maillage);
JFrame frame = new JFrame("Essai");
BuDesktop desk = new BuDesktop();
desk.setPreferredSize(new Dimension(300, 300));
test.arbre_.setPreferredSize(new Dimension(50, 300));
desk.add(test.fc_);
test.fc_.setVisible(true);
BuSplit2Pane split = new BuSplit2Pane(desk, test.arbre_);
frame.setContentPane(split);
test.fc_.restaurer();
test.vue_.changeRepere(test.fc_, maillage.getDomaine());
frame.pack();
frame.setVisible(true);
test.fc_.restaurer();
}
}
|
|
From: <de...@us...> - 2003-07-04 15:59:07
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1:/tmp/cvs-serv16824 Added Files: diff_16.gif modifier_16.gif Log Message: ajout icone pour tr --- NEW FILE: diff_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: modifier_16.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2003-07-04 15:57:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/dunes
Modified Files:
Dunes.java DunesAstuces.java DunesFilleMailleur.java
DunesFilleParametres.java DunesImplementation.java
InterfaceDunesFilleMailleur.java ZDunesFilleMailleur.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Dunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/Dunes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dunes.java 18 Mar 2003 17:35:28 -0000 1.2
--- Dunes.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 109,117 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(DunesImplementation.informationsSoftware());
! if( update.scanForUpdate() ) {
! } else System.err.println("Dunes : no update");
! }
// Initialisation du serveur Dodico.
--- 109,117 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(DunesImplementation.informationsSoftware());
! // if( update.scanForUpdate() ) {
! // } else System.err.println("Dunes : no update");
! // }
// Initialisation du serveur Dodico.
Index: DunesAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/DunesAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DunesAstuces.java 18 Mar 2003 17:35:28 -0000 1.2
--- DunesAstuces.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 9,14 ****
package org.fudaa.fudaa.dunes;
- import org.fudaa.fudaa.commun.FudaaAstuces;
import org.fudaa.fudaa.commun.FudaaPreferences;
import com.memoire.bu.BuPreferences;
--- 9,15 ----
package org.fudaa.fudaa.dunes;
import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+
import com.memoire.bu.BuPreferences;
Index: DunesFilleMailleur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/DunesFilleMailleur.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DunesFilleMailleur.java 18 Mar 2003 17:35:28 -0000 1.3
--- DunesFilleMailleur.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 26,29 ****
--- 26,30 ----
import org.fudaa.ebli.geometrie.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
/**
Index: DunesFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/DunesFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DunesFilleParametres.java 18 Mar 2003 17:35:28 -0000 1.3
--- DunesFilleParametres.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 21,24 ****
--- 21,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.dunes.*;
Index: DunesImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/DunesImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DunesImplementation.java 18 Mar 2003 17:35:26 -0000 1.2
--- DunesImplementation.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 18,21 ****
--- 18,25 ----
import java.beans.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
+
import com.memoire.bu.*;
import org.fudaa.ebli.calque.*;
Index: InterfaceDunesFilleMailleur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/InterfaceDunesFilleMailleur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InterfaceDunesFilleMailleur.java 18 Mar 2003 17:35:28 -0000 1.2
--- InterfaceDunesFilleMailleur.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 26,29 ****
--- 26,30 ----
import org.fudaa.ebli.geometrie.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
/**
Index: ZDunesFilleMailleur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dunes/ZDunesFilleMailleur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZDunesFilleMailleur.java 18 Mar 2003 17:35:27 -0000 1.2
--- ZDunesFilleMailleur.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 26,29 ****
--- 26,30 ----
import org.fudaa.ebli.geometrie.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
/**
|
|
From: <de...@us...> - 2003-07-04 15:57:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d In directory sc8-pr-cvs1:/tmp/cvs-serv15566/hydraulique1d Modified Files: Hydraulique1dBaseImplementation.java Log Message: Ajout de FudaaCommonImplementation Index: Hydraulique1dBaseImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Hydraulique1dBaseImplementation.java 18 Mar 2003 17:57:59 -0000 1.3 --- Hydraulique1dBaseImplementation.java 4 Jul 2003 15:56:39 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- import org.fudaa.dodico.corba.evenement.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import com.memoire.bu.*; |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/hiswa
Modified Files:
Hiswa.java HiswaFilleEditeur.java HiswaFilleParametres.java
HiswaFilleTableau.java HiswaImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Hiswa.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/Hiswa.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hiswa.java 18 Mar 2003 17:36:39 -0000 1.2
--- Hiswa.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 84,95 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(HiswaImplementation.informationsSoftware());
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if( update.scanForUpdate() ) {
! if( update.startUpdate() )
! System.exit(0);
! } else System.err.println("Hiswa : no update");
! }
BuSplashScreen ss = new BuSplashScreen(HiswaImplementation.informationsSoftware(),
--- 84,95 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(HiswaImplementation.informationsSoftware());
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if( update.scanForUpdate() ) {
! // if( update.startUpdate() )
! // System.exit(0);
! // } else System.err.println("Hiswa : no update");
! // }
BuSplashScreen ss = new BuSplashScreen(HiswaImplementation.informationsSoftware(),
Index: HiswaFilleEditeur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleEditeur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HiswaFilleEditeur.java 18 Mar 2003 17:36:39 -0000 1.2
--- HiswaFilleEditeur.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import com.memoire.jedit.*;
Index: HiswaFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HiswaFilleParametres.java 18 Mar 2003 17:36:40 -0000 1.3
--- HiswaFilleParametres.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 18,21 ****
--- 18,22 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.hiswa.*;
Index: HiswaFilleTableau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleTableau.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HiswaFilleTableau.java 18 Mar 2003 17:36:40 -0000 1.2
--- HiswaFilleTableau.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 28,31 ****
--- 28,32 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.tableau.*;
/**
Index: HiswaImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HiswaImplementation.java 18 Mar 2003 17:36:39 -0000 1.3
--- HiswaImplementation.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 39,42 ****
--- 39,44 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.utilitaire.*;
|
|
From: <de...@us...> - 2003-07-04 15:57:12
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/diapre
Modified Files:
Diapre.java DiapreAstuces.java DiapreFilleParametres.java
DiapreImplementation.java DiapreListeEtude.java
DiapreOutilsDonnees.java DiaprePrecision.java
DiapreTableauInclinaison.java DiapreTableauValeurs.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Diapre.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/Diapre.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Diapre.java 18 Mar 2003 17:32:13 -0000 1.2
--- Diapre.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 93,112 ****
// Update
! if(!flags.no_update)
! {
! FudaaUpdate update = new FudaaUpdate(il);
! update.setInstallMode(flags.jar_update ? FudaaUpdate.JAR : FudaaUpdate.CLASS);
! if(update.scanForUpdate())
! {
! if(update.startUpdate())
! {
! System.exit(0);
! }
! }
! }
! else
! {
! System.err.println("Diapre : no update");
! }
// Splash
--- 93,112 ----
// Update
! // if(!flags.no_update)
! // {
! // FudaaUpdate update = new FudaaUpdate(il);
! // update.setInstallMode(flags.jar_update ? FudaaUpdate.JAR : FudaaUpdate.CLASS);
! // if(update.scanForUpdate())
! // {
! // if(update.startUpdate())
! // {
! // System.exit(0);
! // }
! // }
! // }
! // else
! // {
! // System.err.println("Diapre : no update");
! // }
// Splash
Index: DiapreAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DiapreAstuces.java 18 Mar 2003 17:32:13 -0000 1.2
--- DiapreAstuces.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 9,14 ****
package org.fudaa.fudaa.diapre;
- import org.fudaa.fudaa.commun.FudaaAstuces;
import org.fudaa.fudaa.commun.FudaaPreferences;
import com.memoire.bu.BuPreferences;
--- 9,15 ----
package org.fudaa.fudaa.diapre;
import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+
import com.memoire.bu.BuPreferences;
Index: DiapreFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiapreFilleParametres.java 18 Mar 2003 17:32:16 -0000 1.3
--- DiapreFilleParametres.java 4 Jul 2003 15:56:38 -0000 1.4
***************
*** 10,14 ****
package org.fudaa.fudaa.diapre;
- import java.lang.*;
import java.awt.*;
import java.awt.event.*;
--- 10,13 ----
***************
*** 20,23 ****
--- 19,23 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.diapre.*;
Index: DiapreImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiapreImplementation.java 18 Mar 2003 17:32:13 -0000 1.3
--- DiapreImplementation.java 4 Jul 2003 15:56:38 -0000 1.4
***************
*** 25,28 ****
--- 25,31 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.utilitaire.*;
import com.memoire.bu.*;
Index: DiapreListeEtude.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreListeEtude.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiapreListeEtude.java 18 Mar 2003 17:32:15 -0000 1.3
--- DiapreListeEtude.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 13,16 ****
--- 13,17 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import javax.swing.*;
Index: DiapreOutilsDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreOutilsDonnees.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DiapreOutilsDonnees.java 18 Mar 2003 17:32:16 -0000 1.2
--- DiapreOutilsDonnees.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 9,13 ****
package org.fudaa.fudaa.diapre;
! import org.fudaa.fudaa.commun.FudaaProjet;
import org.fudaa.dodico.corba.diapre.*;
--- 9,13 ----
package org.fudaa.fudaa.diapre;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.dodico.corba.diapre.*;
Index: DiaprePrecision.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiaprePrecision.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiaprePrecision.java 18 Mar 2003 17:32:14 -0000 1.3
--- DiaprePrecision.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 10,14 ****
package org.fudaa.fudaa.diapre;
- import java.lang.*;
import java.awt.*;
import java.awt.event.*;
--- 10,13 ----
***************
*** 21,24 ****
--- 20,24 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.utilitaire.*;
import com.memoire.bu.*;
Index: DiapreTableauInclinaison.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableauInclinaison.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiapreTableauInclinaison.java 18 Mar 2003 17:32:16 -0000 1.3
--- DiapreTableauInclinaison.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 10,14 ****
package org.fudaa.fudaa.diapre;
- import java.lang.*;
import java.awt.*;
import java.awt.event.*;
--- 10,13 ----
***************
*** 22,25 ****
--- 21,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.diapre.*;
Index: DiapreTableauValeurs.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableauValeurs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DiapreTableauValeurs.java 18 Mar 2003 17:32:15 -0000 1.3
--- DiapreTableauValeurs.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 10,14 ****
package org.fudaa.fudaa.diapre;
- import java.lang.*;
import java.awt.*;
import java.awt.event.*;
--- 10,13 ----
***************
*** 22,25 ****
--- 21,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.diapre.*;
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/curvi
Modified Files:
Curvi.java CurviFilleParametresASC.java
CurviFilleTableauResultats.java CurviImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Curvi.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/Curvi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Curvi.java 18 Mar 2003 17:27:06 -0000 1.2
--- Curvi.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 21,24 ****
--- 21,26 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+
import com.diaam.lgpl.ts.*;
***************
*** 95,112 ****
// Update
! if(!flags.no_update)
! {
! FudaaUpdate update=new FudaaUpdate(il);
! update.setInstallMode
! (flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
!
! if(update.scanForUpdate())
! {
! BuRegistry.register(update);
! boolean r=update.startUpdate();
! BuRegistry.unregister(update);
! if(r) return;
! }
! }
// Splash screen
--- 97,114 ----
// Update
! // if(!flags.no_update)
! // {
! // FudaaUpdate update=new FudaaUpdate(il);
! // update.setInstallMode
! // (flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! //
! // if(update.scanForUpdate())
! // {
! // BuRegistry.register(update);
! // boolean r=update.startUpdate();
! // BuRegistry.unregister(update);
! // if(r) return;
! // }
! // }
// Splash screen
Index: CurviFilleParametresASC.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleParametresASC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CurviFilleParametresASC.java 18 Mar 2003 17:27:06 -0000 1.2
--- CurviFilleParametresASC.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 21,24 ****
--- 21,25 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.tableau.*;
/**
Index: CurviFilleTableauResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleTableauResultats.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CurviFilleTableauResultats.java 18 Mar 2003 17:27:04 -0000 1.2
--- CurviFilleTableauResultats.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 21,24 ****
--- 21,25 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.tableau.*;
/**
Index: CurviImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CurviImplementation.java 18 Mar 2003 17:27:04 -0000 1.3
--- CurviImplementation.java 4 Jul 2003 15:56:38 -0000 1.4
***************
*** 42,45 ****
--- 42,46 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
import org.fudaa.fudaa.ressource.*;
|
|
From: <de...@us...> - 2003-07-04 15:57:12
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/cubature
Modified Files:
Cubature.java CubatureImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Cubature.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/Cubature.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Cubature.java 18 Mar 2003 17:22:06 -0000 1.3
--- Cubature.java 4 Jul 2003 15:56:38 -0000 1.4
***************
*** 85,96 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(il);
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if( update.scanForUpdate() ) {
! if( update.startUpdate() )
! System.exit(0);
! } else System.err.println("Cubature : no update");
! }
// Splash screen
--- 85,96 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(il);
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if( update.scanForUpdate() ) {
! // if( update.startUpdate() )
! // System.exit(0);
! // } else System.err.println("Cubature : no update");
! // }
// Splash screen
Index: CubatureImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/CubatureImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CubatureImplementation.java 18 Mar 2003 17:22:06 -0000 1.2
--- CubatureImplementation.java 4 Jul 2003 15:56:38 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
import java.awt.event.*;
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/dimduc
Modified Files:
Dimduc.java DimducAstuces.java DimducFilleParametres.java
DimducImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Dimduc.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/Dimduc.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dimduc.java 18 Mar 2003 17:34:05 -0000 1.2
--- Dimduc.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 75,85 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(il);
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if( update.scanForUpdate() ) {
! if( update.startUpdate() ) System.exit(0);
! }
! } else System.err.println("Dimduc : no update");
// Splash
--- 75,85 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(il);
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if( update.scanForUpdate() ) {
! // if( update.startUpdate() ) System.exit(0);
! // }
! // } else System.err.println("Dimduc : no update");
// Splash
Index: DimducAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DimducAstuces.java 18 Mar 2003 17:34:06 -0000 1.2
--- DimducAstuces.java 4 Jul 2003 15:56:39 -0000 1.3
***************
*** 9,14 ****
package org.fudaa.fudaa.dimduc;
- import org.fudaa.fudaa.commun.FudaaAstuces;
import org.fudaa.fudaa.commun.FudaaPreferences;
import com.memoire.bu.BuPreferences;
--- 9,15 ----
package org.fudaa.fudaa.dimduc;
import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+
import com.memoire.bu.BuPreferences;
Index: DimducFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DimducFilleParametres.java 18 Mar 2003 17:33:59 -0000 1.3
--- DimducFilleParametres.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 18,25 ****
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
import org.fudaa.dodico.corba.dimduc.*;
import org.fudaa.dodico.corba.ducalbe.*;
- import java.lang.*;
/**
--- 18,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.dimduc.*;
import org.fudaa.dodico.corba.ducalbe.*;
/**
Index: DimducImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DimducImplementation.java 18 Mar 2003 17:34:00 -0000 1.3
--- DimducImplementation.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 27,30 ****
--- 27,34 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
+ import org.fudaa.fudaa.commun.tableau.*;
import org.fudaa.fudaa.utilitaire.*;
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac In directory sc8-pr-cvs1:/tmp/cvs-serv15566/taucomac Modified Files: TaucomacCotesPrinc.java TaucomacFilleParametres.java TaucomacFilleResultats.java TaucomacGraphe.java TaucomacImplementation.java Log Message: Ajout de FudaaCommonImplementation Index: TaucomacCotesPrinc.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacCotesPrinc.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TaucomacCotesPrinc.java 19 Mar 2003 07:57:24 -0000 1.3 --- TaucomacCotesPrinc.java 4 Jul 2003 15:56:41 -0000 1.4 *************** *** 10,14 **** package org.fudaa.fudaa.taucomac; - import java.lang.*; import java.awt.*; import java.awt.event.*; --- 10,13 ---- *************** *** 22,25 **** --- 21,25 ---- import com.memoire.bu.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.taucomac.*; Index: TaucomacFilleParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacFilleParametres.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TaucomacFilleParametres.java 19 Mar 2003 07:57:24 -0000 1.3 --- TaucomacFilleParametres.java 4 Jul 2003 15:56:41 -0000 1.4 *************** *** 27,31 **** import java.lang.Math.*; - import java.lang.*; import java.awt.*; import java.awt.event.*; --- 27,30 ---- *************** *** 43,46 **** --- 42,46 ---- import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.taucomac.*; import org.fudaa.fudaa.lido.editor.*; Index: TaucomacFilleResultats.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacFilleResultats.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TaucomacFilleResultats.java 19 Mar 2003 07:57:24 -0000 1.3 --- TaucomacFilleResultats.java 4 Jul 2003 15:56:41 -0000 1.4 *************** *** 15,19 **** import java.lang.Math.*; - import java.lang.*; import java.awt.*; import java.awt.print.*; --- 15,18 ---- *************** *** 29,32 **** --- 28,32 ---- import org.fudaa.ebli.impression.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.taucomac.*; Index: TaucomacGraphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacGraphe.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TaucomacGraphe.java 19 Mar 2003 07:57:24 -0000 1.3 --- TaucomacGraphe.java 4 Jul 2003 15:56:41 -0000 1.4 *************** *** 14,18 **** import org.fudaa.ebli.graphe.*; import org.fudaa.fudaa.commun.*; ! import org.fudaa.fudaa.taucomac.TaucomacResource; import org.fudaa.dodico.corba.taucomac.*; import java.text.*; --- 14,18 ---- import org.fudaa.ebli.graphe.*; import org.fudaa.fudaa.commun.*; ! import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.taucomac.*; import java.text.*; Index: TaucomacImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacImplementation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TaucomacImplementation.java 19 Mar 2003 07:57:24 -0000 1.3 --- TaucomacImplementation.java 4 Jul 2003 15:56:41 -0000 1.4 *************** *** 24,27 **** --- 24,29 ---- import org.fudaa.fudaa.utilitaire.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.dodico.*; + import org.fudaa.fudaa.commun.projet.*; //import org.fudaa.ebli.geometrie.*; import org.fudaa.dodico.corba.taucomac.*; |
|
From: <de...@us...> - 2003-07-04 15:56:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/test/tr
Modified Files:
TestTelemacCasViewer.java
Log Message:
Ajout de FudaaCommonImplementation
Index: TestTelemacCasViewer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestTelemacCasViewer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTelemacCasViewer.java 19 May 2003 14:34:26 -0000 1.1
--- TestTelemacCasViewer.java 4 Jul 2003 15:56:41 -0000 1.2
***************
*** 19,25 ****
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.telemac.io.TelemacCasFileFormat;
! import org.fudaa.fudaa.tr.dico.TrDicoEntitePanel;
! import org.fudaa.fudaa.tr.telemac.TrTelemacCasProcess;
! import org.fudaa.fudaa.tr.telemac.TrTelemacParametres;
import org.fudaa.fudaa.tr.telemac.TrTelemacProjet;
--- 19,23 ----
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.telemac.io.TelemacCasFileFormat;
! import org.fudaa.fudaa.dico.FDicoEntitePanel;
import org.fudaa.fudaa.tr.telemac.TrTelemacProjet;
***************
*** 33,42 ****
public TestTelemacCasViewer(File _fileCas)
{
! System.out.println("creation cas process");
! TrTelemacCasProcess process = new TrTelemacCasProcess(null);
! initFrame(process.createProjet(_fileCas, TelemacCasFileFormat.getInstance()));
}
! private final void initFrame(TrTelemacParametres _param)
{
if (_param == null)
--- 31,39 ----
public TestTelemacCasViewer(File _fileCas)
{
! TrTelemacProjet p=TrTelemacProjet.init(_fileCas, TelemacCasFileFormat.getInstance(), null,null);
! initFrame(p);
}
! private final void initFrame(TrTelemacProjet _param)
{
if (_param == null)
***************
*** 46,51 ****
if (_param != null)
{
! TrTelemacProjet proj = new TrTelemacProjet(_param);
! TrDicoEntitePanel pn=new TrDicoEntitePanel(_param.getEntiteTableModel());
setContentPane(pn);
}
--- 43,47 ----
if (_param != null)
{
! FDicoEntitePanel pn=new FDicoEntitePanel(_param.getKeys());
setContentPane(pn);
}
***************
*** 81,85 ****
--- 77,83 ----
});
frame.pack();
+ frame.setSize(800, 800);
frame.setVisible(true);
+
}
|
|
From: <de...@us...> - 2003-07-04 15:56:45
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/test
Modified Files:
TestModeleMaillage.java
Removed Files:
TestMaillageGrVsModele.java
Log Message:
Ajout de FudaaCommonImplementation
Index: TestModeleMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/TestModeleMaillage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestModeleMaillage.java 19 Mar 2003 07:57:25 -0000 1.3
--- TestModeleMaillage.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 20,26 ****
import javax.swing.event.ChangeEvent;
-
-
-
import java.io.LineNumberReader;
import java.io.FileReader;
--- 20,23 ----
***************
*** 45,49 ****
import org.fudaa.dodico.corba.dunes.IParametresDunesHelper;
-
import org.fudaa.dodico.objet.CDodico;
--- 42,45 ----
***************
*** 60,82 ****
public class TestModeleMaillage extends EbliFilleCalques
{
!
! private static String FICHIER_SEMIS="semis.txt";
!
private VecteurGrPoint semis_;
private ZCalquePoint cqZPoint_;
!
!
!
public TestModeleMaillage(BVueCalque _vue, BArbreCalque _arbre)
{
! super(_vue,_arbre,null,null);
setSelectionVisible(true);
! BGroupeCalque gc=new BGroupeCalque();
gc.setTitle("Mailleur");
setName("MAILLEUR");
setTitle("Modele");
!
! cqZPoint_=new ZCalquePoint();
! cqZPoint_.setIcone(TracePoint.getIcone(TracePoint.POINT,1,Color.black));
cqZPoint_.setName("cqPOINTMAILLEUR");
cqZPoint_.setTitle("points");
--- 56,76 ----
public class TestModeleMaillage extends EbliFilleCalques
{
!
! private static String FICHIER_SEMIS = "semis.txt";
!
private VecteurGrPoint semis_;
private ZCalquePoint cqZPoint_;
!
public TestModeleMaillage(BVueCalque _vue, BArbreCalque _arbre)
{
! super(_vue, _arbre, null, null);
setSelectionVisible(true);
! BGroupeCalque gc = new BGroupeCalque();
gc.setTitle("Mailleur");
setName("MAILLEUR");
setTitle("Modele");
!
! cqZPoint_ = new ZCalquePoint();
! cqZPoint_.setIcone(TracePoint.getIcone(TracePoint.POINT, 1, Color.black));
cqZPoint_.setName("cqPOINTMAILLEUR");
cqZPoint_.setTitle("points");
***************
*** 85,100 ****
getVueCalque().setBackground(Color.white);
setSelectionVisible(true);
! getVueCalque().setPreferredSize(new Dimension(500,400));
! // this.getContentPane().add(getVueCalque());
this.pack();
restaurer();
}
!
!
public void restaurer()
{
super.restaurer();
}
!
public synchronized void importerSemis()
{
--- 79,93 ----
getVueCalque().setBackground(Color.white);
setSelectionVisible(true);
! getVueCalque().setPreferredSize(new Dimension(500, 400));
! // this.getContentPane().add(getVueCalque());
this.pack();
restaurer();
}
!
public void restaurer()
{
super.restaurer();
}
!
public synchronized void importerSemis()
{
***************
*** 102,115 ****
double minY = Double.POSITIVE_INFINITY;
int p = 0;
- int prec = 0;
try
{
semis_ = new VecteurGrPoint();
! LineNumberReader in = new LineNumberReader(new FileReader(getClass().getResource(FICHIER_SEMIS).getPath()));
String line = in.readLine();
StringTokenizer tok = null;
! while(line != null)
{
! if(line.trim().startsWith("#"))
{
line = in.readLine();
--- 95,114 ----
double minY = Double.POSITIVE_INFINITY;
int p = 0;
try
{
semis_ = new VecteurGrPoint();
! LineNumberReader in =
! new LineNumberReader(
! new FileReader(getClass().getResource(FICHIER_SEMIS).getPath()));
String line = in.readLine();
StringTokenizer tok = null;
! while (line != null)
{
! line=line.trim();
! if (line.length() == 0)
! {
! continue;
! }
! else if (line.startsWith("#"))
{
line = in.readLine();
***************
*** 117,128 ****
}
tok = new StringTokenizer(line);
double x = Double.parseDouble(tok.nextToken());
double y = Double.parseDouble(tok.nextToken());
double z = Double.parseDouble(tok.nextToken());
! if(x < minX)
{
minX = x;
}
! if(y < minY)
{
minY = y;
--- 116,128 ----
}
tok = new StringTokenizer(line);
+ System.out.println(line);
double x = Double.parseDouble(tok.nextToken());
double y = Double.parseDouble(tok.nextToken());
double z = Double.parseDouble(tok.nextToken());
! if (x < minX)
{
minX = x;
}
! if (y < minY)
{
minY = y;
***************
*** 134,138 ****
in.close();
}
! catch(IOException e)
{
semis_ = null;
--- 134,138 ----
in.close();
}
! catch (IOException e)
{
semis_ = null;
***************
*** 144,155 ****
Thread.currentThread().sleep(250);
}
! catch(InterruptedException ie)
{
}
int siz = semis_.nombre();
! prec = 0;
! for(int i = 0; i < siz; i++)
{
! GrPoint po = (GrPoint)semis_.renvoie(i);
po.x -= minX;
po.y -= minY;
--- 144,154 ----
Thread.currentThread().sleep(250);
}
! catch (InterruptedException ie)
{
}
int siz = semis_.nombre();
! for (int i = 0; i < siz; i++)
{
! GrPoint po = (GrPoint) semis_.renvoie(i);
po.x -= minX;
po.y -= minY;
***************
*** 159,207 ****
Thread.currentThread().sleep(250);
}
! catch(InterruptedException ie)
{
}
System.out.println("Fin lecture Fichier");
}
!
public void afficheSemis()
{
! importerSemis();
! cqZPoint_.modele(new ZModeleStatiquePoint(semis_.tableau()));
}
!
public void selectedObjects(SelectionEvent _evt)
{
! VecteurGrContour objets=_evt.getObjects();
System.out.println(objets.nombre());
! for(int i=0;i<objets.nombre();i++)
{
! GrPoint[] contours=objets.renvoie(i).contour();
! for(int j=0;j<contours.length;j++)
System.out.println(contours[j]);
}
}
-
-
public static void main(String[] args)
{
! TestModeleMaillage testCalque=null;
! BVueCalque vue=new BVueCalque();
! BArbreCalque arbre=new BArbreCalque();
! testCalque=new TestModeleMaillage(vue,arbre);
! JFrame frame=new JFrame(testCalque.getTitle());
! BuPanel princ =new BuPanel();
princ.setLayout(new BuBorderLayout());
frame.setContentPane(princ);
! BuDesktop desk=new BuDesktop();
! desk.setPreferredSize(new Dimension(300,300));
! arbre.setPreferredSize(new Dimension(50,300));
desk.add(testCalque);
! BuSplit2Pane split=new BuSplit2Pane(desk,arbre);
! princ.add(split,BuBorderLayout.CENTER);
!
!
! frame.setLocation(50,50);
testCalque.afficheSemis();
testCalque.setVisible(true);
--- 158,203 ----
Thread.currentThread().sleep(250);
}
! catch (InterruptedException ie)
{
}
System.out.println("Fin lecture Fichier");
}
!
public void afficheSemis()
{
! importerSemis();
! cqZPoint_.modele(new ZModeleStatiquePoint(semis_.tableau()));
}
!
public void selectedObjects(SelectionEvent _evt)
{
! VecteurGrContour objets = _evt.getObjects();
System.out.println(objets.nombre());
! for (int i = 0; i < objets.nombre(); i++)
{
! GrPoint[] contours = objets.renvoie(i).contour();
! for (int j = 0; j < contours.length; j++)
System.out.println(contours[j]);
}
}
public static void main(String[] args)
{
! TestModeleMaillage testCalque = null;
! BVueCalque vue = new BVueCalque();
! BArbreCalque arbre = new BArbreCalque();
! testCalque = new TestModeleMaillage(vue, arbre);
! JFrame frame = new JFrame(testCalque.getTitle());
! BuPanel princ = new BuPanel();
princ.setLayout(new BuBorderLayout());
frame.setContentPane(princ);
! BuDesktop desk = new BuDesktop();
! desk.setPreferredSize(new Dimension(300, 300));
! arbre.setPreferredSize(new Dimension(50, 300));
desk.add(testCalque);
! BuSplit2Pane split = new BuSplit2Pane(desk, arbre);
! princ.add(split, BuBorderLayout.CENTER);
!
! frame.setLocation(50, 50);
testCalque.afficheSemis();
testCalque.setVisible(true);
***************
*** 215,219 ****
Thread.currentThread().sleep(250);
}
! catch(InterruptedException ie)
{
}
--- 211,215 ----
Thread.currentThread().sleep(250);
}
! catch (InterruptedException ie)
{
}
***************
*** 221,224 ****
testCalque.getVueCalque().repaint(0); */
}
!
}
--- 217,220 ----
testCalque.getVueCalque().repaint(0); */
}
!
}
--- TestMaillageGrVsModele.java DELETED ---
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/vag
Modified Files:
VagAstuces.java VagFilleGraphe.java VagFilleMailleur.java
VagFilleParametres.java VagImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: VagAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VagAstuces.java 19 Mar 2003 07:57:25 -0000 1.2
--- VagAstuces.java 4 Jul 2003 15:56:41 -0000 1.3
***************
*** 9,14 ****
package org.fudaa.fudaa.vag;
- import org.fudaa.fudaa.commun.FudaaAstuces;
import org.fudaa.fudaa.commun.FudaaPreferences;
import com.memoire.bu.BuPreferences;
--- 9,15 ----
package org.fudaa.fudaa.vag;
import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+
import com.memoire.bu.BuPreferences;
Index: VagFilleGraphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagFilleGraphe.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VagFilleGraphe.java 19 Mar 2003 07:57:25 -0000 1.2
--- VagFilleGraphe.java 4 Jul 2003 15:56:41 -0000 1.3
***************
*** 27,31 ****
! import org.fudaa.fudaa.commun.FudaaProjetInformations;
/**
* Une fenetre fille pour les graphes.
--- 27,31 ----
! import org.fudaa.fudaa.commun.projet.FudaaProjetInformations;
/**
* Une fenetre fille pour les graphes.
Index: VagFilleMailleur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagFilleMailleur.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VagFilleMailleur.java 19 Mar 2003 07:57:25 -0000 1.3
--- VagFilleMailleur.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 29,32 ****
--- 29,33 ----
import org.fudaa.ebli.geometrie.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.vag.*;
Index: VagFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VagFilleParametres.java 19 Mar 2003 07:57:25 -0000 1.3
--- VagFilleParametres.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 21,24 ****
--- 21,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.vag.*;
Index: VagImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VagImplementation.java 19 Mar 2003 07:57:25 -0000 1.3
--- VagImplementation.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 22,25 ****
--- 22,29 ----
// import com.diaam.lgpl.ts.TerminalStandard;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
+ import org.fudaa.fudaa.commun.tableau.*;
import org.fudaa.fudaa.utilitaire.*;
import com.memoire.bu.*;
***************
*** 241,245 ****
// Preferences Vag
//VagPreferences.VAG.applyOn(this);
! ajoutePreferences(new VolumePreferencesPanel(this));
--- 245,249 ----
// Preferences Vag
//VagPreferences.VAG.applyOn(this);
! // ajoutePreferences(new VolumePreferencesPanel(this));
***************
*** 1623,1625 ****
--- 1627,1636 ----
return !res;
}
+
+ protected void buildPreferences()
+ {
+ super.buildPreferences();
+ preferences_.addTab(new VolumePreferencesPanel(this));
+ }
+
}
|
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/sinavi
Modified Files:
SinaviBateauxParametres.java SinaviDefinitionXmlListener.java
SinaviFilleLoiAleatoireTrajet.java
SinaviFilleLoiDeterministeTrajet.java
SinaviImplementation.java SinaviReseauFrame.java
SinaviReseauGridAdapter.java
Log Message:
Ajout de FudaaCommonImplementation
Index: SinaviBateauxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauxParametres.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviBateauxParametres.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviBateauxParametres.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 27,30 ****
--- 27,31 ----
import org.fudaa.dodico.navigation.*;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 370,374 ****
if(validBateauParametres())
{
! INavireType bateautemp_ = CDodico.findUsine().creeNavigationNavireType();
setBateauParametres(bateautemp_);
SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_);
--- 371,375 ----
if(validBateauParametres())
{
! INavireType bateautemp_ = UsineHelper.findUsine().creeNavigationNavireType();
setBateauParametres(bateautemp_);
SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_);
Index: SinaviDefinitionXmlListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDefinitionXmlListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviDefinitionXmlListener.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviDefinitionXmlListener.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 82,86 ****
if(_tag.equals("NAVIRE"))
{
! navires_[nbcat_].addElement(CDodico.findUsine().creeNavigationNavireType());
nbnavire_++;
}
--- 83,87 ----
if(_tag.equals("NAVIRE"))
{
! navires_[nbcat_].addElement(UsineHelper.findUsine().creeNavigationNavireType());
nbnavire_++;
}
Index: SinaviFilleLoiAleatoireTrajet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiAleatoireTrajet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviFilleLoiAleatoireTrajet.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviFilleLoiAleatoireTrajet.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 19,22 ****
--- 19,23 ----
import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 281,285 ****
if(loi_ == null)
{
! IGenerationJournaliereAleatoire creneauGenerationAleatoire_ = CDodico.findUsine().creeNavigationGenerationJournaliereAleatoire();
creneauGenerationAleatoire_.definitHeuresDebutFin(dfAleatoireHeureDebut_.getDureeField(), dfAleatoireHeureFin_.getDureeField());
creneauGenerationAleatoire_.definitDatesDebutFin(((int)(((Date)tfAleatoireJourDebut_.getValue()).getTime() / 1000l)), ((int)(((Date)tfAleatoireJourFin_.getValue()).getTime() / 1000l)));
--- 282,286 ----
if(loi_ == null)
{
! IGenerationJournaliereAleatoire creneauGenerationAleatoire_ = UsineHelper.findUsine().creeNavigationGenerationJournaliereAleatoire();
creneauGenerationAleatoire_.definitHeuresDebutFin(dfAleatoireHeureDebut_.getDureeField(), dfAleatoireHeureFin_.getDureeField());
creneauGenerationAleatoire_.definitDatesDebutFin(((int)(((Date)tfAleatoireJourDebut_.getValue()).getTime() / 1000l)), ((int)(((Date)tfAleatoireJourFin_.getValue()).getTime() / 1000l)));
Index: SinaviFilleLoiDeterministeTrajet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiDeterministeTrajet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SinaviFilleLoiDeterministeTrajet.java 19 Mar 2003 07:54:48 -0000 1.3
--- SinaviFilleLoiDeterministeTrajet.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 20,23 ****
--- 20,24 ----
import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 169,173 ****
if(loi_ == null)
{
! loi_ = CDodico.findUsine().creeNavigationGenerationDeterministe();
//loi_.definitInstants(instants_.toArray());
loi_.definitInstants(instantsLong);
--- 170,174 ----
if(loi_ == null)
{
! loi_ = UsineHelper.findUsine().creeNavigationGenerationDeterministe();
//loi_.definitInstants(instants_.toArray());
loi_.definitInstants(instantsLong);
Index: SinaviImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviImplementation.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviImplementation.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 19,22 ****
--- 19,24 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+
import com.memoire.bu.*;
import com.memoire.dja.*;
***************
*** 29,32 ****
--- 31,35 ----
import org.fudaa.dodico.corba.sinavi.*;
import org.fudaa.dodico.objet.DService;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 423,428 ****
assistant_.changeAttitude(BuAssistant.PAROLE, "Création d'une nouvelle\n étude");
// Création d'une nouvelle usine et d'un nouveau reseau
! ETUDE_SINAVI = CDodico.findUsine().creeNavigationEtudeNavigationFluviale();
! ETUDE_SINAVI.reseau(CDodico.findUsine().creeNavigationReseauFluvial());
if(ETUDE_SINAVI==null)
System.err.println("Etude nulle!!!!!");
--- 426,431 ----
assistant_.changeAttitude(BuAssistant.PAROLE, "Création d'une nouvelle\n étude");
// Création d'une nouvelle usine et d'un nouveau reseau
! ETUDE_SINAVI = UsineHelper.findUsine().creeNavigationEtudeNavigationFluviale();
! ETUDE_SINAVI.reseau(UsineHelper.findUsine().creeNavigationReseauFluvial());
if(ETUDE_SINAVI==null)
System.err.println("Etude nulle!!!!!");
Index: SinaviReseauFrame.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviReseauFrame.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviReseauFrame.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 20,23 ****
--- 20,24 ----
import org.fudaa.dodico.navigation.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 129,133 ****
public void ajouteGare()
{
! IGare gare = CDodico.findUsine().creeNavigationGare();
SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare);
grid_.add(new SinaviReseauGare(gare));
--- 130,134 ----
public void ajouteGare()
{
! IGare gare = UsineHelper.findUsine().creeNavigationGare();
SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare);
grid_.add(new SinaviReseauGare(gare));
***************
*** 145,150 ****
public void ajouteBief(DjaGridInteractive _grilleinteractive)
{
! IBiefNavigation bief_ = CDodico.findUsine().creeNavigationBiefNavigation();
! bief_.regle(CDodico.findUsine().creeNavigationRegleNavigationFluviale());
if(_grilleinteractive.getSelection().size() == 2)
{
--- 146,151 ----
public void ajouteBief(DjaGridInteractive _grilleinteractive)
{
! IBiefNavigation bief_ = UsineHelper.findUsine().creeNavigationBiefNavigation();
! bief_.regle(UsineHelper.findUsine().creeNavigationRegleNavigationFluviale());
if(_grilleinteractive.getSelection().size() == 2)
{
***************
*** 241,245 ****
public void ajouteEcluse(DjaGridInteractive _grilleinteractive)
{
! IEcluseFluviale eclusefluviale_ = CDodico.findUsine().creeNavigationEcluseFluviale();
if(_grilleinteractive.getSelection().size() == 2)
{
--- 242,246 ----
public void ajouteEcluse(DjaGridInteractive _grilleinteractive)
{
! IEcluseFluviale eclusefluviale_ = UsineHelper.findUsine().creeNavigationEcluseFluviale();
if(_grilleinteractive.getSelection().size() == 2)
{
Index: SinaviReseauGridAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauGridAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviReseauGridAdapter.java 19 Mar 2003 07:54:48 -0000 1.2
--- SinaviReseauGridAdapter.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
package org.fudaa.fudaa.sinavi;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.navigation.IGare;
import com.memoire.bu.*;
***************
*** 53,57 ****
if(_evt.getObject() instanceof SinaviReseauGare)
{
! CDodico.findUsine().supprimeNavigationGare(((SinaviReseauGare)_evt.getObject()).getGare());
}
if(_evt.getObject() instanceof SinaviReseauBief)
--- 54,58 ----
if(_evt.getObject() instanceof SinaviReseauGare)
{
! UsineHelper.findUsine().supprimeNavigationGare(((SinaviReseauGare)_evt.getObject()).getGare());
}
if(_evt.getObject() instanceof SinaviReseauBief)
|
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/reflux
Modified Files:
Reflux.java RefluxImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Reflux.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/Reflux.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Reflux.java 19 Mar 2003 07:35:59 -0000 1.2
--- Reflux.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 105,118 ****
// Update
! if(!flags.no_update) {
! FudaaUpdate update=new FudaaUpdate(il);
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if(update.scanForUpdate()) {
! BuRegistry.register(update);
! boolean r=update.startUpdate();
! BuRegistry.unregister(update);
! if (r) return;
! }
! }
// Splash screen
--- 105,118 ----
// Update
! // if(!flags.no_update) {
! // FudaaUpdate update=new FudaaUpdate(il);
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if(update.scanForUpdate()) {
! // BuRegistry.register(update);
! // boolean r=update.startUpdate();
! // BuRegistry.unregister(update);
! // if (r) return;
! // }
! // }
// Splash screen
Index: RefluxImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxImplementation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RefluxImplementation.java 19 Mar 2003 07:35:59 -0000 1.6
--- RefluxImplementation.java 4 Jul 2003 15:56:40 -0000 1.7
***************
*** 24,27 ****
--- 24,28 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
import java.awt.event.*;
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/sipor
Modified Files:
Sipor.java SiporFilleResultatsSimulations.java
SiporGraphiquesCourbesPanel.java
SiporGraphiquesHistogrammesPanel.java
SiporGraphiquesTroisParametresPanel.java
SiporHistogrammesDifferentielsPanel.java
SiporImplementation.java SiporListeSimulations.java
SiporOutilsDonnees.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Sipor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/Sipor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sipor.java 19 Mar 2003 07:54:48 -0000 1.2
--- Sipor.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 67,77 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(SiporImplementation.informationsSoftware());
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if( update.scanForUpdate() ) {
! if( update.startUpdate() ) System.exit(0);
! }
! } else System.err.println("Sipor : no update");
// Splash
--- 67,77 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(SiporImplementation.informationsSoftware());
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if( update.scanForUpdate() ) {
! // if( update.startUpdate() ) System.exit(0);
! // }
! // } else System.err.println("Sipor : no update");
// Splash
Index: SiporFilleResultatsSimulations.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFilleResultatsSimulations.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiporFilleResultatsSimulations.java 19 Mar 2003 07:54:48 -0000 1.2
--- SiporFilleResultatsSimulations.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 19,22 ****
--- 19,23 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.sipor.*;
import org.fudaa.dodico.corba.sipor.*;
Index: SiporGraphiquesCourbesPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporGraphiquesCourbesPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SiporGraphiquesCourbesPanel.java 19 Mar 2003 07:54:48 -0000 1.3
--- SiporGraphiquesCourbesPanel.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 25,28 ****
--- 25,29 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.sipor.*;
import org.fudaa.dodico.corba.sipor.*;
Index: SiporGraphiquesHistogrammesPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporGraphiquesHistogrammesPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SiporGraphiquesHistogrammesPanel.java 19 Mar 2003 07:54:48 -0000 1.3
--- SiporGraphiquesHistogrammesPanel.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.sipor.*;
import org.fudaa.dodico.corba.sipor.*;
Index: SiporGraphiquesTroisParametresPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporGraphiquesTroisParametresPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SiporGraphiquesTroisParametresPanel.java 19 Mar 2003 07:54:48 -0000 1.3
--- SiporGraphiquesTroisParametresPanel.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 23,26 ****
--- 23,27 ----
import org.fudaa.ebli.graphe.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.sipor.*;
Index: SiporHistogrammesDifferentielsPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporHistogrammesDifferentielsPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiporHistogrammesDifferentielsPanel.java 19 Mar 2003 07:54:48 -0000 1.2
--- SiporHistogrammesDifferentielsPanel.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 23,26 ****
--- 23,27 ----
import org.fudaa.ebli.graphe.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.sipor.*;
Index: SiporImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiporImplementation.java 19 Mar 2003 07:54:48 -0000 1.2
--- SiporImplementation.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 22,25 ****
--- 22,27 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.utilitaire.*;
import com.memoire.bu.*;
Index: SiporListeSimulations.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporListeSimulations.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiporListeSimulations.java 19 Mar 2003 07:54:48 -0000 1.2
--- SiporListeSimulations.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 13,16 ****
--- 13,17 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import javax.swing.*;
Index: SiporOutilsDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporOutilsDonnees.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiporOutilsDonnees.java 19 Mar 2003 07:54:48 -0000 1.2
--- SiporOutilsDonnees.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 11,15 ****
import org.fudaa.dodico.corba.sipor.*;
! import org.fudaa.fudaa.commun.FudaaProjet;
/**
--- 11,15 ----
import org.fudaa.dodico.corba.sipor.*;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
/**
|
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/sisyphe
Modified Files:
Sisyphe.java SisypheFilleParametres.java
SisypheImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Sisyphe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/Sisyphe.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sisyphe.java 19 Mar 2003 07:57:25 -0000 1.2
--- Sisyphe.java 4 Jul 2003 15:56:41 -0000 1.3
***************
*** 65,76 ****
// Update
! if( !flags.no_update ) {
! FudaaUpdate update=new FudaaUpdate(SisypheImplementation.informationsSoftware());
! update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! if( update.scanForUpdate() ) {
! if( update.startUpdate() )
! System.exit(0);
! } else System.err.println("Sisyphe : no update");
! }
BuSplashScreen ss=new BuSplashScreen(
--- 65,76 ----
// Update
! // if( !flags.no_update ) {
! // FudaaUpdate update=new FudaaUpdate(SisypheImplementation.informationsSoftware());
! // update.setInstallMode(flags.jar_update?FudaaUpdate.JAR:FudaaUpdate.CLASS);
! // if( update.scanForUpdate() ) {
! // if( update.startUpdate() )
! // System.exit(0);
! // } else System.err.println("Sisyphe : no update");
! // }
BuSplashScreen ss=new BuSplashScreen(
Index: SisypheFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheFilleParametres.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SisypheFilleParametres.java 19 Mar 2003 07:57:25 -0000 1.3
--- SisypheFilleParametres.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 18,24 ****
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
import org.fudaa.dodico.corba.sisyphe.*;
import org.fudaa.dodico.sisyphe.*;
- import org.fudaa.fudaa.sisyphe.*;
/**
--- 18,24 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.dodico.corba.sisyphe.*;
import org.fudaa.dodico.sisyphe.*;
/**
Index: SisypheImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SisypheImplementation.java 19 Mar 2003 07:57:25 -0000 1.3
--- SisypheImplementation.java 4 Jul 2003 15:56:41 -0000 1.4
***************
*** 18,21 ****
--- 18,23 ----
import javax.swing.event.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.utilitaire.*;
import com.memoire.bu.*;
|
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/oscar
Modified Files:
OscarAstuces.java OscarDialogNoteDeCalculsConfig.java
OscarFilleNoteDeCalculs.java OscarFilleParametres.java
OscarFilleResultatsBruts.java OscarImplementation.java
OscarInternalFrameAdapter.java WHtmlContent.java WTree.java
Log Message:
Ajout de FudaaCommonImplementation
Index: OscarAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscarAstuces.java 19 Mar 2003 07:29:18 -0000 1.2
--- OscarAstuces.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 10,15 ****
package org.fudaa.fudaa.oscar;
- import org.fudaa.fudaa.commun.FudaaAstuces;
import org.fudaa.fudaa.commun.FudaaPreferences;
import com.memoire.bu.BuPreferences;
--- 10,16 ----
package org.fudaa.fudaa.oscar;
import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+
import com.memoire.bu.BuPreferences;
Index: OscarDialogNoteDeCalculsConfig.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogNoteDeCalculsConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OscarDialogNoteDeCalculsConfig.java 19 Mar 2003 07:29:18 -0000 1.3
--- OscarDialogNoteDeCalculsConfig.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
import com.memoire.bu.*;
Index: OscarFilleNoteDeCalculs.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OscarFilleNoteDeCalculs.java 19 Mar 2003 07:29:17 -0000 1.4
--- OscarFilleNoteDeCalculs.java 4 Jul 2003 15:56:40 -0000 1.5
***************
*** 33,37 ****
import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.FudaaProjet;
import org.fudaa.dodico.corba.oscar.SResultatsOscar;
--- 33,37 ----
import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.dodico.corba.oscar.SResultatsOscar;
Index: OscarFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleParametres.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OscarFilleParametres.java 19 Mar 2003 07:29:18 -0000 1.4
--- OscarFilleParametres.java 4 Jul 2003 15:56:40 -0000 1.5
***************
*** 23,28 ****
import com.memoire.bu.BuCommonInterface;
! import org.fudaa.fudaa.commun.FudaaProjet;
! import org.fudaa.fudaa.commun.FudaaParamEventView;
import org.fudaa.dodico.corba.oscar.SParametresOscar;
import org.fudaa.dodico.corba.oscar.SCommentairesOscar;
--- 23,28 ----
import com.memoire.bu.BuCommonInterface;
! import org.fudaa.fudaa.commun.projet.FudaaParamEventView;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.dodico.corba.oscar.SParametresOscar;
import org.fudaa.dodico.corba.oscar.SCommentairesOscar;
Index: OscarFilleResultatsBruts.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleResultatsBruts.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OscarFilleResultatsBruts.java 19 Mar 2003 07:29:17 -0000 1.3
--- OscarFilleResultatsBruts.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 26,30 ****
import com.memoire.bu.BuLabelMultiLine;
! import org.fudaa.fudaa.commun.FudaaProjet;
import org.fudaa.dodico.corba.oscar.*;
--- 26,30 ----
import com.memoire.bu.BuLabelMultiLine;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.dodico.corba.oscar.*;
Index: OscarImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OscarImplementation.java 19 Mar 2003 07:29:18 -0000 1.7
--- OscarImplementation.java 4 Jul 2003 15:56:40 -0000 1.8
***************
*** 22,25 ****
--- 22,28 ----
import com.diaam.lgpl.ts.TerminalStandard;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.ressource.*;
import org.fudaa.fudaa.utilitaire.*;
***************
*** 37,40 ****
--- 40,44 ----
import org.fudaa.dodico.corba.oscar.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.objet.*;
***************
*** 327,331 ****
//assistant_.changeAttitude(BuAssistant.ATTENTE,OscarMsg.ASS001);
// Initialisation des préférences
! ajoutePreferences(new VolumePreferencesPanel(this));
_gps.setVisible(true);
--- 331,335 ----
//assistant_.changeAttitude(BuAssistant.ATTENTE,OscarMsg.ASS001);
// Initialisation des préférences
! //ajoutePreferences(new VolumePreferencesPanel(this));
_gps.setVisible(true);
***************
*** 1271,1275 ****
IOrganisme organisme;
IConnexion connexion;
! usine = CDodico.creeUsineLocale();
organisme = usine.creeObjetOrganisme();
organisme.sigle("organisme local");
--- 1275,1279 ----
IOrganisme organisme;
IConnexion connexion;
! usine = UsineHelper.creeUsineLocale();
organisme = usine.creeObjetOrganisme();
organisme.sigle("organisme local");
***************
*** 1366,1369 ****
--- 1370,1382 ----
return !res;
}
+
+ /**
+ *
+ */
+ protected void buildPreferences()
+ {
+ super.buildPreferences();
+ preferences_.addTab(new VolumePreferencesPanel(this));
+ }
}
Index: OscarInternalFrameAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarInternalFrameAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscarInternalFrameAdapter.java 19 Mar 2003 07:29:18 -0000 1.2
--- OscarInternalFrameAdapter.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 10,14 ****
package org.fudaa.fudaa.oscar;
- import java.lang.String;
import javax.swing.JComponent;
--- 10,13 ----
***************
*** 38,48 ****
import org.fudaa.ebli.impression.*;
! import org.fudaa.fudaa.commun.FudaaProjet;
! import org.fudaa.fudaa.commun.FudaaParamEvent;
! import org.fudaa.fudaa.commun.FudaaParamEventView;
! import org.fudaa.fudaa.commun.FudaaProjetEvent;
! import org.fudaa.fudaa.commun.FudaaParamListener;
! import org.fudaa.fudaa.commun.FudaaProjetListener;
! import org.fudaa.fudaa.commun.FudaaParamEventProxy;
import com.memoire.bu.BuResource;
--- 37,47 ----
import org.fudaa.ebli.impression.*;
! import org.fudaa.fudaa.commun.projet.FudaaParamEvent;
! import org.fudaa.fudaa.commun.projet.FudaaParamEventProxy;
! import org.fudaa.fudaa.commun.projet.FudaaParamEventView;
! import org.fudaa.fudaa.commun.projet.FudaaParamListener;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
! import org.fudaa.fudaa.commun.projet.FudaaProjetEvent;
! import org.fudaa.fudaa.commun.projet.FudaaProjetListener;
import com.memoire.bu.BuResource;
Index: WHtmlContent.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WHtmlContent.java 19 Mar 2003 07:29:18 -0000 1.6
--- WHtmlContent.java 4 Jul 2003 15:56:40 -0000 1.7
***************
*** 1,5 ****
package org.fudaa.fudaa.oscar;
! import org.fudaa.fudaa.commun.FudaaProjet;
import org.fudaa.dodico.corba.oscar.*;
import javax.swing.JComponent;
--- 1,5 ----
package org.fudaa.fudaa.oscar;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.dodico.corba.oscar.*;
import javax.swing.JComponent;
Index: WTree.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WTree.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WTree.java 19 Mar 2003 07:29:18 -0000 1.4
--- WTree.java 4 Jul 2003 15:56:40 -0000 1.5
***************
*** 1,5 ****
package org.fudaa.fudaa.oscar;
! import org.fudaa.fudaa.commun.FudaaProjet;
import javax.swing.*;
import javax.swing.plaf.basic.*;
--- 1,6 ----
package org.fudaa.fudaa.oscar;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
!
import javax.swing.*;
import javax.swing.plaf.basic.*;
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil In directory sc8-pr-cvs1:/tmp/cvs-serv15566/seuil Modified Files: SeuilFilleParametres.java SeuilFilleResultats.java SeuilGraphe.java SeuilImplementation.java Log Message: Ajout de FudaaCommonImplementation Index: SeuilFilleParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilFilleParametres.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeuilFilleParametres.java 19 Mar 2003 07:54:48 -0000 1.3 --- SeuilFilleParametres.java 4 Jul 2003 15:56:40 -0000 1.4 *************** *** 27,31 **** import java.lang.Math.*; - import java.lang.*; import java.awt.*; import java.awt.event.*; --- 27,30 ---- *************** *** 43,46 **** --- 42,46 ---- import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.seuil.*; import org.fudaa.fudaa.lido.editor.*; Index: SeuilFilleResultats.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilFilleResultats.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeuilFilleResultats.java 19 Mar 2003 07:54:48 -0000 1.3 --- SeuilFilleResultats.java 4 Jul 2003 15:56:40 -0000 1.4 *************** *** 15,19 **** import java.lang.Math.*; - import java.lang.*; import java.awt.*; import java.awt.event.*; --- 15,18 ---- *************** *** 27,30 **** --- 26,30 ---- import org.fudaa.ebli.graphe.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.seuil.*; import org.fudaa.fudaa.lido.editor.*; Index: SeuilGraphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilGraphe.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeuilGraphe.java 19 Mar 2003 07:54:48 -0000 1.3 --- SeuilGraphe.java 4 Jul 2003 15:56:40 -0000 1.4 *************** *** 14,18 **** import org.fudaa.ebli.graphe.*; import org.fudaa.fudaa.commun.*; ! import org.fudaa.fudaa.seuil.SeuilResource; import org.fudaa.dodico.corba.seuil.*; import java.text.*; --- 14,18 ---- import org.fudaa.ebli.graphe.*; import org.fudaa.fudaa.commun.*; ! import org.fudaa.fudaa.commun.projet.*; import org.fudaa.dodico.corba.seuil.*; import java.text.*; Index: SeuilImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/seuil/SeuilImplementation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SeuilImplementation.java 19 Mar 2003 07:54:48 -0000 1.3 --- SeuilImplementation.java 4 Jul 2003 15:56:40 -0000 1.4 *************** *** 24,27 **** --- 24,29 ---- import org.fudaa.fudaa.utilitaire.*; import org.fudaa.fudaa.commun.*; + import org.fudaa.fudaa.commun.dodico.*; + import org.fudaa.fudaa.commun.projet.*; //import org.fudaa.ebli.geometrie.*; import org.fudaa.dodico.corba.seuil.*; |
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/navmer
Modified Files:
Navmer.java NavmerFilleTableauResultats.java
NavmerImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: Navmer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/Navmer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Navmer.java 19 Mar 2003 07:29:18 -0000 1.2
--- Navmer.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 93,110 ****
// Update
! if (!flags.no_update)
! {
! FudaaUpdate update = new FudaaUpdate(il);
! update.setInstallMode(flags.jar_update ? FudaaUpdate.JAR : FudaaUpdate.CLASS);
!
! if (update.scanForUpdate())
! {
! BuRegistry.register(update);
! boolean r = update.startUpdate();
! BuRegistry.unregister(update);
! if (r)
! return;
! }
! }
// Splash screen
--- 93,110 ----
// Update
! // if (!flags.no_update)
! // {
! // FudaaUpdate update = new FudaaUpdate(il);
! // update.setInstallMode(flags.jar_update ? FudaaUpdate.JAR : FudaaUpdate.CLASS);
! //
! // if (update.scanForUpdate())
! // {
! // BuRegistry.register(update);
! // boolean r = update.startUpdate();
! // BuRegistry.unregister(update);
! // if (r)
! // return;
! // }
! // }
// Splash screen
Index: NavmerFilleTableauResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerFilleTableauResultats.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NavmerFilleTableauResultats.java 19 Mar 2003 07:29:18 -0000 1.2
--- NavmerFilleTableauResultats.java 4 Jul 2003 15:56:40 -0000 1.3
***************
*** 11,15 ****
- import java.lang.*;
import java.awt.*;
import java.awt.event.*;
--- 11,14 ----
***************
*** 22,25 ****
--- 21,25 ----
import com.memoire.bu.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.tableau.*;
import org.fudaa.dodico.corba.navmer.*;
import org.fudaa.ebli.graphe.*;
Index: NavmerImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NavmerImplementation.java 19 Mar 2003 07:29:18 -0000 1.3
--- NavmerImplementation.java 4 Jul 2003 15:56:40 -0000 1.4
***************
*** 13,16 ****
--- 13,20 ----
import org.fudaa.fudaa.navmer.these.*;
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
+ import org.fudaa.fudaa.commun.tableau.*;
import org.fudaa.fudaa.ressource.*;
|
|
From: <de...@us...> - 2003-07-04 15:56:44
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lidometier
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/lidometier
Modified Files:
LidoImplementation.java
Log Message:
Ajout de FudaaCommonImplementation
Index: LidoImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lidometier/LidoImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LidoImplementation.java 19 Mar 2003 07:26:08 -0000 1.3
--- LidoImplementation.java 4 Jul 2003 15:56:39 -0000 1.4
***************
*** 19,22 ****
--- 19,23 ----
import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.evenement.*;
***************
*** 30,33 ****
--- 31,36 ----
import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
import org.fudaa.fudaa.hydraulique1d.*;
import org.fudaa.fudaa.hydraulique1d.reseau.*;
***************
*** 983,987 ****
if( !projet_.estConfigure() ) projet_.fermer(); // si creation de projet annulee
else { // nouveau projet cree
! ietude1d_=CDodico.findUsine().creeHydraulique1dEtude1d();
SERVEUR_HYDRO1D.etude(ietude1d_);
ihmP_.setEtude(ietude1d_);
--- 986,990 ----
if( !projet_.estConfigure() ) projet_.fermer(); // si creation de projet annulee
else { // nouveau projet cree
! ietude1d_=UsineHelper.findUsine().creeHydraulique1dEtude1d();
SERVEUR_HYDRO1D.etude(ietude1d_);
ihmP_.setEtude(ietude1d_);
***************
*** 1024,1028 ****
}
! ietude1d_=CDodico.findUsine().creeHydraulique1dEtude1d();
SERVEUR_HYDRO1D.etude(ietude1d_);
ihmP_.setEtude(ietude1d_);
--- 1027,1031 ----
}
! ietude1d_=UsineHelper.findUsine().creeHydraulique1dEtude1d();
SERVEUR_HYDRO1D.etude(ietude1d_);
ihmP_.setEtude(ietude1d_);
***************
*** 1769,1773 ****
HYDRO_KONVERT=new CConversionHydraulique1d(SERVEUR_HYDRO1D, CONNEXION_LIDO);
if( evtSupport_!=null )
! CDodico.findUsine().removeObjetEventListener((IObjetEventListenerSupport)evtSupport_.tie());
evtSupport_=new DObjetEventListenerSupport();
evtSupport_.clientListener(this);
--- 1772,1776 ----
HYDRO_KONVERT=new CConversionHydraulique1d(SERVEUR_HYDRO1D, CONNEXION_LIDO);
if( evtSupport_!=null )
! UsineHelper.findUsine().removeObjetEventListener((IObjetEventListenerSupport)evtSupport_.tie());
evtSupport_=new DObjetEventListenerSupport();
evtSupport_.clientListener(this);
|
