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-12-12 10:30:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/vag
Modified Files:
DParametresVag.java
Log Message:
Maj general (CtuluLib)
Index: DParametresVag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/vag/DParametresVag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DParametresVag.java 25 Nov 2003 10:12:05 -0000 1.4
--- DParametresVag.java 12 Dec 2003 10:30:55 -0000 1.5
***************
*** 16,19 ****
--- 16,22 ----
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.calcul.DParametres;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 65,69 ****
System.out.println("Ecriture des parametres 01");
FortranWriter f01= new FortranWriter(new OutputStreamWriter(_f01));
! f01.setLineSeparator(DodicoLib.LINE_SEP);
String vide= "";
int fmtI[], fmtD[];
--- 68,72 ----
System.out.println("Ecriture des parametres 01");
FortranWriter f01= new FortranWriter(new OutputStreamWriter(_f01));
! f01.setLineSeparator(CtuluLib.LINE_SEP);
String vide= "";
int fmtI[], fmtD[];
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/reflux/io
Modified Files:
CorEleBthReader.java CorEleBthWriter.java INPReader.java
INPWriter.java
Log Message:
Maj general (CtuluLib)
Index: CorEleBthReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthReader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CorEleBthReader.java 25 Nov 2003 10:11:50 -0000 1.11
--- CorEleBthReader.java 12 Dec 2003 10:30:54 -0000 1.12
***************
*** 12,17 ****
import java.io.IOException;
import java.io.Reader;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.fichiers.FileFormat;
--- 12,19 ----
import java.io.IOException;
import java.io.Reader;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.fichiers.FileFormat;
***************
*** 22,27 ****
import org.fudaa.dodico.fortran.FortranReader;
import org.fudaa.dodico.h2d.H2dElement;
- import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dGridMutable;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
--- 24,29 ----
import org.fudaa.dodico.fortran.FortranReader;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dGridMutable;
+ import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
***************
*** 125,129 ****
analyze_.addError(DodicoResource.getS("Erreur d'entrée/sortie"));
analyze_.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 127,131 ----
analyze_.addError(DodicoResource.getS("Erreur d'entrée/sortie"));
analyze_.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 149,153 ****
analyze_.addError(DodicoResource.getS("Erreur d'entrée/sortie"));
analyze_.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 151,155 ----
analyze_.addError(DodicoResource.getS("Erreur d'entrée/sortie"));
analyze_.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 263,267 ****
H2dResource.getS(
"L'indice {0} n'est pas valide",
! DodicoLib.getString(indexPt)),
eleIn_);
analyze_.addInfo(
--- 265,269 ----
H2dResource.getS(
"L'indice {0} n'est pas valide",
! CtuluLib.getString(indexPt)),
eleIn_);
analyze_.addInfo(
***************
*** 286,290 ****
}
} catch (EOFException _e) {
! if (DodicoLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
--- 288,292 ----
}
} catch (EOFException _e) {
! if (CtuluLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
***************
*** 362,366 ****
H2dResource.getS(
"L'index du noeud {0} ne correspond pas",
! DodicoLib.getString(num)),
corIn_);
return null;
--- 364,368 ----
H2dResource.getS(
"L'index du noeud {0} ne correspond pas",
! CtuluLib.getString(num)),
corIn_);
return null;
***************
*** 377,381 ****
}
} catch (EOFException e) {
! if (DodicoLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
--- 379,383 ----
}
} catch (EOFException e) {
! if (CtuluLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
***************
*** 438,442 ****
}
} catch (EOFException e) {
! if (DodicoLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
--- 440,444 ----
}
} catch (EOFException e) {
! if (CtuluLib.DEBUG)
System.out.println("Reading end");
} catch (NumberFormatException fe) {
***************
*** 450,454 ****
H2dResource.getS(
"La bathymétrie des derniers points n'a pas été initialisée (nb pt initialisés {0})",
! DodicoLib.getString(index)),
bthIn_);
}
--- 452,456 ----
H2dResource.getS(
"La bathymétrie des derniers points n'a pas été initialisée (nb pt initialisés {0})",
! CtuluLib.getString(index)),
bthIn_);
}
Index: CorEleBthWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthWriter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CorEleBthWriter.java 25 Nov 2003 10:11:50 -0000 1.10
--- CorEleBthWriter.java 12 Dec 2003 10:30:54 -0000 1.11
***************
*** 11,16 ****
import java.io.IOException;
import java.io.Writer;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.fichiers.FileFormat;
--- 11,18 ----
import java.io.IOException;
import java.io.Writer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.fichiers.FileFormat;
***************
*** 22,27 ****
import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.h2d.H2dElement;
- import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dGrid;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
--- 24,29 ----
import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dGrid;
+ import org.fudaa.dodico.h2d.H2dLib;
import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
***************
*** 40,44 ****
private int df_;
public CorEleBthWriter(CorEleBthFileFormat.CorEleBthVersion _f) {
! lineSep_= DodicoLib.LINE_SEP;
version_= _f;
sf_= version_.getSimpleColumLength();
--- 42,46 ----
private int df_;
public CorEleBthWriter(CorEleBthFileFormat.CorEleBthVersion _f) {
! lineSep_= CtuluLib.LINE_SEP;
version_= _f;
sf_= version_.getSimpleColumLength();
Index: INPReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPReader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** INPReader.java 11 Dec 2003 12:41:28 -0000 1.13
--- INPReader.java 12 Dec 2003 10:30:54 -0000 1.14
***************
*** 11,14 ****
--- 11,15 ----
import gnu.trove.TIntDoubleHashMap;
import gnu.trove.TIntObjectHashMap;
+
import java.io.EOFException;
import java.io.File;
***************
*** 18,21 ****
--- 19,25 ----
import java.util.HashMap;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 28,44 ****
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dEvolutionMutable;
- import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.H2dGridMutable;
- import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dNodalPropertyMixte;
import org.fudaa.dodico.h2d.H2dResource;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
- import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable;
import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
! import org.fudaa.dodico.h2d.type.H2dResolutionMethodType;
import org.fudaa.dodico.h2d.type.H2dProjetType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
--- 32,47 ----
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dEvolutionMutable;
import org.fudaa.dodico.h2d.H2dGridMutable;
import org.fudaa.dodico.h2d.H2dNodalPropertyMixte;
+ import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
+ import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable;
import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel;
import org.fudaa.dodico.h2d.type.H2dBcType;
! import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dProjetType;
+ import org.fudaa.dodico.h2d.type.H2dResolutionMethodType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
***************
*** 577,581 ****
H2dResource.getS(
"Le point {0} est spécifié plusieurs fois",
! DodicoLib.getString(temp1 + 1)),
in_);
addAnalyzeLigneLue();
--- 580,584 ----
H2dResource.getS(
"Le point {0} est spécifié plusieurs fois",
! CtuluLib.getString(temp1 + 1)),
in_);
addAnalyzeLigneLue();
***************
*** 686,690 ****
H2dResource.getS(
"La normale n'est pas définie pour le point {0}",
! DodicoLib.getString(indexEnCours)),
in_);
addAnalyzeLigneLue();
--- 689,693 ----
H2dResource.getS(
"La normale n'est pas définie pour le point {0}",
! CtuluLib.getString(indexEnCours)),
in_);
addAnalyzeLigneLue();
***************
*** 807,811 ****
H2dElement[] elems= new H2dElement[temp1];
// int[][] elem = new int[temp1][];
! if (DodicoLib.DEBUG)
System.out.println("DEBUG: total element number " + temp1);
//Ce tableau contient aux indexs d'apparition les elements
--- 810,814 ----
H2dElement[] elems= new H2dElement[temp1];
// int[][] elem = new int[temp1][];
! if (CtuluLib.DEBUG)
System.out.println("DEBUG: total element number " + temp1);
//Ce tableau contient aux indexs d'apparition les elements
***************
*** 826,831 ****
//Element de fond : le dernier index n'est pas une chaine vide.
//ELEMENT DE FOND
! if ((!DodicoLib.EMPTY_STRING.equals(in_.stringField(temp2 - 1)))
! && (!DodicoLib.ZERO.equals(in_.stringField(temp2 - 1)))) {
//T6 alors que L3 rencontre ....
if (elemBordCommence) {
--- 829,834 ----
//Element de fond : le dernier index n'est pas une chaine vide.
//ELEMENT DE FOND
! if ((!CtuluLib.EMPTY_STRING.equals(in_.stringField(temp2 - 1)))
! && (!CtuluLib.ZERO.equals(in_.stringField(temp2 - 1)))) {
//T6 alors que L3 rencontre ....
if (elemBordCommence) {
***************
*** 887,894 ****
temp= fmt.length;
final int nbElemFond= indexEnCours;
! if (DodicoLib.DEBUG)
System.out.println("DEBUG: bottom element number =" + nbElemFond);
final int nbElemBord= elemBord == null ? 0 : elemBord.length;
! if (DodicoLib.DEBUG)
System.out.println("DEBUG: boundary element number =" + nbElemBord);
H2dGridMutable maillage;
--- 890,897 ----
temp= fmt.length;
final int nbElemFond= indexEnCours;
! if (CtuluLib.DEBUG)
System.out.println("DEBUG: bottom element number =" + nbElemFond);
final int nbElemBord= elemBord == null ? 0 : elemBord.length;
! if (CtuluLib.DEBUG)
System.out.println("DEBUG: boundary element number =" + nbElemBord);
H2dGridMutable maillage;
***************
*** 935,939 ****
bordType= version_.getBordType(in_.intField(i));
if (bordType != null) {
! if (DodicoLib.DEBUG)
System.out.println(
"DEBUG: L3 n°= " + (indexEnCours + 1) + bordType.getNom());
--- 938,942 ----
bordType= version_.getBordType(in_.intField(i));
if (bordType != null) {
! if (CtuluLib.DEBUG)
System.out.println(
"DEBUG: L3 n°= " + (indexEnCours + 1) + bordType.getNom());
***************
*** 1018,1022 ****
//le nombre total d'element.
temp2= nbElemBord + nbElemFond;
! if (DodicoLib.DEBUG) {
System.out.println("DEBUG: " + temp + " elementary properties");
System.out.println("DEBUG: " + nbGroupe + " groups");
--- 1021,1025 ----
//le nombre total d'element.
temp2= nbElemBord + nbElemFond;
! if (CtuluLib.DEBUG) {
System.out.println("DEBUG: " + temp + " elementary properties");
System.out.println("DEBUG: " + nbGroupe + " groups");
***************
*** 1053,1057 ****
H2dResource.getS(
"L'élément {0} possède un numéro de groupe non valide",
! DodicoLib.getString(indexEnCours)),
in_);
}
--- 1056,1060 ----
H2dResource.getS(
"L'élément {0} possède un numéro de groupe non valide",
! CtuluLib.getString(indexEnCours)),
in_);
}
***************
*** 1132,1136 ****
H2dResource.getS(
"Le bord {0} n'est pas un bord solide avec frottement",
! DodicoLib.getString(indexElement - nbElemFond)),
in_);
} else {
--- 1135,1139 ----
H2dResource.getS(
"Le bord {0} n'est pas un bord solide avec frottement",
! CtuluLib.getString(indexElement - nbElemFond)),
in_);
} else {
***************
*** 1237,1241 ****
new H2dRefluxBoundaryConditionMutable[indexEnCours];
System.arraycopy(clF, 0, clFinal, 0, indexEnCours);
! if (DodicoLib.DEBUG)
System.out.println("DEBUG: nb boundary condition = " + indexEnCours);
projet.setConditionLimite(clFinal);
--- 1240,1244 ----
new H2dRefluxBoundaryConditionMutable[indexEnCours];
System.arraycopy(clF, 0, clFinal, 0, indexEnCours);
! if (CtuluLib.DEBUG)
System.out.println("DEBUG: nb boundary condition = " + indexEnCours);
projet.setConditionLimite(clFinal);
***************
*** 1253,1260 ****
while (sTemp.startsWith(sTemp1)) {
String s= sTemp.substring(index).trim();
! if (s.indexOf(DodicoLib.ESPACE) < 0)
fic.add(s);
else {
! StringTokenizer st= new StringTokenizer(DodicoLib.EMPTY_STRING);
while (st.hasMoreElements()) {
fic.add(st.nextToken());
--- 1256,1263 ----
while (sTemp.startsWith(sTemp1)) {
String s= sTemp.substring(index).trim();
! if (s.indexOf(CtuluLib.ESPACE) < 0)
fic.add(s);
else {
! StringTokenizer st= new StringTokenizer(CtuluLib.EMPTY_STRING);
while (st.hasMoreElements()) {
fic.add(st.nextToken());
***************
*** 1404,1408 ****
if(viscositeTransit==null){ System.out.println("prob with transit viscosity"); }
else d=viscositeTransit.doubleValue();
! if(DodicoLib.DEBUG) System.out.println("DEBUG: transit viscosity value= "+d);
gt.setMethodeValue(H2dVariableType.VISCOSITE, d);
}
--- 1407,1411 ----
if(viscositeTransit==null){ System.out.println("prob with transit viscosity"); }
else d=viscositeTransit.doubleValue();
! if(CtuluLib.DEBUG) System.out.println("DEBUG: transit viscosity value= "+d);
gt.setMethodeValue(H2dVariableType.VISCOSITE, d);
}
***************
*** 1470,1475 ****
manageResult(projet, pointsExtremitesElements);
} catch (EOFException _e) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("End of file for inp file");
if (!foundEntete) {
analyze_.addFatalError(H2dResource.getS("Fichier invalide"), in_);
--- 1473,1478 ----
manageResult(projet, pointsExtremitesElements);
} catch (EOFException _e) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("End of file for inp file");
if (!foundEntete) {
analyze_.addFatalError(H2dResource.getS("Fichier invalide"), in_);
***************
*** 1493,1497 ****
H2dResource.getS(
"Le fichier des conditions limites transitoires est introuvable")
! + DodicoLib.ESPACE
+ clFile.getAbsolutePath());
} else {
--- 1496,1500 ----
H2dResource.getS(
"Le fichier des conditions limites transitoires est introuvable")
! + CtuluLib.ESPACE
+ clFile.getAbsolutePath());
} else {
***************
*** 1516,1520 ****
H2dResource.getS(
"Le fichier des propriétés nodales transitoires est introuvable")
! + DodicoLib.ESPACE
+ clFile.getAbsolutePath());
} else {
--- 1519,1523 ----
H2dResource.getS(
"Le fichier des propriétés nodales transitoires est introuvable")
! + CtuluLib.ESPACE
+ clFile.getAbsolutePath());
} else {
Index: INPWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPWriter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** INPWriter.java 11 Dec 2003 12:41:28 -0000 1.10
--- INPWriter.java 12 Dec 2003 10:30:54 -0000 1.11
***************
*** 11,14 ****
--- 11,15 ----
import gnu.trove.TIntHashSet;
import gnu.trove.TIntObjectHashMap;
+
import java.io.File;
import java.io.FileWriter;
***************
*** 21,27 ****
import java.util.List;
import java.util.Map;
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoArrayList;
- import org.fudaa.dodico.commun.DodicoIntIterator;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
--- 22,30 ----
import java.util.List;
import java.util.Map;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoArrayList;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
***************
*** 33,48 ****
import org.fudaa.dodico.fortran.FortranInterface;
import org.fudaa.dodico.fortran.FortranWriter;
- import org.fudaa.dodico.h2d.H2dBoundaryCondition;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dEvolution;
- import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.H2dGrid;
- import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dNodalPropertyMixte;
import org.fudaa.dodico.h2d.H2dResource;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
--- 36,50 ----
import org.fudaa.dodico.fortran.FortranInterface;
import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.h2d.H2dElement;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.H2dGrid;
import org.fudaa.dodico.h2d.H2dNodalPropertyMixte;
+ import org.fudaa.dodico.h2d.H2dPoint;
import org.fudaa.dodico.h2d.H2dResource;
+ import org.fudaa.dodico.h2d.H2dTimeStepGroup;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral;
import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition;
import org.fudaa.dodico.h2d.type.H2dBcType;
+ import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dElementType;
import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType;
***************
*** 132,136 ****
public String toString() {
return variable_
! + DodicoLib.ESPACE
+ clType_
+ "( value= "
--- 134,138 ----
public String toString() {
return variable_
! + CtuluLib.ESPACE
+ clType_
+ "( value= "
***************
*** 190,194 ****
*/
public String toString() {
! return rugositeType_ + DodicoLib.ESPACE + rugositeValeur_;
}
/**
--- 192,196 ----
*/
public String toString() {
! return rugositeType_ + CtuluLib.ESPACE + rugositeValeur_;
}
/**
***************
*** 289,293 ****
for (int i= 0; i < nb; i++) {
b.append(i).append(": ").append(types_[i]).append(
! DodicoLib.ESPACE).append(
valeurs_[i]);
}
--- 291,295 ----
for (int i= 0; i < nb; i++) {
b.append(i).append(": ").append(types_[i]).append(
! CtuluLib.ESPACE).append(
valeurs_[i]);
}
***************
*** 308,312 ****
public INPWriter(INPFileFormat.INPVersion _f) {
version_= _f;
! lineSep_= DodicoLib.LINE_SEP;
}
/**
--- 310,314 ----
public INPWriter(INPFileFormat.INPVersion _f) {
version_= _f;
! lineSep_= CtuluLib.LINE_SEP;
}
/**
***************
*** 380,384 ****
if (progress_ != null)
progress_.setDesc(
! super.getOperationDescription() + DodicoLib.ESPACE + getVersion());
writeINP(_o);
return closeOperation(_o);
--- 382,386 ----
if (progress_ != null)
progress_.setDesc(
! super.getOperationDescription() + CtuluLib.ESPACE + getVersion());
writeINP(_o);
return closeOperation(_o);
***************
*** 407,418 ****
out_.println(version_.getEnteteSeparateur());
out_.println(
! DodicoLib.ESPACE
+ H2dResource.getS("Description : Fichier d'entree de REFLUX"));
out_.println(
! DodicoLib.ESPACE
+ version_.getENTETEVersionLineStart()
+ ": "
+ version_.getENTETEVersionPrefixe()
! + DodicoLib.ESPACE
+ _inter.getVersion());
out_.println(version_.getEnteteSeparateur());
--- 409,420 ----
out_.println(version_.getEnteteSeparateur());
out_.println(
! CtuluLib.ESPACE
+ H2dResource.getS("Description : Fichier d'entree de REFLUX"));
out_.println(
! CtuluLib.ESPACE
+ version_.getENTETEVersionLineStart()
+ ": "
+ version_.getENTETEVersionPrefixe()
! + CtuluLib.ESPACE
+ _inter.getVersion());
out_.println(version_.getEnteteSeparateur());
***************
*** 429,433 ****
|| (ent.getRubrique().equals("Print")))
&& (DicoDataType.Binaire.getValue((String)entiteValue.get(ent)))) {
! String s= version_.getIMPRESSION() + DodicoLib.ESPACE + ent.getNom();
out_.println(s);
impressionsList.add(s);
--- 431,435 ----
|| (ent.getRubrique().equals("Print")))
&& (DicoDataType.Binaire.getValue((String)entiteValue.get(ent)))) {
! String s= version_.getIMPRESSION() + CtuluLib.ESPACE + ent.getNom();
out_.println(s);
impressionsList.add(s);
***************
*** 789,793 ****
+ ": "
+ gpEl[j]
! + DodicoLib.ESPACE
+ H2dResource.getS("élément")
+ i
--- 791,795 ----
+ ": "
+ gpEl[j]
! + CtuluLib.ESPACE
+ H2dResource.getS("élément")
+ i
***************
*** 839,843 ****
+ "("
+ bdT3[i]
! + DodicoLib.ESPACE
+ i
+ ")");
--- 841,845 ----
+ "("
+ bdT3[i]
! + CtuluLib.ESPACE
+ i
+ ")");
***************
*** 924,928 ****
String[] fics= _inter.getFichiers();
for (int i= 0; i < fics.length; i++) {
! out_.println(version_.getFICHIER() + DodicoLib.ESPACE + fics[i]);
}
out_.println();
--- 926,930 ----
String[] fics= _inter.getFichiers();
for (int i= 0; i < fics.length; i++) {
! out_.println(version_.getFICHIER() + CtuluLib.ESPACE + fics[i]);
}
out_.println();
***************
*** 1007,1011 ****
indexEnCours= 1;
out_.writeFields(fmt);
! out_.stringField(0, DodicoLib.ESPACE);
}
DicoEntite ent= version_.getCoefContribution(j);
--- 1009,1013 ----
indexEnCours= 1;
out_.writeFields(fmt);
! out_.stringField(0, CtuluLib.ESPACE);
}
DicoEntite ent= version_.getCoefContribution(j);
|
|
From: <de...@us...> - 2003-12-12 10:30:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/objet
Modified Files:
CDodico.java CExec.java
Log Message:
Maj general (CtuluLib)
Index: CDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CDodico.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CDodico.java 25 Nov 2003 10:11:46 -0000 1.7
--- CDodico.java 12 Dec 2003 10:30:54 -0000 1.8
***************
*** 28,31 ****
--- 28,33 ----
import java.util.TimeZone;
import java.util.Vector;
+
+ import org.fudaa.ctulu.CtuluLib;
import org.omg.CORBA.BAD_CONTEXT;
import org.omg.CORBA.BAD_INV_ORDER;
***************
*** 408,412 ****
query= "HELO Dodico";
// System.out.println("++ "+query);
! sendmailout.write(query + DodicoLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
--- 410,414 ----
query= "HELO Dodico";
// System.out.println("++ "+query);
! sendmailout.write(query + CtuluLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
***************
*** 414,418 ****
query= "MAIL FROM: <" + _from + ">";
// System.out.println("++ "+query);
! sendmailout.write(query + DodicoLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
--- 416,420 ----
query= "MAIL FROM: <" + _from + ">";
// System.out.println("++ "+query);
! sendmailout.write(query + CtuluLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
***************
*** 420,424 ****
query= "RCPT TO: <" + _to + ">";
// System.out.println("++ "+query);
! sendmailout.write(query + DodicoLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
--- 422,426 ----
query= "RCPT TO: <" + _to + ">";
// System.out.println("++ "+query);
! sendmailout.write(query + CtuluLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
***************
*** 426,430 ****
query= "DATA";
// System.out.println("++ "+query);
! sendmailout.write(query + DodicoLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
--- 428,432 ----
query= "DATA";
// System.out.println("++ "+query);
! sendmailout.write(query + CtuluLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
***************
*** 432,440 ****
// send the body of the e-mail here
Date date_written= new Date();
! sendmailout.write("Date: " + date_written + DodicoLib.LINE_SEP);
! sendmailout.write("From: " + _from + DodicoLib.LINE_SEP);
! sendmailout.write("To: " + _to + DodicoLib.LINE_SEP);
! sendmailout.write("Subject: " + _subject + DodicoLib.LINE_SEP);
! sendmailout.write(DodicoLib.LINE_SEP);
sendmailout.write(_texte + "\r\n\r\n");
sendmailout.write(".\r\n");
--- 434,442 ----
// send the body of the e-mail here
Date date_written= new Date();
! sendmailout.write("Date: " + date_written + CtuluLib.LINE_SEP);
! sendmailout.write("From: " + _from + CtuluLib.LINE_SEP);
! sendmailout.write("To: " + _to + CtuluLib.LINE_SEP);
! sendmailout.write("Subject: " + _subject + CtuluLib.LINE_SEP);
! sendmailout.write(CtuluLib.LINE_SEP);
sendmailout.write(_texte + "\r\n\r\n");
sendmailout.write(".\r\n");
***************
*** 444,448 ****
query= "QUIT";
// System.out.println("++ "+query);
! sendmailout.write(query + DodicoLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
--- 446,450 ----
query= "QUIT";
// System.out.println("++ "+query);
! sendmailout.write(query + CtuluLib.LINE_SEP);
sendmailout.flush();
answer= sendmailin.readLine();
Index: CExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CExec.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CExec.java 11 Dec 2003 12:41:27 -0000 1.8
--- CExec.java 12 Dec 2003 10:30:54 -0000 1.9
***************
*** 13,17 ****
import java.io.InputStreamReader;
import java.io.PrintStream;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
/**
--- 13,19 ----
import java.io.InputStreamReader;
import java.io.PrintStream;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoResource;
/**
***************
*** 107,111 ****
//sous windows, il arrivre que la lecture du flux soit bloquee.
if (_th.isBlocked()) {
! if ((DodicoLib.DEBUG) && (err_ != null)) {
err_.println(_th.getName() + " " + DodicoResource.getS("bloqué "));
}
--- 109,113 ----
//sous windows, il arrivre que la lecture du flux soit bloquee.
if (_th.isBlocked()) {
! if (CtuluLib.DEBUG && (err_ != null)) {
err_.println(_th.getName() + " " + DodicoResource.getS("bloqué "));
}
***************
*** 122,126 ****
}
} catch (SecurityException _e) {
! DodicoLib.error(_e.getMessage());
}
}
--- 124,128 ----
}
} catch (SecurityException _e) {
! CtuluLib.error(_e.getMessage());
}
}
***************
*** 144,148 ****
"***** " + cmd_[0] + " " + DodicoResource.getS("lance") + " *****");
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
! if (DodicoLib.DEBUG)
System.out.println("lancement processus");
if (execDirectory_ != null)
--- 146,150 ----
"***** " + cmd_[0] + " " + DodicoResource.getS("lance") + " *****");
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
! if (CtuluLib.DEBUG)
System.out.println("lancement processus");
if (execDirectory_ != null)
***************
*** 176,180 ****
}
}
! if (DodicoLib.DEBUG) {
System.out.println("fin processus");
}
--- 178,182 ----
}
}
! if (CtuluLib.DEBUG) {
System.out.println("fin processus");
}
***************
*** 204,212 ****
// try
// {
! // if (DodicoLib.DEBUG)
// System.out.println("fermeture sortie standard");
// if (psIn != null)
// psIn.close();
! // if (DodicoLib.DEBUG)
// System.out.println("sortie standard fermee");
// }
--- 206,214 ----
// try
// {
! // if (CtuluLib.DEBUG)
// System.out.println("fermeture sortie standard");
// if (psIn != null)
// psIn.close();
! // if (CtuluLib.DEBUG)
// System.out.println("sortie standard fermee");
// }
***************
*** 220,228 ****
// try
// {
! // if (DodicoLib.DEBUG)
// System.out.println("fermeture sortie erreur");
// if (psErr != null)
// psErr.close();
! // if (DodicoLib.DEBUG)
// System.out.println("sortie erreur fermee");
// Thread.currentThread().setPriority(oldpriority);
--- 222,230 ----
// try
// {
! // if (CtuluLib.DEBUG)
// System.out.println("fermeture sortie erreur");
// if (psErr != null)
// psErr.close();
! // if (CtuluLib.DEBUG)
// System.out.println("sortie erreur fermee");
// Thread.currentThread().setPriority(oldpriority);
***************
*** 236,240 ****
// }
}
! if (DodicoLib.DEBUG)
System.out.println("CExec.exec() terminee");
}
--- 238,242 ----
// }
}
! if (CtuluLib.DEBUG)
System.out.println("CExec.exec() terminee");
}
***************
*** 289,293 ****
// c.setOutStream(System.out);
// c.exec();
! // if (DodicoLib.DEBUG)
// System.out.println("exec terminé");
// }
--- 291,295 ----
// c.setOutStream(System.out);
// c.exec();
! // if (CtuluLib.DEBUG)
// System.out.println("exec terminé");
// }
|
|
From: <de...@us...> - 2003-12-12 10:30:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/test/h2d
Modified Files:
TestBord.java
Log Message:
Maj general (CtuluLib)
Index: TestBord.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestBord.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestBord.java 11 Dec 2003 12:41:29 -0000 1.7
--- TestBord.java 12 Dec 2003 10:30:55 -0000 1.8
***************
*** 106,110 ****
assertEquals(-1, b.isIntersectBy(19, 11, nbP));
b.setBoundaryType(H2dBoundaryType.SOLIDE);
! assertEquals(-1, b.isIntersectBy(0, 12, nbP));
assertEquals(0, b.isIntersectBy(13, 14, nbP));
assertEquals(1, b.isIntersectBy(14, 14, nbP));
--- 106,110 ----
assertEquals(-1, b.isIntersectBy(19, 11, nbP));
b.setBoundaryType(H2dBoundaryType.SOLIDE);
! assertEquals(0, b.isIntersectBy(0, 12, nbP));
assertEquals(0, b.isIntersectBy(13, 14, nbP));
assertEquals(1, b.isIntersectBy(14, 14, nbP));
|
|
From: <de...@us...> - 2003-12-12 10:30:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/telemac
Modified Files:
TelemacDicoManager.java
Log Message:
Maj general (CtuluLib)
Index: TelemacDicoManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TelemacDicoManager.java 11 Dec 2003 12:41:28 -0000 1.14
--- TelemacDicoManager.java 12 Dec 2003 10:30:54 -0000 1.15
***************
*** 9,13 ****
package org.fudaa.dodico.telemac;
import java.util.HashMap;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
--- 9,15 ----
package org.fudaa.dodico.telemac;
import java.util.HashMap;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.dico.DicoCasFileFormat;
import org.fudaa.dodico.dico.DicoCasFileFormatVersion;
***************
*** 78,83 ****
if ((lastVersion.equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("new instance for telemac 2d");
if (telemac2dv5p3_ == null)
telemac2dv5p3_= _ft.createVersion(createDico(name, _v, _language));
--- 80,85 ----
if ((lastVersion.equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("new instance for telemac 2d");
if (telemac2dv5p3_ == null)
telemac2dv5p3_= _ft.createVersion(createDico(name, _v, _language));
|
|
From: <de...@us...> - 2003-12-12 10:30:58
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/mascaret
Modified Files:
EdamoxWriter.java
Log Message:
Maj general (CtuluLib)
Index: EdamoxWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/EdamoxWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EdamoxWriter.java 25 Nov 2003 10:11:42 -0000 1.6
--- EdamoxWriter.java 12 Dec 2003 10:30:54 -0000 1.7
***************
*** 11,15 ****
import java.util.*;
import java.lang.reflect.*;
! import org.fudaa.dodico.commun.DodicoLib;
/**
* @version $Revision$ $Date$ by $Author$
--- 11,17 ----
import java.util.*;
import java.lang.reflect.*;
!
! import org.fudaa.ctulu.CtuluLib;
!
/**
* @version $Revision$ $Date$ by $Author$
***************
*** 20,24 ****
protected String nomRubrique= "";
protected Object[] descriptionChamp;
! private static String lineSeparator= DodicoLib.LINE_SEP;
private static final int IRIEN= Integer.MIN_VALUE;
public String getLineSeparator() {
--- 22,26 ----
protected String nomRubrique= "";
protected Object[] descriptionChamp;
! private static String lineSeparator= CtuluLib.LINE_SEP;
private static final int IRIEN= Integer.MIN_VALUE;
public String getLineSeparator() {
|
|
From: <de...@us...> - 2003-12-12 10:30:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/h2d/telemac
Modified Files:
H2dTelemacBcManager.java H2dTelemacBoundary.java
Log Message:
Maj general (CtuluLib)
Index: H2dTelemacBcManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dTelemacBcManager.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dTelemacBcManager.java 12 Dec 2003 10:30:54 -0000 1.4
***************
*** 19,22 ****
--- 19,24 ----
import java.util.Map;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoCommand;
***************
*** 70,74 ****
return (param == null ? false : param.isValueFixedFor(_b));
}
!
/**
* Surcharger uniquement pour des raisons de performances et permettre
--- 72,76 ----
return (param == null ? false : param.isValueFixedFor(_b));
}
!
/**
* Surcharger uniquement pour des raisons de performances et permettre
***************
*** 392,396 ****
}
if (_p == null) {
! DodicoLib.error("no dico for boundary management");
} else if (
!(_p.getDicoFileFormatVersion()
--- 394,398 ----
}
if (_p == null) {
! CtuluLib.error("no dico for boundary management");
} else if (
!(_p.getDicoFileFormatVersion()
***************
*** 703,711 ****
String[] values= ent_.getValues(s);
if (values.length > liquidBorder_.length) {
! DodicoLib.error(
H2dResource.getS(
"Le mot-clé {0} doit au maximum contenir {1} champs (soit le nombre de frontières liquides)",
ent_.getNom(),
! DodicoLib.getString(liquidBorder_.length)));
}
int min=
--- 705,713 ----
String[] values= ent_.getValues(s);
if (values.length > liquidBorder_.length) {
! CtuluLib.error(
H2dResource.getS(
"Le mot-clé {0} doit au maximum contenir {1} champs (soit le nombre de frontières liquides)",
ent_.getNom(),
! CtuluLib.getString(liquidBorder_.length)));
}
int min=
***************
*** 733,740 ****
return r;
} /**
! * Les conditions limites doivent etre donnees dans l'ordre de la numerotation
! * frontiere. C'est l'ordre par defaut donné par les lecteurs.
! * The boundary limits must be ordered according to the boundary numerotation.
! */
public static H2dTelemacBcManager init(
H2dGrid _maillage,
--- 735,742 ----
return r;
} /**
! * Les conditions limites doivent etre donnees dans l'ordre de la numerotation
! * frontiere. C'est l'ordre par defaut donné par les lecteurs.
! * The boundary limits must be ordered according to the boundary numerotation.
! */
public static H2dTelemacBcManager init(
H2dGrid _maillage,
***************
*** 820,824 ****
H2dResource.getS(
"Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)",
! DodicoLib.getString(boundaryIdx)));
}
if ((uTypeIsConstant)
--- 822,826 ----
H2dResource.getS(
"Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)",
! CtuluLib.getString(boundaryIdx)));
}
if ((uTypeIsConstant)
***************
*** 830,834 ****
H2dResource.getS(
"La vitesse u n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords",
! DodicoLib.getString(boundaryIdx)));
//il est possible qu'un bord avec vitesse imposee ait les deux vitesses en libre. on corrige
//cela en mettant les 2 vitesses en permanent.
--- 832,836 ----
H2dResource.getS(
"La vitesse u n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords",
! CtuluLib.getString(boundaryIdx)));
//il est possible qu'un bord avec vitesse imposee ait les deux vitesses en libre. on corrige
//cela en mettant les 2 vitesses en permanent.
***************
*** 861,865 ****
H2dResource.getS(
"La vitesse v n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords",
! DodicoLib.getString(boundaryIdx)));
//il est possible qu'un bord avec vitesse imposee ait les deux vitesses en libre. on corrige
//cela en mettant les 2 vitesses en permanent.
--- 863,867 ----
H2dResource.getS(
"La vitesse v n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords",
! CtuluLib.getString(boundaryIdx)));
//il est possible qu'un bord avec vitesse imposee ait les deux vitesses en libre. on corrige
//cela en mettant les 2 vitesses en permanent.
***************
*** 1477,1483 ****
cmd_.undo();
}
! }
! else
! new Throwable().printStackTrace();
}
}
--- 1479,1484 ----
cmd_.undo();
}
! } else
! new Throwable().printStackTrace();
}
}
***************
*** 1572,1583 ****
};
} /**
! *
! */
public void dicoParamsStateLoadedEntiteChanged(
DicoParams _cas,
DicoEntite _ent) {
} /**
! *
! */
public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {}
}
--- 1573,1584 ----
};
} /**
! *
! */
public void dicoParamsStateLoadedEntiteChanged(
DicoParams _cas,
DicoEntite _ent) {
} /**
! *
! */
public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {}
}
Index: H2dTelemacBoundary.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dTelemacBoundary.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dTelemacBoundary.java 12 Dec 2003 10:30:54 -0000 1.4
***************
*** 14,18 ****
import java.util.List;
import java.util.Map;
! import java.util.TreeMap;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
--- 14,20 ----
import java.util.List;
import java.util.Map;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
***************
*** 20,26 ****
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquideMutable;
- import org.fudaa.dodico.h2d.H2dFrontier;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
/**
--- 22,27 ----
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquideMutable;
import org.fudaa.dodico.h2d.type.H2dBcType;
+ import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dVariableType;
/**
***************
*** 282,287 ****
public final void updateVarEvolFromMemento(Map _m) {
if ((_m == null) || (_m.size() == 0)) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("memento is empty");
if ((varEvolution_ != null) && (varEvolution_.size() > 0)) {
for (Iterator it= varEvolution_.values().iterator(); it.hasNext();) {
--- 283,288 ----
public final void updateVarEvolFromMemento(Map _m) {
if ((_m == null) || (_m.size() == 0)) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("memento is empty");
if ((varEvolution_ != null) && (varEvolution_.size() > 0)) {
for (Iterator it= varEvolution_.values().iterator(); it.hasNext();) {
***************
*** 291,296 ****
}
} else if ((varEvolution_ == null) || (varEvolution_.size() == 0)) {
! if (DodicoLib.DEBUG)
! DodicoLib.debug("current is empty");
if (varEvolution_ == null)
varEvolution_= new HashMap(_m.size());
--- 292,297 ----
}
} else if ((varEvolution_ == null) || (varEvolution_.size() == 0)) {
! if (CtuluLib.DEBUG)
! CtuluLib.debug("current is empty");
if (varEvolution_ == null)
varEvolution_= new HashMap(_m.size());
***************
*** 303,308 ****
} else {
Map newMap= new HashMap(_m.size());
! if (DodicoLib.DEBUG)
! DodicoLib.debug("synchronize current and memento");
for (Iterator it= varEvolution_.entrySet().iterator(); it.hasNext();) {
Map.Entry e= (Map.Entry)it.next();
--- 304,309 ----
} else {
Map newMap= new HashMap(_m.size());
! if (CtuluLib.DEBUG)
! CtuluLib.debug("synchronize current and memento");
for (Iterator it= varEvolution_.entrySet().iterator(); it.hasNext();) {
Map.Entry e= (Map.Entry)it.next();
|
|
From: <de...@us...> - 2003-12-12 10:30:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/h2d/reflux
Modified Files:
H2dRefluxBcManager.java H2dRefluxBordIndexGeneral.java
Log Message:
Maj general (CtuluLib)
Index: H2dRefluxBcManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBcManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dRefluxBcManager.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dRefluxBcManager.java 12 Dec 2003 10:30:54 -0000 1.4
***************
*** 23,26 ****
--- 23,28 ----
import java.util.Set;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoCommand;
***************
*** 128,132 ****
}
if (!r)
! DodicoLib.debug("bordcomport controle change");
return r;
}
--- 130,134 ----
}
if (!r)
! CtuluLib.debug("bordcomport controle change");
return r;
}
***************
*** 171,175 ****
}
if (!r)
! DodicoLib.debug("bordcomport controle change");
return r;
}
--- 173,177 ----
}
if (!r)
! CtuluLib.debug("bordcomport controle change");
return r;
}
***************
*** 234,238 ****
}
if (!r)
! DodicoLib.debug("bordcomport controle change");
return r;
}
--- 236,240 ----
}
if (!r)
! CtuluLib.debug("bordcomport controle change");
return r;
}
***************
*** 464,468 ****
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! DodicoLib.getString(ptIdxGlobal)));
H2dRefluxBoundaryCondition clN= new H2dRefluxBoundaryCondition();
clN.setIndexPt(ptIdxGlobal);
--- 466,470 ----
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! CtuluLib.getString(ptIdxGlobal)));
H2dRefluxBoundaryCondition clN= new H2dRefluxBoundaryCondition();
clN.setIndexPt(ptIdxGlobal);
***************
*** 482,486 ****
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! DodicoLib.getString(ptIdxGlobal)));
H2dRefluxBoundaryConditionMutable clN=
new H2dRefluxBoundaryConditionMutable();
--- 484,488 ----
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! CtuluLib.getString(ptIdxGlobal)));
H2dRefluxBoundaryConditionMutable clN=
new H2dRefluxBoundaryConditionMutable();
***************
*** 508,512 ****
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! DodicoLib.getString(ptIdxGlobal)));
if (bordType == H2dBoundaryType.SOLIDE_FROTTEMENT) {
cl= new H2dRefluxBoundaryConditionMiddleFriction();
--- 510,514 ----
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! CtuluLib.getString(ptIdxGlobal)));
if (bordType == H2dBoundaryType.SOLIDE_FROTTEMENT) {
cl= new H2dRefluxBoundaryConditionMiddleFriction();
***************
*** 551,555 ****
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! DodicoLib.getString(ptIdxGlobal)));
cls[j]= createSolidCL(ptIdxGlobal);
} else {
--- 553,557 ----
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! CtuluLib.getString(ptIdxGlobal)));
cls[j]= createSolidCL(ptIdxGlobal);
} else {
***************
*** 566,570 ****
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! DodicoLib.getString(ptIdxGlobal)));
cls[j]= createSolidMiddleCL(ptIdxGlobal);
} else {
--- 568,572 ----
H2dResource.getS(
"Pas de cl pour le point de bord {0}",
! CtuluLib.getString(ptIdxGlobal)));
cls[j]= createSolidMiddleCL(ptIdxGlobal);
} else {
Index: H2dRefluxBordIndexGeneral.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBordIndexGeneral.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** H2dRefluxBordIndexGeneral.java 25 Nov 2003 10:11:36 -0000 1.6
--- H2dRefluxBordIndexGeneral.java 12 Dec 2003 10:30:54 -0000 1.7
***************
*** 8,15 ****
*/
package org.fudaa.dodico.h2d.reflux;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.H2dEvolution;
- import org.fudaa.dodico.h2d.type.H2dBoundaryType;
import org.fudaa.dodico.h2d.type.H2dBcType;
/**
* Une classe pour definir un bord pour les fichiers e-s de reflux (inp).
--- 8,17 ----
*/
package org.fudaa.dodico.h2d.reflux;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.H2dEvolution;
import org.fudaa.dodico.h2d.type.H2dBcType;
+ import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
* Une classe pour definir un bord pour les fichiers e-s de reflux (inp).
***************
*** 119,126 ****
"boundary "
+ bord_
! + DodicoLib.ESPACE
+ DodicoLib._printObject(index_, true);
if (bord_ == H2dBoundaryType.SOLIDE_FROTTEMENT)
! r += DodicoLib.ESPACE
+ "friction ( "
+ rugositeType_
--- 121,128 ----
"boundary "
+ bord_
! + CtuluLib.ESPACE
+ DodicoLib._printObject(index_, true);
if (bord_ == H2dBoundaryType.SOLIDE_FROTTEMENT)
! r += CtuluLib.ESPACE
+ "friction ( "
+ rugositeType_
|
|
From: <de...@us...> - 2003-12-12 10:30:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/h2d/type
Modified Files:
H2dVariableType.java
Log Message:
Maj general (CtuluLib)
Index: H2dVariableType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** H2dVariableType.java 11 Dec 2003 12:41:27 -0000 1.7
--- H2dVariableType.java 12 Dec 2003 10:30:54 -0000 1.8
***************
*** 8,15 ****
*/
package org.fudaa.dodico.h2d.type;
! import java.util.Iterator;
! import java.util.List;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.commun.DodicoPermanentList;
import org.fudaa.dodico.h2d.H2dResource;
/**
--- 8,13 ----
*/
package org.fudaa.dodico.h2d.type;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.h2d.H2dResource;
/**
***************
*** 67,71 ****
public String getCommonUnit(){
! return DodicoLib.EMPTY_STRING;
}
--- 65,69 ----
public String getCommonUnit(){
! return CtuluLib.EMPTY_STRING;
}
***************
*** 78,82 ****
public String getCommonUnit(){
! return DodicoLib.EMPTY_STRING;
}
--- 76,80 ----
public String getCommonUnit(){
! return CtuluLib.EMPTY_STRING;
}
***************
*** 225,229 ****
public String getCommonUnit(){
! return DodicoLib.EMPTY_STRING;
}
--- 223,227 ----
public String getCommonUnit(){
! return CtuluLib.EMPTY_STRING;
}
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/h2d
Modified Files:
H2dBcFrontierBlockAbstract.java H2dBoundary.java
H2dEvolution.java H2dEvolutionManager.java H2dGrid.java
h2d_en.fr_txt
Log Message:
Maj general (CtuluLib)
Index: H2dBcFrontierBlockAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dBcFrontierBlockAbstract.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dBcFrontierBlockAbstract.java 12 Dec 2003 10:30:53 -0000 1.4
***************
*** 11,15 ****
import java.util.Collection;
import java.util.HashSet;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
--- 11,17 ----
import java.util.Collection;
import java.util.HashSet;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
***************
*** 58,62 ****
|| ((H2dBoundary.getNbPointInBord(_min, _max, getNbPt()) < 3)))
return false;
! if (DodicoLib.DEBUG)
System.out.println("DEBUG insert solid " + _min + "," + _max);
H2dBoundary b= (H2dBoundary)bords_.get(_bord);
--- 60,64 ----
|| ((H2dBoundary.getNbPointInBord(_min, _max, getNbPt()) < 3)))
return false;
! if (CtuluLib.DEBUG)
System.out.println("DEBUG insert solid " + _min + "," + _max);
H2dBoundary b= (H2dBoundary)bords_.get(_bord);
Index: H2dBoundary.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dBoundary.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dBoundary.java 12 Dec 2003 10:30:53 -0000 1.4
***************
*** 9,13 ****
*/
package org.fudaa.dodico.h2d;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
--- 9,14 ----
*/
package org.fudaa.dodico.h2d;
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
/**
***************
*** 168,172 ****
public String toString() {
return "H2DBord "
! + (name_ == null ? DodicoLib.EMPTY_STRING : name_)
+ "("
+ IdxmaillageFrontiere_
--- 169,173 ----
public String toString() {
return "H2DBord "
! + (name_ == null ? CtuluLib.EMPTY_STRING : name_)
+ "("
+ IdxmaillageFrontiere_
Index: H2dEvolution.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolution.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** H2dEvolution.java 11 Dec 2003 12:41:27 -0000 1.5
--- H2dEvolution.java 12 Dec 2003 10:30:53 -0000 1.6
***************
*** 8,13 ****
*/
package org.fudaa.dodico.h2d;
import org.fudaa.dodico.commun.DodicoDoubleDoubleSortedList;
- import org.fudaa.dodico.commun.DodicoLib;
/**
* @author deniger
--- 8,14 ----
*/
package org.fudaa.dodico.h2d;
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoDoubleDoubleSortedList;
/**
* @author deniger
***************
*** 66,69 ****
--- 67,84 ----
fireEvolutionUsedChanged(old);
}
+
+ public double getMaxY() {
+ return list_.getMaxY();
+ }
+
+ public double getMaxX() {
+ return list_.getMaxX();
+ }
+ public double getMinY() {
+ return list_.getMinY();
+ }
+ public double getMinX() {
+ return list_.getMinX();
+ }
/**
*
***************
*** 99,102 ****
--- 114,119 ----
list_.ensureCapacity(_c);
}
+
+
/**
*
***************
*** 131,135 ****
public String getDescriptionTotale() {
StringBuffer b= new StringBuffer();
! b.append(toString()).append(DodicoLib.LINE_SEP);
StringBuffer t= new StringBuffer();
StringBuffer v= new StringBuffer();
--- 148,152 ----
public String getDescriptionTotale() {
StringBuffer b= new StringBuffer();
! b.append(toString()).append(CtuluLib.LINE_SEP);
StringBuffer t= new StringBuffer();
StringBuffer v= new StringBuffer();
***************
*** 143,149 ****
}
b.append("time steps=[").append(t.toString()).append("]").append(
! DodicoLib.LINE_SEP);
b.append("values=[").append(v.toString()).append("]").append(
! DodicoLib.LINE_SEP);
return b.toString();
}
--- 160,166 ----
}
b.append("time steps=[").append(t.toString()).append("]").append(
! CtuluLib.LINE_SEP);
b.append("values=[").append(v.toString()).append("]").append(
! CtuluLib.LINE_SEP);
return b.toString();
}
Index: H2dEvolutionManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dEvolutionManager.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dEvolutionManager.java 12 Dec 2003 10:30:53 -0000 1.4
***************
*** 34,37 ****
--- 34,38 ----
listener_= _listener;
}
+
public H2dEvolutionManager(
H2dEvolutionListenerDispatcher _listener,
***************
*** 39,46 ****
listener_= _listener;
evols_= new TreeSet(_s);
! for (Iterator it=evols_.iterator();it.hasNext();) {
((H2dEvolution)it.next()).setListener(listener_);
}
}
public final void add(H2dEvolution[] _l) {
if (_l != null) {
--- 40,79 ----
listener_= _listener;
evols_= new TreeSet(_s);
! for (Iterator it= evols_.iterator(); it.hasNext();) {
((H2dEvolution)it.next()).setListener(listener_);
}
}
+
+ public static double[] getXMinMaxYMinMax(List _l) {
+ if (_l == null)
+ return null;
+ double[] r= new double[4];
+ if (_l.size() == 0)
+ return r;
+
+ int n= _l.size() - 1;
+ H2dEvolution e= (H2dEvolution)_l.get(n);
+ r[0]= e.getMinX();
+ r[1]= e.getMaxX();
+ r[2]= e.getMinY();
+ r[3]= e.getMaxY();
+ double temp;
+ for (int i= n - 1; i >= 0; i--) {
+ e= (H2dEvolution)_l.get(i);
+ temp= e.getMinX();
+ if (temp < r[0])
+ r[0]= temp;
+ temp= e.getMinY();
+ if (temp < r[2])
+ r[2]= temp;
+ temp= e.getMaxX();
+ if (temp > r[1])
+ r[1]= temp;
+ temp= e.getMaxY();
+ if (temp > r[3])
+ r[3]= temp;
+ }
+ return r;
+ }
public final void add(H2dEvolution[] _l) {
if (_l != null) {
***************
*** 51,58 ****
}
}
!
! public boolean isNoCurveUsed(){
! for (Iterator it=evols_.iterator();it.hasNext();) {
! if( ((H2dEvolution)it.next()).isUsed()) return false;
}
return true;
--- 84,92 ----
}
}
!
! public boolean isNoCurveUsed() {
! for (Iterator it= evols_.iterator(); it.hasNext();) {
! if (((H2dEvolution)it.next()).isUsed())
! return false;
}
return true;
***************
*** 86,97 ****
return new DefaultComboBoxModel(createVector());
}
!
public ComboBoxModel createComboBoxModelWithEmpty(H2dEvolution _empty) {
! Vector v=new Vector(getNbEvol()+1);
v.add(_empty);
v.addAll(evols_);
return new DefaultComboBoxModel(v);
}
!
/**
*
--- 120,131 ----
return new DefaultComboBoxModel(createVector());
}
!
public ComboBoxModel createComboBoxModelWithEmpty(H2dEvolution _empty) {
! Vector v= new Vector(getNbEvol() + 1);
v.add(_empty);
v.addAll(evols_);
return new DefaultComboBoxModel(v);
}
!
/**
*
Index: H2dGrid.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dGrid.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** H2dGrid.java 11 Dec 2003 12:41:27 -0000 1.3
--- H2dGrid.java 12 Dec 2003 10:30:53 -0000 1.4
***************
*** 11,14 ****
--- 11,15 ----
import gnu.trove.TIntIntHashMap;
import gnu.trove.TObjectIntHashMap;
+
import java.util.ArrayList;
import java.util.Arrays;
***************
*** 16,19 ****
--- 17,23 ----
import java.util.List;
import java.util.Vector;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 232,236 ****
int n= _l.size();
if (n == 0) {
! DodicoLib.error("no point");
return -1;
}
--- 236,240 ----
int n= _l.size();
if (n == 0) {
! CtuluLib.error("no point");
return -1;
}
***************
*** 516,520 ****
tempInt= this.isElementTrigoOriente(tempI);
if (tempInt == 0)
! DodicoLib.error("plane element or points unknown");
//Si le point est dans le sens horaire on inverse.
//le bord externe doit etre dans le sens trigo
--- 520,524 ----
tempInt= this.isElementTrigoOriente(tempI);
if (tempInt == 0)
! CtuluLib.error("plane element or points unknown");
//Si le point est dans le sens horaire on inverse.
//le bord externe doit etre dans le sens trigo
Index: h2d_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/h2d_en.fr_txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** h2d_en.fr_txt 11 Dec 2003 12:41:27 -0000 1.7
--- h2d_en.fr_txt 12 Dec 2003 10:30:53 -0000 1.8
***************
*** 99,102 ****
--- 99,103 ----
Conditions limites liquides=Liquid boundary conditions
Courbes transitoire=Transient curves
+ Courbes transitoires=Transient curves
Fond=Bottom
Recherche des arêtes de contour=Boundary edges search
***************
*** 229,231 ****
Newton Raphson banc c/d=Newton Raphson bench c/u
Select Lumping banc c/d=Select Lumping bench c/u
! Vide=Empty
\ No newline at end of file
--- 230,233 ----
Newton Raphson banc c/d=Newton Raphson bench c/u
Select Lumping banc c/d=Select Lumping bench c/u
! Vide=Empty
! Courbes temporelles=Time curves
\ No newline at end of file
|
|
From: <de...@us...> - 2003-12-12 10:30:56
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/fortran
Modified Files:
FortranLib.java FortranWriter.java
Log Message:
Maj general (CtuluLib)
Index: FortranLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranLib.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FortranLib.java 25 Nov 2003 10:11:34 -0000 1.4
--- FortranLib.java 12 Dec 2003 10:30:53 -0000 1.5
***************
*** 13,17 ****
import java.io.Reader;
import java.io.Writer;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
/**
--- 13,19 ----
import java.io.Reader;
import java.io.Writer;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoResource;
/**
***************
*** 35,39 ****
if (s != null) {
if (b.length() > 0)
! b.append(DodicoLib.LINE_SEP);
b.append(s);
}
--- 37,41 ----
if (s != null) {
if (b.length() > 0)
! b.append(CtuluLib.LINE_SEP);
b.append(s);
}
***************
*** 58,62 ****
if (r != null) {
return DodicoResource.getS("Erreur lors de la fermeture du flux")
! + DodicoLib.SEP_LINE
+ r.getMessage();
} else
--- 60,64 ----
if (r != null) {
return DodicoResource.getS("Erreur lors de la fermeture du flux")
! + CtuluLib.SEP_LINE
+ r.getMessage();
} else
Index: FortranWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FortranWriter.java 25 Nov 2003 10:11:35 -0000 1.7
--- FortranWriter.java 12 Dec 2003 10:30:53 -0000 1.8
***************
*** 12,17 ****
import java.io.Writer;
import java.util.Collections;
import org.fudaa.dodico.commun.DodicoArrayList;
- import org.fudaa.dodico.commun.DodicoLib;
/**
* Une classe permettant de facilement ecrire des fichiers Fortran.
--- 12,19 ----
import java.io.Writer;
import java.util.Collections;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoArrayList;
/**
* Une classe permettant de facilement ecrire des fichiers Fortran.
***************
*** 21,25 ****
* @author Guillaume Desnoix , Bertrand Marchand
*/
! public class FortranWriter implements FortranInterface// extends PrintWriter
{
protected DodicoArrayList fields;
--- 23,28 ----
* @author Guillaume Desnoix , Bertrand Marchand
*/
! public class FortranWriter
! implements FortranInterface // extends PrintWriter
{
protected DodicoArrayList fields;
***************
*** 28,32 ****
protected int number;
private Writer out_;
! private String line_separator_= DodicoLib.LINE_SEP;
private StringBuffer buffer_;
public FortranWriter(Writer _w) {
--- 31,35 ----
protected int number;
private Writer out_;
! private String line_separator_= CtuluLib.LINE_SEP;
private StringBuffer buffer_;
public FortranWriter(Writer _w) {
***************
*** 384,394 ****
}
private final StringFormatField FF_EMPTY_STRING=
! new StringFormatField(DodicoLib.EMPTY_STRING);
private final StringFormatField FF_ESPACE_STRING=
! new StringFormatField(DodicoLib.ESPACE);
private final StringFormatField getStringFormatField(String _s) {
! if (_s == DodicoLib.EMPTY_STRING)
return FF_EMPTY_STRING;
! if (_s == DodicoLib.ESPACE)
return FF_ESPACE_STRING;
return new StringFormatField(_s);
--- 387,397 ----
}
private final StringFormatField FF_EMPTY_STRING=
! new StringFormatField(CtuluLib.EMPTY_STRING);
private final StringFormatField FF_ESPACE_STRING=
! new StringFormatField(CtuluLib.ESPACE);
private final StringFormatField getStringFormatField(String _s) {
! if (_s == CtuluLib.EMPTY_STRING)
return FF_EMPTY_STRING;
! if (_s == CtuluLib.ESPACE)
return FF_ESPACE_STRING;
return new StringFormatField(_s);
***************
*** 493,497 ****
*/
public String getStringFormate(int _f) {
! return addSpacesBefore(_f, DodicoLib.getString(d_));
}
/**
--- 496,500 ----
*/
public String getStringFormate(int _f) {
! return addSpacesBefore(_f, CtuluLib.getString(d_));
}
/**
***************
*** 499,503 ****
*/
public String getStringNonFormate() {
! return DodicoLib.getString(d_);
}
}
--- 502,506 ----
*/
public String getStringNonFormate() {
! return CtuluLib.getString(d_);
}
}
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/fichiers
Modified Files:
FileOpWriterCharSimpleAbstract.java FileOperationAbstract.java
FileReadOperationAbstract.java FileWriteOperationAbstract.java
Log Message:
Maj general (CtuluLib)
Index: FileOpWriterCharSimpleAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpWriterCharSimpleAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileOpWriterCharSimpleAbstract.java 25 Nov 2003 10:11:34 -0000 1.4
--- FileOpWriterCharSimpleAbstract.java 12 Dec 2003 10:30:53 -0000 1.5
***************
*** 12,19 ****
import java.io.IOException;
import java.io.Writer;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.fortran.FortranInterface;
- import org.fudaa.dodico.fortran.FortranLib;
/**
*
--- 12,20 ----
import java.io.IOException;
import java.io.Writer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.fortran.FortranInterface;
/**
*
***************
*** 26,30 ****
protected Writer out_;
public FileOpWriterCharSimpleAbstract() {
! lineSep_= DodicoLib.LINE_SEP;
}
public void writeln() throws IOException {
--- 27,31 ----
protected Writer out_;
public FileOpWriterCharSimpleAbstract() {
! lineSep_= CtuluLib.LINE_SEP;
}
public void writeln() throws IOException {
Index: FileOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationAbstract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileOperationAbstract.java 25 Nov 2003 10:11:34 -0000 1.5
--- FileOperationAbstract.java 12 Dec 2003 10:30:53 -0000 1.6
***************
*** 13,18 ****
import java.io.FileWriter;
import java.io.IOException;
import org.fudaa.dodico.commun.DodicoAnalyze;
- import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
--- 13,20 ----
import java.io.FileWriter;
import java.io.IOException;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.commun.DodicoAnalyze;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 40,44 ****
analyze_.setDesc(
getOperationDescription()
! + DodicoLib.EMPTY_STRING
+ DodicoResource.getS("Format")
+ ": "
--- 42,46 ----
analyze_.setDesc(
getOperationDescription()
! + CtuluLib.EMPTY_STRING
+ DodicoResource.getS("Format")
+ ": "
Index: FileReadOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileReadOperationAbstract.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileReadOperationAbstract.java 25 Nov 2003 10:11:34 -0000 1.4
--- FileReadOperationAbstract.java 12 Dec 2003 10:30:53 -0000 1.5
***************
*** 9,13 ****
package org.fudaa.dodico.fichiers;
import java.io.File;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
--- 9,15 ----
package org.fudaa.dodico.fichiers;
import java.io.File;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 24,28 ****
if (progress_ != null)
progress_.setDesc(
! getOperationDescription() + DodicoLib.ESPACE + getVersion());
return closeOperation(_read());
}
--- 26,30 ----
if (progress_ != null)
progress_.setDesc(
! getOperationDescription() + CtuluLib.ESPACE + getVersion());
return closeOperation(_read());
}
Index: FileWriteOperationAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileWriteOperationAbstract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileWriteOperationAbstract.java 25 Nov 2003 10:11:34 -0000 1.5
--- FileWriteOperationAbstract.java 12 Dec 2003 10:30:53 -0000 1.6
***************
*** 9,13 ****
package org.fudaa.dodico.fichiers;
import java.io.File;
! import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
--- 9,15 ----
package org.fudaa.dodico.fichiers;
import java.io.File;
!
! import org.fudaa.ctulu.CtuluLib;
!
import org.fudaa.dodico.commun.DodicoResource;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 25,29 ****
if (progress_ != null)
progress_.setDesc(
! getOperationDescription() + DodicoLib.ESPACE + getVersion());
_write(_o);
return closeOperation(_o);
--- 27,31 ----
if (progress_ != null)
progress_.setDesc(
! getOperationDescription() + CtuluLib.ESPACE + getVersion());
_write(_o);
return closeOperation(_o);
|
|
From: <de...@us...> - 2003-12-12 10:29:50
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/org/fudaa/ctulu In directory sc8-pr-cvs1:/tmp/cvs-serv21484/org/fudaa/ctulu Added Files: CtuluLib.java Log Message: Ajout d'une class lib contenant des fonctions communes aux 4 projets --- NEW FILE: CtuluLib.java --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2003-12-12 10:28:41
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser In directory sc8-pr-cvs1:/tmp/cvs-serv21364/filechooser Log Message: Directory /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser added to the repository |
|
From: <de...@us...> - 2003-12-12 10:28:41
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau In directory sc8-pr-cvs1:/tmp/cvs-serv21364/tableau Log Message: Directory /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau added to the repository |
|
From: <de...@us...> - 2003-12-12 10:27:34
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/org/fudaa/ctulu In directory sc8-pr-cvs1:/tmp/cvs-serv21242/ctulu Log Message: Directory /cvsroot/fudaa/fudaa_devel/ctulu/src/org/fudaa/ctulu added to the repository |
|
From: <de...@us...> - 2003-12-12 10:25:22
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/org/fudaa In directory sc8-pr-cvs1:/tmp/cvs-serv20892/fudaa Log Message: Directory /cvsroot/fudaa/fudaa_devel/ctulu/src/org/fudaa added to the repository |
|
From: <de...@us...> - 2003-12-12 10:24:35
|
Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/org In directory sc8-pr-cvs1:/tmp/cvs-serv20735/org Log Message: Directory /cvsroot/fudaa/fudaa_devel/ctulu/src/org added to the repository |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/dico
Modified Files:
FDicoCalculLocal.java FDicoEntiteFileTableModelInterface.java
FDicoEntitePanel.java FDicoEntiteTableModel.java
FDicoFilleProjet.java FDicoFiltreChooserName.java
FDicoFiltreController.java FDicoMultiEntiteViewer.java
FDicoParams.java FDicoProjectPanel.java FDicoProjet.java
FDicoProjetInterface.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FDicoCalculLocal.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoCalculLocal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FDicoCalculLocal.java 25 Nov 2003 10:13:39 -0000 1.6
--- FDicoCalculLocal.java 11 Dec 2003 12:50:54 -0000 1.7
***************
*** 9,15 ****
--- 9,26 ----
package org.fudaa.fudaa.dico;
import java.io.File;
+
+ import javax.swing.JCheckBox;
+
+ import com.memoire.bu.BuBorderLayout;
+ import com.memoire.bu.BuCheckBox;
+ import com.memoire.bu.BuGridLayout;
+
+ import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.dico.DicoExec;
+
+ import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
+
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
/**
***************
*** 23,26 ****
--- 34,45 ----
projet_= _projet;
}
+
+ public void execute() {
+ CalculPanel p=new CalculPanel();
+ if(EbliSimpleDialogPanel.isOkResponse(p.afficheModale(projet_.getImpl().getFrame(), projet_.getCodeName()))){
+ getDicoExec().setLog(p.isLog());
+ super.execute();
+ }
+ }
/**
*
***************
*** 38,41 ****
--- 57,86 ----
+ DodicoLib.ESPACE
+ projet_.getCodeName();
+ }
+
+ protected DicoExec getDicoExec(){
+ return (DicoExec)exe_;
+ }
+
+ private class CalculPanel extends EbliSimpleDialogPanel{
+ JCheckBox cbLog_;
+ CalculPanel(){
+ addEmptyBorder(10);
+ setLayout(new BuGridLayout(2,10,10));
+ addStringText(getDicoExec().getExecName()).setEnabled(false);
+ addStringText(projet_.getParamsFile().getAbsolutePath()).setEnabled(false);
+ addLabel(DodicoLib.EMPTY_STRING);
+ cbLog_=new BuCheckBox(FDicoResource.getS("Créer les fichiers de log"));
+ cbLog_.setSelected(FDicoPreferences.FD.getBooleanProperty("calcul.log", true));
+ add(cbLog_);
+ }
+
+ public boolean isLog(){
+ return cbLog_.isSelected();
+ }
+
+ public void apply(){
+ FDicoPreferences.FD.putBooleanProperty("calcul.log", cbLog_.isSelected());
+ }
}
}
Index: FDicoEntiteFileTableModelInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntiteFileTableModelInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FDicoEntiteFileTableModelInterface.java 25 Nov 2003 10:13:40 -0000 1.2
--- FDicoEntiteFileTableModelInterface.java 11 Dec 2003 12:50:54 -0000 1.3
***************
*** 21,23 ****
--- 21,24 ----
public int indexOf(DicoEntite e);
public DicoEntite getEntite(int row);
+ public void remove(int[] _row);
}
Index: FDicoEntitePanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntitePanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoEntitePanel.java 25 Nov 2003 10:13:40 -0000 1.8
--- FDicoEntitePanel.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 31,34 ****
--- 31,35 ----
import javax.swing.JScrollPane;
import javax.swing.JTable;
+ import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
***************
*** 330,334 ****
refresh();
}
! public void dicoParamsStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
--- 331,335 ----
refresh();
}
! public void dicoParamsValidStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
***************
*** 358,361 ****
--- 359,363 ----
JTable table_;
FDicoEntiteTableModel tableModel_;
+ FDicoFiltreChooserName findFiltre_;
// public FDicoEntitePanel(FDicoEntiteTableModel _model) {
// this(_model,null);
***************
*** 456,460 ****
table_.getTableHeader().addMouseListener(l);
FDicoFiltreController filtre= new FDicoFiltreController();
! filtre.add(new FDicoFiltreChooserName());
filtre.add(new FDicoFiltreChooserModified(_model.getParams()));
filtre.add(new FDIcoFiltreChooserMode());
--- 458,463 ----
table_.getTableHeader().addMouseListener(l);
FDicoFiltreController filtre= new FDicoFiltreController();
! findFiltre_= new FDicoFiltreChooserName();
! filtre.add(findFiltre_);
filtre.add(new FDicoFiltreChooserModified(_model.getParams()));
filtre.add(new FDIcoFiltreChooserMode());
***************
*** 623,626 ****
--- 626,652 ----
menu.add(mEnr);
menu.show(_c, _x, _y);
+ }
+ JTextField txtFind_;
+ public void activeFind() {
+ if (txtFind_ == null) {
+ JComponent leftCp= getLeftComponent();
+ int n= leftCp.getComponentCount();
+ for (int i= 0; i < n; i++) {
+ if ("pnFind".equals(leftCp.getComponent(i).getName())) {
+ JPanel pn= (JPanel)leftCp.getComponent(i);
+ n= pn.getComponentCount();
+ for (int j= 0; j < n; j++) {
+ if ("txtFind".equals(pn.getComponent(j).getName())) {
+ txtFind_= (JTextField)pn.getComponent(j);
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+ if (txtFind_ != null) {
+ txtFind_.requestFocus();
+ }
}
/**
Index: FDicoEntiteTableModel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoEntiteTableModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FDicoEntiteTableModel.java 25 Nov 2003 10:13:40 -0000 1.6
--- FDicoEntiteTableModel.java 11 Dec 2003 12:50:54 -0000 1.7
***************
*** 83,86 ****
--- 83,88 ----
projet_.getDicoParams().removeValues(_ents, _max);
else {
+ //DEBUG TO REMOVE
+ System.out.println("yes");
cmdMng_.addCmd(
projet_.getDicoParams().removeValuesAndGenerateCommand(_ents, _max));
***************
*** 296,300 ****
}
}
! public void dicoParamsStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
if (projet_.getDicoParams() == projet_) {
int index= entitesViewed_.indexOf(_ent);
--- 298,302 ----
}
}
! public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
if (projet_.getDicoParams() == projet_) {
int index= entitesViewed_.indexOf(_ent);
Index: FDicoFilleProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFilleProjet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FDicoFilleProjet.java 25 Nov 2003 10:13:40 -0000 1.10
--- FDicoFilleProjet.java 11 Dec 2003 12:50:54 -0000 1.11
***************
*** 17,20 ****
--- 17,21 ----
import com.memoire.bu.BuInternalFrame;
import com.memoire.bu.BuResource;
+ import com.memoire.bu.BuSelectFindReplaceInterface;
import com.memoire.bu.BuTabbedPane;
import com.memoire.bu.BuUndoRedoInterface;
***************
*** 29,37 ****
* @version $Id$
*/
! public class FDicoFilleProjet extends FudaaUndoPaneFille {
protected JComponent[] specificTools_;
private FDicoProjet projet_;
BuCommonImplementation impl_;
- FudaaUndoCmdMngListener listener_;
public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) {
super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener());
--- 30,40 ----
* @version $Id$
*/
! public class FDicoFilleProjet
! extends FudaaUndoPaneFille
! implements BuSelectFindReplaceInterface {
protected JComponent[] specificTools_;
private FDicoProjet projet_;
+ private FDicoEntitePanel pnEnt_;
BuCommonImplementation impl_;
public FDicoFilleProjet(FDicoProjet _proj, FudaaCommonImplementation _impl) {
super(_proj.getTitle(), true, true, true, true, _impl.getUndoCmdListener());
***************
*** 42,56 ****
null,
projPane,
! FDicoResource.getS("Les fichiers du projet"));
! if (listener_ != null)
! listener_.add(projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! if (listener_ != null)
! listener_.add(cmd);
super.addTab(
FDicoResource.getS("Mot-clés"),
null,
! new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd)),
! FDicoResource.getS("Mot-clés"));
projet_= _proj;
}
--- 45,58 ----
null,
projPane,
! FDicoResource.getS("Les fichiers du projet"),
! projPane.getCmdMng());
DodicoCommandManager cmd= new DodicoCommandManager();
! pnEnt_= new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd));
super.addTab(
FDicoResource.getS("Mot-clés"),
null,
! pnEnt_,
! FDicoResource.getS("Mot-clés"),
! cmd);
projet_= _proj;
}
***************
*** 111,113 ****
--- 113,148 ----
}
}
+ /**
+ *
+ */
+ public void find() {
+ if (getSelectedComponent() == pnEnt_) {
+ pnEnt_.activeFind();
+ }
+ }
+ /**
+ *
+ */
+ public void replace() {}
+ /**
+ *
+ */
+ public void select() {}
+ /**
+ *
+ */
+ public void setSelected(boolean b) throws PropertyVetoException {
+ super.setSelected(b);
+ if(impl_!=null)
+ impl_.setEnabledForAction("RECHERCHER",b && (pnEnt_!=null) && (getSelectedComponent() == pnEnt_));
+ }
+ /**
+ *
+ */
+ public void stateChanged(ChangeEvent e) {
+ super.stateChanged(e);
+ if(impl_!=null)
+ impl_.setEnabledForAction("RECHERCHER", (pnEnt_!=null) && (getSelectedComponent() == pnEnt_));
+ }
+
}
Index: FDicoFiltreChooserName.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreChooserName.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FDicoFiltreChooserName.java 25 Nov 2003 10:13:40 -0000 1.3
--- FDicoFiltreChooserName.java 11 Dec 2003 12:50:54 -0000 1.4
***************
*** 83,86 ****
--- 83,89 ----
public JPanel buildPanel(Font _f, ListCellRenderer _r) {
BuPanel r= new BuPanel();
+ //this name is important. It is used to search the text field "txtFind" : for the
+ //"find" action
+ r.setName("pnFind");
r.setLayout(new BuGridLayout(2));
r.setBorder(
***************
*** 96,99 ****
--- 99,103 ----
});
final FiltreTextField t= new FiltreTextField();
+ t.setName("txtFind");
if (filtre_ != null)
t.setText(filtre_);
Index: FDicoFiltreController.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoFiltreController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FDicoFiltreController.java 25 Nov 2003 10:13:40 -0000 1.7
--- FDicoFiltreController.java 11 Dec 2003 12:50:54 -0000 1.8
***************
*** 64,67 ****
--- 64,68 ----
listener_= _l;
}
+
public void add(FDicoFiltreChooserAbstract _f) {
synchronized (filtreChoosers_) {
***************
*** 92,95 ****
--- 93,98 ----
}
}
+
+
public JPanel buildPanel() {
JPanel r= new BuPanel();
Index: FDicoMultiEntiteViewer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoMultiEntiteViewer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FDicoMultiEntiteViewer.java 25 Nov 2003 10:13:40 -0000 1.5
--- FDicoMultiEntiteViewer.java 11 Dec 2003 12:50:54 -0000 1.6
***************
*** 100,103 ****
--- 100,105 ----
}
public void setVecteurEntite(DicoEntite.Vecteur _v) {
+ if(_v.getNbElemFixed()>=0) setEntite(_v,_v.getNbElemFixed());
+ else
setEntite(_v, -1);
}
Index: FDicoParams.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoParams.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FDicoParams.java 25 Nov 2003 10:13:40 -0000 1.13
--- FDicoParams.java 11 Dec 2003 12:50:54 -0000 1.14
***************
*** 54,57 ****
--- 54,58 ----
protected DicoParams dicoParams_;
protected FudaaUI ui_;
+ private boolean isValide_;
//private List newEntiteFileToSave_;
/**
***************
*** 64,71 ****
--- 65,80 ----
fileLastModified_= _file.lastModified();
ui_= _ui;
+ manageName();
}
public final DicoParams getDicoParams() {
return dicoParams_;
}
+ private final void manageName() {
+ if (casFileName_.indexOf(' ') >= 0) {
+ ui_.message("Le nom du fichier ne doit pas comporter d'espace");
+ isValide_= false;
+ } else
+ isValide_= true;
+ }
/**
* Use this method to add a new entiteFile that will be save.
***************
*** 105,109 ****
File _f,
ProgressionInterface _interface) {
! System.err.println(
"had to save " + _entFile.getNom() + " in " + _f.getAbsolutePath());
return false;
--- 114,118 ----
File _f,
ProgressionInterface _interface) {
! FudaaLib.error(
"had to save " + _entFile.getNom() + " in " + _f.getAbsolutePath());
return false;
***************
*** 285,289 ****
}
}
! public void dicoParamsStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
--- 294,298 ----
}
}
! public void dicoParamsValidStateEntiteUpdated(
DicoParams _cas,
DicoEntite _ent) {
***************
*** 309,315 ****
entites_.remove(_ent);
fireTableDataChanged();
- System.out.println("taille ent remove " + entites_.size());
}
- System.out.println("taille ent " + entites_.size());
}
/**
--- 318,322 ----
***************
*** 358,361 ****
--- 365,380 ----
*/
public void dicoParamsProjectModifyStateChanged(DicoParams _cas) {}
+ /**
+ *
+ */
+ public void remove(int[] _row) {
+ if ((_row != null) && (_row.length > 0)) {
+ DicoEntite[] es= new DicoEntite[_row.length];
+ for (int i= _row.length - 1; i >= 0; i--) {
+ es[i]= getEntite(_row[i]);
+ }
+ cmdMng_.addCmd(dicoParams_.removeValuesAndGenerateCommand(es));
+ }
+ }
}
/**
***************
*** 417,421 ****
|| ((f.lastModified()
!= state.getFileLastTimeModifiedWhenLoad()))) {
! dicoParams_.setModified(ent, true);
if (f.exists()) {
if (FudaaLib.DEBUG)
--- 436,440 ----
|| ((f.lastModified()
!= state.getFileLastTimeModifiedWhenLoad()))) {
! dicoParams_.setLoadedModified(ent, true);
if (f.exists()) {
if (FudaaLib.DEBUG)
***************
*** 480,484 ****
}
}
! private Map computeNewEntiteFileToSave(DicoEntite[] _ent) {
if (_ent == null)
return null;
--- 499,503 ----
}
}
! private final Map computeNewEntiteFileToSave(DicoEntite[] _ent) {
if (_ent == null)
return null;
***************
*** 513,516 ****
--- 532,536 ----
dirBase_= _n.getParentFile();
casFileName_= _n.getName();
+ manageName();
fileLastModified_= _n.lastModified();
dicoParams_.clearModified();
***************
*** 556,560 ****
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
} else {
! if (_initFile.exists()) {
if (FudaaLib.DEBUG)
FudaaLib.debug(
--- 576,580 ----
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
} else {
! if ((_initFile != null) && _initFile.exists()) {
if (FudaaLib.DEBUG)
FudaaLib.debug(
***************
*** 565,572 ****
return DodicoLib.copyFile(_initFile, _destFile);
} else {
! System.out.println(
_ent.getNom()
+ " file "
! + _initFile.getAbsolutePath()
+ " unknown source");
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
--- 585,592 ----
return DodicoLib.copyFile(_initFile, _destFile);
} else {
! FudaaLib.error(
_ent.getNom()
+ " file "
! + (_initFile == null ? "?" : _initFile.getAbsolutePath())
+ " unknown source");
return saveDicoEntiteFileAction(_ent, _destFile, _progress);
***************
*** 610,614 ****
}
Iterator fileIt= dicoParams_.getDicoEntiteFileEnum();
! for (int i= n; i > 0; i--) {
entFile[i]= (DicoEntite)fileIt.next();
initFile[i]=
--- 630,634 ----
}
Iterator fileIt= dicoParams_.getDicoEntiteFileEnum();
! for (int i= n - 1; i >= 0; i--) {
entFile[i]= (DicoEntite)fileIt.next();
initFile[i]=
***************
*** 697,701 ****
}
}
! } //new File save and update this dico if needed.
if (newFile != null) {
n= newFile.length;
--- 717,722 ----
}
}
! }
! //new File save and update this dico if needed.
if (newFile != null) {
n= newFile.length;
***************
*** 705,713 ****
if (_saveIn) {
dicoParams_.setValue(
! entFile[i],
! (String)modifiedEntite.get(entFile[i]));
if ((dicoParams_.isLoaded(newEntite[i])) && (er)) {
dicoParams_.setLoaded(newEntite[i], newFile[i], false);
}
}
}
--- 726,735 ----
if (_saveIn) {
dicoParams_.setValue(
! newEntite[i],
! (String)modifiedEntite.get(newEntite[i]));
if ((dicoParams_.isLoaded(newEntite[i])) && (er)) {
dicoParams_.setLoaded(newEntite[i], newFile[i], false);
}
+ dicoParams_.clearModified();
}
}
***************
*** 718,733 ****
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
--- 740,755 ----
}
} /**
! *
! */
public String getCasFileName() {
return casFileName_;
} /**
! *
! */
public long getCasFileTimeLoaded() {
return fileLastModified_;
} /**
! *
! */
public File getDirBase() {
return dirBase_;
***************
*** 736,768 ****
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
--- 758,790 ----
return dicoParams_.getDicoFileFormatVersion();
} /**
! *
! */
public FudaaUI getUI() {
return ui_;
} /**
! *
! */ /**
! *
! */
public String canUpdate(DicoEntite _ent) {
return dicoParams_.canUpdate(_ent);
} /**
! *
! */
public boolean contains(DicoEntite _ent) {
return dicoParams_.contains(_ent);
} /**
! *
! */
public Set getAllEntiteWithValuesSet() {
return dicoParams_.getAllEntiteWithValuesSet();
} /**
! *
! */
public DicoModelAbstract getDico() {
return dicoParams_.getDico();
} /**
! *
! */
public DicoCasInterface getDicoCasInterface() {
return dicoParams_.getDicoCasInterface();
***************
*** 771,836 ****
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
! return dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
--- 793,858 ----
return dicoParams_.getEntiteFileNb();
} /**
! *
! */
public Map getEntiteValues() {
return dicoParams_.getEntiteValues();
} /**
! *
! */
public void getEntiteValues(Map _m) {
dicoParams_.getEntiteValues(_m);
} /**
! *
! */
public String getTitle() {
return dicoParams_.getTitle();
} /**
! *
! */
public String getValue(DicoEntite _e) {
return dicoParams_.getValue(_e);
} /**
! *
! */
public int getValuesSize() {
return dicoParams_.getValuesSize();
} /**
! *
! */
public boolean isValide() {
! return isValide_ && dicoParams_.isValide();
} /**
! *
! */
public boolean isValueSetFor(DicoEntite _ent) {
return dicoParams_.isValueSetFor(_ent);
} /**
! *
! */
public boolean isValueValideFor(DicoEntite _ent) {
return dicoParams_.isValueValideFor(_ent);
} /**
! *
! */
public void removeModelListener(DicoParamsListener _l) {
dicoParams_.removeModelListener(_l);
} /**
! *
! */
public void removeValue(DicoEntite _ent) {
dicoParams_.removeValue(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent) {
dicoParams_.removeValues(_ent);
} /**
! *
! */
public void removeValues(DicoEntite[] _ent, int _max) {
dicoParams_.removeValues(_ent, _max);
} /**
! *
! */
public void setValue(DicoEntite _ent, String _value) {
dicoParams_.setValue(_ent, _value);
Index: FDicoProjectPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjectPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjectPanel.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjectPanel.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 15,22 ****
--- 15,28 ----
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.text.DateFormat;
import java.util.Date;
+
+ import javax.swing.AbstractAction;
+ import javax.swing.Action;
+ import javax.swing.BorderFactory;
+ import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
***************
*** 24,34 ****
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
- import com.memoire.bu.BuLib;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPanel;
--- 30,45 ----
import javax.swing.JTable;
import javax.swing.JTextField;
+ import javax.swing.KeyStroke;
+ import javax.swing.event.ListSelectionEvent;
+ import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+
import com.memoire.bu.BuBorderLayout;
+ import com.memoire.bu.BuButton;
import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuPanel;
***************
*** 38,41 ****
--- 49,54 ----
import com.memoire.bu.BuTable;
import com.memoire.bu.BuTextField;
+ import com.memoire.bu.BuVerticalLayout;
+
import org.fudaa.dodico.commun.DodicoCommandManager;
import org.fudaa.dodico.commun.DodicoLib;
***************
*** 43,48 ****
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.dico.DicoParamsListener;
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
! import org.fudaa.fudaa.commun.undo.*;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
--- 56,63 ----
import org.fudaa.dodico.dico.DicoParams;
import org.fudaa.dodico.dico.DicoParamsListener;
+
import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
!
! import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
***************
*** 52,56 ****
public class FDicoProjectPanel
extends BuPanel
! implements ActionListener, MouseListener, DicoParamsListener, FudaaUndoCmdMngContainer {
BuTable table_;
FDicoEntiteFileTableModelInterface model_;
--- 67,71 ----
public class FDicoProjectPanel
extends BuPanel
! implements ActionListener, MouseListener, DicoParamsListener, FudaaUndoCmdMngContainer,ListSelectionListener {
BuTable table_;
FDicoEntiteFileTableModelInterface model_;
***************
*** 64,67 ****
--- 79,84 ----
JLabel lbModifie_;
JLabel lbDate_;
+ Action actionDefaultSelected_;
+ Action actionEditerSelected_;
/**
*
***************
*** 77,81 ****
--- 94,100 ----
table_= new BuTable(model_);
table_.addMouseListener(this);
+ table_.getSelectionModel().addListSelectionListener(this);
setLayout(new BuBorderLayout(5, 5));
+ setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
TableColumnModel columnModel= table_.getColumnModel();
***************
*** 122,125 ****
--- 141,169 ----
updateErreur();
updateSaveState();
+ buildAction();
+ BuPanel p= new BuPanel();
+ p.setLayout(new BuVerticalLayout(5,false,false));
+ BuButton bt= new BuButton();
+ bt.setAction(actionEditerSelected_);
+ bt.setText(DodicoLib.EMPTY_STRING);
+ p.add(bt);
+ bt= new BuButton();
+ bt.setAction(actionDefaultSelected_);
+ bt.setText(DodicoLib.EMPTY_STRING);
+ p.add(bt);
+ add(p,BuBorderLayout.EAST);
+ InputMap thisMap=
+ getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK),
+ "INITIALISER");
+ getActionMap().put("INITIALISER", actionDefaultSelected_);
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK),
+ "EDITER");
+ thisMap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, KeyEvent.KEY_TYPED),
+ "EDITER");
+ getActionMap().put("EDITER", actionEditerSelected_);
}
private void updateErreur() {
***************
*** 145,148 ****
--- 189,221 ----
new Date(proj_.getFDicoParams().fileLastModified_)));
}
+ private void buildAction() {
+ actionDefaultSelected_=
+ new AbstractAction(
+ FudaaResource.getS("Initialiser"),
+ BuResource.BU.getIcon("annuler")) {
+ public void actionPerformed(ActionEvent _ae) {
+ model_.remove(table_.getSelectedRows());
+ }
+ };
+ actionEditerSelected_=
+ new AbstractAction(
+ BuResource.BU.getString("Editer"),
+ BuResource.BU.getIcon("editer")) {
+ public void actionPerformed(ActionEvent _ae) {
+ int i= table_.getSelectedRow();
+ if (i >= 0)
+ table_.editCellAt(i, 2);
+ fileEditor.doClick();
+ }
+ };
+ actionDefaultSelected_.setEnabled(false);
+ actionDefaultSelected_.putValue(
+ Action.SHORT_DESCRIPTION,
+ FDicoResource.getS("Initialiser les mot-clés sélectionnés"));
+ actionEditerSelected_.setEnabled(false);
+ actionEditerSelected_.putValue(
+ Action.SHORT_DESCRIPTION,
+ BuResource.BU.getString("Editer"));
+ }
public void actionPerformed(ActionEvent _evt) {
if (_evt.getSource() == txtName_) {
***************
*** 372,376 ****
*
*/
! public void dicoParamsStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
updateErreur();
}
--- 445,449 ----
*
*/
! public void dicoParamsValidStateEntiteUpdated(DicoParams _cas, DicoEntite _ent) {
updateErreur();
}
***************
*** 383,385 ****
--- 456,468 ----
updateSaveState();
}
+ /**
+ *
+ */
+ public void valueChanged(ListSelectionEvent e) {
+ boolean b=!table_.getSelectionModel().isSelectionEmpty();
+ actionDefaultSelected_.setEnabled(b);
+ actionEditerSelected_.setEnabled(b);
+
+ }
+
}
Index: FDicoProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjet.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjet.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 66,69 ****
--- 66,70 ----
actions_.setEnableCalcul(isValide());
}
+
/**
*
***************
*** 186,194 ****
}
public void close() {
! entiteFille_.setVisible(false);
getImpl().removeInternalFrame(entiteFille_);
entiteFille_.dispose();
entiteFille_= null;
! // getImpl().closeProjet(this);
}
/**
--- 187,196 ----
}
public void close() {
! if(entiteFille_!=null) {
! entiteFille_.setVisible(false);
getImpl().removeInternalFrame(entiteFille_);
entiteFille_.dispose();
entiteFille_= null;
! }
}
/**
Index: FDicoProjetInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico/FDicoProjetInterface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FDicoProjetInterface.java 25 Nov 2003 10:13:41 -0000 1.8
--- FDicoProjetInterface.java 11 Dec 2003 12:50:54 -0000 1.9
***************
*** 8,11 ****
--- 8,12 ----
*/
package org.fudaa.fudaa.dico;
+ import java.awt.Frame;
import java.io.File;
import org.fudaa.dodico.commun.ProgressionInterface;
***************
*** 22,25 ****
--- 23,27 ----
public String getTitle();
public DicoParams getDicoParams();
+ public FudaaCommonImplementation getImpl();
public File getParamsFile();
public File getDirBase();
|
|
From: <de...@us...> - 2003-12-11 12:51:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/diapre
Modified Files:
DiapreDiagrammePression.java DiapreGrapheResultats.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: DiapreDiagrammePression.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreDiagrammePression.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DiapreDiagrammePression.java 25 Nov 2003 10:13:38 -0000 1.4
--- DiapreDiagrammePression.java 11 Dec 2003 12:50:54 -0000 1.5
***************
*** 42,48 ****
private Axe axeX_;
private Axe axeY_;
! private Courbe courbe_; // pression totale
! private Courbe courbeE_; // pression effective
! private Courbe courbeI_; // pression interstitielle
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
--- 42,48 ----
private Axe axeX_;
private Axe axeY_;
! private CourbeDefault courbe_; // pression totale
! private CourbeDefault courbeE_; // pression effective
! private CourbeDefault courbeI_; // pression interstitielle
private Color[] col=
{ Color.black, Color.blue, Color.green, Color.orange, Color.pink };
***************
*** 109,115 ****
graphe_.ajoute(axeX);
graphe_.ajoute(axeY);
! courbe_= new Courbe();
! courbeE_= new Courbe();
! courbeI_= new Courbe();
courbe_.titre= "Pression totale";
if (valeursX_[3][1] == 1) {
--- 109,115 ----
graphe_.ajoute(axeX);
graphe_.ajoute(axeY);
! courbe_= new CourbeDefault();
! courbeE_= new CourbeDefault();
! courbeI_= new CourbeDefault();
courbe_.titre= "Pression totale";
if (valeursX_[3][1] == 1) {
Index: DiapreGrapheResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreGrapheResultats.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DiapreGrapheResultats.java 25 Nov 2003 10:13:38 -0000 1.4
--- DiapreGrapheResultats.java 11 Dec 2003 12:50:54 -0000 1.5
***************
*** 34,38 ****
private Axe axeX_;
private Axe axeY_;
! private Courbe courbe_;
boolean surchargeUniforme_;
double[] surchargeUniformeF_;
--- 34,38 ----
private Axe axeX_;
private Axe axeY_;
! private CourbeDefault courbe_;
boolean surchargeUniforme_;
double[] surchargeUniformeF_;
***************
*** 128,132 ****
Valeur v= new Valeur();
//talus et rideau
! courbe_= new Courbe();
courbe_.marqueurs= false;
Aspect asp= new Aspect();
--- 128,132 ----
Valeur v= new Valeur();
//talus et rideau
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
Aspect asp= new Aspect();
***************
*** 150,154 ****
int nbCoucheSol= valeursX_.length - 2;
for (int u= 0; u < nbCoucheSol; u++) {
! courbe_= new Courbe();
courbe_.marqueurs= false;
courbe_.aspect= asp;
--- 150,154 ----
int nbCoucheSol= valeursX_.length - 2;
for (int u= 0; u < nbCoucheSol; u++) {
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
courbe_.aspect= asp;
***************
*** 170,174 ****
}
//eau
! courbe_= new Courbe();
courbe_.marqueurs= false;
asp= new Aspect();
--- 170,174 ----
}
//eau
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
asp= new Aspect();
***************
*** 266,270 ****
valF[3][1]= valF[0][1] + (pasY / 2) * Math.sin(angle - Math.PI / 6);
for (int f= 1; f < 4; f++) {
! courbe_= new Courbe();
courbe_.marqueurs= false;
courbe_.aspect= asp;
--- 266,270 ----
valF[3][1]= valF[0][1] + (pasY / 2) * Math.sin(angle - Math.PI / 6);
for (int f= 1; f < 4; f++) {
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
courbe_.aspect= asp;
***************
*** 286,290 ****
}
//construction de la forme generale de la surcharge
! courbe_= new Courbe();
courbe_.marqueurs= false;
courbe_.titre= "Surcharge uniforme";
--- 286,290 ----
}
//construction de la forme generale de la surcharge
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
courbe_.titre= "Surcharge uniforme";
***************
*** 361,365 ****
valF[3][1]= valF[0][1] + (axeY_.pas / 4) * Math.sin(angle - Math.PI / 6);
for (int f= 1; f < 4; f++) {
! courbe_= new Courbe();
courbe_.marqueurs= false;
courbe_.aspect= asp;
--- 361,365 ----
valF[3][1]= valF[0][1] + (axeY_.pas / 4) * Math.sin(angle - Math.PI / 6);
for (int f= 1; f < 4; f++) {
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
courbe_.aspect= asp;
***************
*** 392,396 ****
Vector valcourbe;
Valeur v;
! Courbe courbe_;
boolean blocus2= true;
double m, p;
--- 392,396 ----
Vector valcourbe;
Valeur v;
! CourbeDefault courbe_;
boolean blocus2= true;
double m, p;
***************
*** 502,506 ****
h++;
for (int f= 1; f < 4; f++) {
! courbe_= new Courbe();
courbe_.marqueurs= false;
courbe_.aspect= asp;
--- 502,506 ----
h++;
for (int f= 1; f < 4; f++) {
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
courbe_.aspect= asp;
***************
*** 522,526 ****
}
//construction de la forme generale de la surcharge
! courbe_= new Courbe();
courbe_.marqueurs= false;
if (blocus2) {
--- 522,526 ----
}
//construction de la forme generale de la surcharge
! courbe_= new CourbeDefault();
courbe_.marqueurs= false;
if (blocus2) {
|
|
From: <de...@us...> - 2003-12-11 12:51:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun/undo
Modified Files:
FudaaUndoPaneFille.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FudaaUndoPaneFille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoPaneFille.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FudaaUndoPaneFille.java 25 Nov 2003 10:13:36 -0000 1.2
--- FudaaUndoPaneFille.java 11 Dec 2003 12:50:53 -0000 1.3
***************
*** 30,34 ****
*/
public FudaaUndoPaneFille(FudaaUndoCmdMngListener _l) {
! initPane(_l);
}
/**
--- 30,37 ----
*/
public FudaaUndoPaneFille(FudaaUndoCmdMngListener _l) {
! pane_= new BuTabbedPane();
! listener= _l;
! setContentPane(pane_);
! pane_.getModel().addChangeListener(this);
}
/**
***************
*** 47,53 ****
FudaaUndoCmdMngListener _l) {
super(_title, _resizable, _closable, _maximizable, _iconifiable);
- initPane(_l);
- }
- private void initPane(FudaaUndoCmdMngListener _l) {
pane_= new BuTabbedPane();
listener= _l;
--- 50,53 ----
***************
*** 59,67 ****
Icon icon,
Component c,
! String tooltip) {
pane_.addTab(title, icon, c, tooltip);
}
protected Component getSelectedComponent() {
! return pane_.getSelectedComponent();
}
protected DodicoCommandManager getActiveCmdMng() {
--- 59,70 ----
Icon icon,
Component c,
! String tooltip,
! DodicoCommandManager _mng) {
pane_.addTab(title, icon, c, tooltip);
+ if (_mng != null)
+ listener.add(_mng);
}
protected Component getSelectedComponent() {
! return pane_==null?null:pane_.getSelectedComponent();
}
protected DodicoCommandManager getActiveCmdMng() {
|
|
From: <de...@us...> - 2003-12-11 12:51:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun/tableau
Modified Files:
FudaaPanelListEditor.java FudaaPanelListEditorModel.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FudaaPanelListEditor.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau/FudaaPanelListEditor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaPanelListEditor.java 25 Nov 2003 10:13:36 -0000 1.5
--- FudaaPanelListEditor.java 11 Dec 2003 12:50:53 -0000 1.6
***************
*** 9,12 ****
--- 9,13 ----
package org.fudaa.fudaa.commun.tableau;
import java.awt.Dimension;
+ import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
***************
*** 36,39 ****
--- 37,41 ----
import com.memoire.bu.BuResource;
import com.memoire.bu.BuScrollPane;
+ import com.memoire.bu.BuSeparator;
import com.memoire.bu.BuTable;
import com.memoire.bu.BuVerticalLayout;
***************
*** 51,57 ****
--- 53,80 ----
JButton btSupprimer_;
JButton btInserer_;
+ JButton btModifier_;
+ boolean doubleClickEdit_;
public FudaaPanelListEditor(FudaaPanelListEditorModel _m) {
this(_m, true, true, true);
}
+ public void setModel(FudaaPanelListEditorModel _m) {
+ table_.setModel(_m);
+ model_= _m;
+ }
+
+ public FudaaPanelListEditorModel getTableModel(){
+ return model_;
+ }
+ public void setState(
+ boolean _ajouterAction,
+ boolean _supprimerAction,
+ boolean _insererAction) {
+ if (btAjouter_ != null)
+ btAjouter_.setEnabled(_ajouterAction);
+ if (btSupprimer_ != null)
+ btSupprimer_.setEnabled(_supprimerAction);
+ if (btInserer_ != null)
+ btInserer_.setEnabled(_insererAction);
+ }
public FudaaPanelListEditor(
FudaaPanelListEditorModel _m,
***************
*** 59,62 ****
--- 82,93 ----
boolean _supprimerAction,
boolean _insererAction) {
+ this(_m, _ajouterAction, _supprimerAction, _insererAction, false);
+ }
+ public FudaaPanelListEditor(
+ FudaaPanelListEditorModel _m,
+ boolean _ajouterAction,
+ boolean _supprimerAction,
+ boolean _insererAction,
+ boolean _modifierAction) {
model_= _m;
model_.addTableModelListener(this);
***************
*** 88,100 ****
buildInsererButton();
}
if (action) {
BuPanel pnBt= new BuPanel();
pnBt.setLayout(new BuVerticalLayout(5, true, false));
! if (btAjouter_ != null)
pnBt.add(btAjouter_);
! if (btInserer_ != null)
pnBt.add(btInserer_);
! if (btSupprimer_ != null)
pnBt.add(btSupprimer_);
table_.addMouseListener(this);
add(pnBt, BuBorderLayout.EAST);
--- 119,146 ----
buildInsererButton();
}
+ if (_modifierAction) {
+ action= true;
+ buildModifierButton();
+ }
if (action) {
BuPanel pnBt= new BuPanel();
pnBt.setLayout(new BuVerticalLayout(5, true, false));
! boolean sep=false;
! if (btAjouter_ != null){
! sep=true;
pnBt.add(btAjouter_);
! }
! if (btInserer_ != null){
! sep=true;
pnBt.add(btInserer_);
! }
! if (btSupprimer_ != null){
! sep=true;
pnBt.add(btSupprimer_);
+ }
+ if (btModifier_ != null) {
+ if(sep) pnBt.add(new BuSeparator());
+ pnBt.add(btModifier_);
+ }
table_.addMouseListener(this);
add(pnBt, BuBorderLayout.EAST);
***************
*** 116,119 ****
--- 162,179 ----
edit.stopCellEditing();
}
+ public void setState(
+ boolean _ajouterAction,
+ boolean _supprimerAction,
+ boolean _insererAction,
+ boolean _modifyAction) {
+ if (btAjouter_ != null)
+ btAjouter_.setEnabled(_ajouterAction);
+ if (btSupprimer_ != null)
+ btSupprimer_.setEnabled(_supprimerAction);
+ if (btInserer_ != null)
+ btInserer_.setEnabled(_insererAction);
+ if (btModifier_ != null)
+ btModifier_.setEnabled(_modifyAction);
+ }
public void setValueListCellRenderer(TableCellRenderer _l) {
table_
***************
*** 168,171 ****
--- 228,240 ----
KeyEvent.VK_E);
}
+ private void buildModifierButton() {
+ btModifier_=
+ buildButton(
+ BuResource.BU.getIcon("modifier"),
+ FudaaResource.FUDAA.getString("Modifier"),
+ "MODIFIER",
+ FudaaResource.getS("Modifier l'élément sélectionner"),
+ KeyEvent.VK_M);
+ }
public final ListSelectionModel getListSelectionModel() {
return table_.getSelectionModel();
***************
*** 188,191 ****
--- 257,265 ----
model_.remove(table_.getSelectionModel());
}
+ public void actionModify() {
+ if (table_.getSelectedRowCount() == 1) {
+ model_.edit(table_.getSelectedRow());
+ }
+ }
/**
*
***************
*** 214,217 ****
--- 288,293 ----
}
actionInserer();
+ } else if (com == "MODIFIER") {
+ actionModify();
}
}
***************
*** 239,242 ****
--- 315,323 ----
menu.add(initFrom(btSupprimer_));
}
+ if (btModifier_ != null) {
+ if (menu.getComponentCount() > 0)
+ menu.addSeparator();
+ menu.add(initFrom(btModifier_));
+ }
menu.addActionListener(this);
return menu;
***************
*** 262,270 ****
btSupprimer_.setEnabled(
(model_.canRemove()) && (table_.getSelectedRowCount() != 0));
}
/**
*
*/
! public void mouseClicked(MouseEvent e) {}
/**
*
--- 343,368 ----
btSupprimer_.setEnabled(
(model_.canRemove()) && (table_.getSelectedRowCount() != 0));
+ if (btModifier_ != null)
+ btModifier_.setEnabled(table_.getSelectedRowCount() == 1);
+ }
+ public void setDoubleClickEdit(boolean _b) {
+ doubleClickEdit_= _b;
}
/**
*
*/
! public void mouseClicked(MouseEvent e) {
! if (doubleClickEdit_
! && e.getClickCount() == 2
! && (table_.getSelectedRowCount() == 1)) {
! int r= table_.getSelectedRow();
! Rectangle rec= table_.getCellRect(r, 0, true);
! for (int i= table_.getColumnCount() - 1; i > 0; i--) {
! rec.width += table_.getCellRect(r, i, true).width;
! }
! if (rec.contains(e.getX(), e.getY()))
! model_.edit(table_.getSelectedRow());
! }
! }
/**
*
Index: FudaaPanelListEditorModel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/tableau/FudaaPanelListEditorModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FudaaPanelListEditorModel.java 25 Nov 2003 10:13:36 -0000 1.4
--- FudaaPanelListEditorModel.java 11 Dec 2003 12:50:53 -0000 1.5
***************
*** 24,28 ****
*/
public class FudaaPanelListEditorModel extends AbstractTableModel {
! Vector v_;
private boolean showNumber_;
private int maxValueNb_;
--- 24,28 ----
*/
public class FudaaPanelListEditorModel extends AbstractTableModel {
! protected Vector v_;
private boolean showNumber_;
private int maxValueNb_;
***************
*** 299,302 ****
--- 299,306 ----
}
return true;
+ }
+
+ public void edit(int _r){
+
}
public boolean actionInserer(int _r) {
|
|
From: <de...@us...> - 2003-12-11 12:51:26
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun/exec
Modified Files:
FudaaAppliExecManager.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FudaaAppliExecManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaAppliExecManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaAppliExecManager.java 25 Nov 2003 10:13:33 -0000 1.5
--- FudaaAppliExecManager.java 11 Dec 2003 12:50:53 -0000 1.6
***************
*** 99,103 ****
menuMod.addActionListener(FudaaAppliExecManager.this);
add(menuMod);
- addSeparator();
menuMod= new BuMenuItem(FudaaResource.getS("Modifier l'éditeur"));
menuMod.setActionCommand("MANAGER_EDITEUR");
--- 99,102 ----
|
|
From: <de...@us...> - 2003-12-11 12:51:26
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun/calcul
Modified Files:
FudaaCalculOp.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FudaaCalculOp.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaCalculOp.java 25 Nov 2003 10:13:31 -0000 1.5
--- FudaaCalculOp.java 11 Dec 2003 12:50:53 -0000 1.6
***************
*** 10,31 ****
import java.io.File;
import java.io.PrintStream;
! import javax.swing.event.ChangeEvent;
! import com.memoire.bu.BuCommonImplementation;
! import com.memoire.bu.BuMainPanel;
! import com.memoire.bu.BuProgressBar;
! import com.memoire.bu.BuResource;
! import com.memoire.bu.BuTask;
import com.memoire.bu.BuTaskOperation;
import org.fudaa.dodico.calcul.CalculExec;
- import org.fudaa.dodico.calcul.CalculLauncher;
import org.fudaa.dodico.calcul.CalculLauncherAbstract;
- import org.fudaa.dodico.calcul.CalculLauncherExe;
import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.DodicoUI;
- import org.fudaa.dodico.commun.ProgressionBuAdapter;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.objet.CExecListener;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaUI;
import org.fudaa.fudaa.ressource.FudaaResource;
--- 10,24 ----
import java.io.File;
import java.io.PrintStream;
! import java.util.Timer;
! import java.util.TimerTask;
!
import com.memoire.bu.BuTaskOperation;
+
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculLauncherAbstract;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.ProgressionInterface;
import org.fudaa.dodico.objet.CExecListener;
!
import org.fudaa.fudaa.commun.FudaaUI;
import org.fudaa.fudaa.ressource.FudaaResource;
***************
*** 38,42 ****
implements CExecListener {
FudaaUI impl_;
! CalculExec exe_;
boolean isFinished_;
boolean stop_;
--- 31,35 ----
implements CExecListener {
FudaaUI impl_;
! protected CalculExec exe_;
boolean isFinished_;
boolean stop_;
***************
*** 86,100 ****
exe_.setUI(impl_);
exe_.setProgression(_progress);
! exe_.launch(f, manageArgs(), this);
! setEtat("Fin du calcul", 90);
! impl_.message(
! FudaaResource.getS("Calcul"),
! FudaaResource.getS("Le calcul est terminé"));
! initEtat();
isFinished_= true;
}
! public String[] manageArgs() {
! return args_;
! }
/**
*
--- 79,97 ----
exe_.setUI(impl_);
exe_.setProgression(_progress);
! exe_.launch(f, this);
! actionToDoJustAfterLaunching();
! setEtat(
! FudaaResource.getS("Le calcul est terminé:")
! + DodicoLib.LINE_SEP
! + f.getAbsolutePath(),
! 100);
! new Timer().schedule(new TimerTask() {
! public void run() {
! initEtat();
! }
! }, 2 * 1000);
isFinished_= true;
}
! public void actionToDoJustAfterLaunching() {}
/**
*
|
|
From: <de...@us...> - 2003-12-11 12:51:26
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun
Modified Files:
FudaaCommonImplementation.java FudaaEditeurRapport.java
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe
Index: FudaaCommonImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FudaaCommonImplementation.java 25 Nov 2003 10:13:27 -0000 1.11
--- FudaaCommonImplementation.java 11 Dec 2003 12:50:53 -0000 1.12
***************
*** 405,411 ****
*/
public ProgressionInterface createProgressionInterface(BuTask _bu) {
- _bu.setTaskView(getMainPanel().getTaskView());
return new ProgressionBuAdapter(_bu);
}
/**
*
--- 405,419 ----
*/
public ProgressionInterface createProgressionInterface(BuTask _bu) {
return new ProgressionBuAdapter(_bu);
}
+
+ public void initTaskView(BuTask _bu){
+ _bu.setTaskView(getMainPanel().getTaskView());
+ }
+
+ public void clearTaskView(BuTask _bu){
+ getMainPanel().getTaskView().removeTask(_bu);
+ }
+
/**
*
***************
*** 416,419 ****
--- 424,428 ----
public void unsetMainMessage() {
getMainPanel().setMessage(DodicoLib.EMPTY_STRING);
+ getMainPanel().setProgression(0);
}
public void setMainProgression(int _i) {
Index: FudaaEditeurRapport.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaEditeurRapport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FudaaEditeurRapport.java 2 Dec 2003 19:54:40 -0000 1.7
--- FudaaEditeurRapport.java 11 Dec 2003 12:50:53 -0000 1.8
***************
*** 178,181 ****
--- 178,182 ----
} catch (BadLocationException ex) {}
}
+
public String getSource() {
if (type == RTF)
***************
*** 200,251 ****
}
}
- /*
- lass OuvrirAction extends AbstractAction {
- String url;
- JTextPane textPane;
- public OuvrirAction(JTextPane jtp, String url) {
- // on donne ici le nom de l'action
- // on peut le recuperer avec un getValue(Action.NAME)
- // utilise plus haut dans :
- // ouvrirItem.addActionListener( (Action) commandes.get("ouvrir") );
- super("ouvrir");
- this.url = url;
- this.textPane = jtp;
- }
- public void actionPerformed(ActionEvent e) {
- // affichage de la page (url) demandee
- try {
- textPane.setPage(url);
- }
- catch(java.io.IOException ioe) {
- ioe.printStackTrace(System.err);
- }
- }
-
- lass SauvegarderAction extends AbstractAction {
- String file;
- JTextPane textPane;
- public SauvegarderAction(JTextPane jtp, String f) {
- super("sauvegarder");
- this.file = f;
- this.textPane = jtp;
- }
- public void actionPerformed(ActionEvent e) {
- // ceci sauvegarde le texte modifie au format HTML (ouf!)
- File f = new File(file);
- EditorKit kit = textPane.getEditorKit();
- Document doc = textPane.getDocument();
- try {
- FileWriter out = new FileWriter(file);
- kit.write(out, doc, 0, doc.getLength());
- }
- catch(IOException ioe) {
- ioe.printStackTrace();
- }
- catch(BadLocationException ble) {
- ble.printStackTrace();
- }
- }
-
- */
--- 201,203 ----
|
