Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/commun DodicoAnalyze.java,1.9,1.10 DodicoDoubleDoubleSortedList.java,1.5,1.6 DodicoLib.java,1.19,1.20 DodicoUIDefault.java,1.3,1.4
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/commun
Modified Files:
DodicoAnalyze.java DodicoDoubleDoubleSortedList.java
DodicoLib.java DodicoUIDefault.java
Log Message:
Maj general (CtuluLib)
Index: DodicoAnalyze.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoAnalyze.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DodicoAnalyze.java 25 Nov 2003 10:11:25 -0000 1.9
--- DodicoAnalyze.java 12 Dec 2003 10:30:52 -0000 1.10
***************
*** 13,16 ****
--- 13,19 ----
import java.util.ArrayList;
import java.util.Collection;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import org.fudaa.dodico.fortran.FortranReader;
/**
***************
*** 57,61 ****
public static String getResume(DodicoAnalyze[] _analyzes) {
if (_analyzes == null)
! return DodicoLib.EMPTY_STRING;
int n= _analyzes.length;
StringBuffer b= new StringBuffer();
--- 60,64 ----
public static String getResume(DodicoAnalyze[] _analyzes) {
if (_analyzes == null)
! return CtuluLib.EMPTY_STRING;
int n= _analyzes.length;
StringBuffer b= new StringBuffer();
***************
*** 65,70 ****
if (an != null) {
if (i != 0)
! b.append(DodicoLib.SEP_LINE);
! b.append(an.getDesc()).append(DodicoLib.SEP_LINE);
b.append(an.getResume());
}
--- 68,73 ----
if (an != null) {
if (i != 0)
! b.append(CtuluLib.SEP_LINE);
! b.append(an.getDesc()).append(CtuluLib.SEP_LINE);
b.append(an.getResume());
}
***************
*** 76,80 ****
}
public String getResume() {
! return getResume(DodicoLib.EMPTY_STRING);
}
/**
--- 79,83 ----
}
public String getResume() {
! return getResume(CtuluLib.EMPTY_STRING);
}
/**
***************
*** 82,116 ****
*/
public String getResume(String _prefix) {
! String prefix= _prefix == null ? DodicoLib.EMPTY_STRING : _prefix;
StringBuffer s=
new StringBuffer(
prefix
! + (desc_ == null ? DodicoLib.EMPTY_STRING : desc_)
! + DodicoLib.LINE_SEP);
! prefix += DodicoLib.ESPACE + DodicoLib.ESPACE;
if (ressource_ != null)
s.append(
prefix
+ DodicoResource.getS("Ressource")
! + DodicoLib.ESPACE
+ ressource_
! + DodicoLib.LINE_SEP);
if (fatalError_ != null) {
s.append(
! DodicoLib.LINE_SEP + prefix + DodicoResource.getS("Erreur fatale"));
if (fatalError_.getOffset() >= 0)
! s.append(DodicoLib.LINE_SEP + prefix + fatalError_.toString());
else
! s.append(DodicoLib.LINE_SEP + prefix + fatalError_.getMessage());
}
! s.append(DodicoLib.LINE_SEP);
boolean b= getResume(s, DodicoResource.getS("Erreurs"), errors_, prefix);
if (b)
! s.append(DodicoLib.LINE_SEP);
b= getResume(s, DodicoResource.getS("Avertissements"), warns_, prefix);
if (b)
! s.append(DodicoLib.LINE_SEP);
getResume(s, DodicoResource.getS("Informations"), infos_, prefix);
! s.append(DodicoLib.LINE_SEP);
return s.toString();
}
--- 85,119 ----
*/
public String getResume(String _prefix) {
! String prefix= _prefix == null ? CtuluLib.EMPTY_STRING : _prefix;
StringBuffer s=
new StringBuffer(
prefix
! + (desc_ == null ? CtuluLib.EMPTY_STRING : desc_)
! + CtuluLib.LINE_SEP);
! prefix += CtuluLib.ESPACE + CtuluLib.ESPACE;
if (ressource_ != null)
s.append(
prefix
+ DodicoResource.getS("Ressource")
! + CtuluLib.ESPACE
+ ressource_
! + CtuluLib.LINE_SEP);
if (fatalError_ != null) {
s.append(
! CtuluLib.LINE_SEP + prefix + DodicoResource.getS("Erreur fatale"));
if (fatalError_.getOffset() >= 0)
! s.append(CtuluLib.LINE_SEP + prefix + fatalError_.toString());
else
! s.append(CtuluLib.LINE_SEP + prefix + fatalError_.getMessage());
}
! s.append(CtuluLib.LINE_SEP);
boolean b= getResume(s, DodicoResource.getS("Erreurs"), errors_, prefix);
if (b)
! s.append(CtuluLib.LINE_SEP);
b= getResume(s, DodicoResource.getS("Avertissements"), warns_, prefix);
if (b)
! s.append(CtuluLib.LINE_SEP);
getResume(s, DodicoResource.getS("Informations"), infos_, prefix);
! s.append(CtuluLib.LINE_SEP);
return s.toString();
}
***************
*** 156,160 ****
_analyze.addError(DodicoResource.getS("Fichier non trouvé"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 159,163 ----
_analyze.addError(DodicoResource.getS("Fichier non trouvé"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 164,168 ****
_analyze.addFatalError(DodicoResource.getS("Erreur d'entrée/sortie"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 167,171 ----
_analyze.addFatalError(DodicoResource.getS("Erreur d'entrée/sortie"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 175,179 ****
_l);
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 178,182 ----
_l);
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 184,188 ****
DodicoResource.getS("Erreur interne: argument non valide"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 187,191 ----
DodicoResource.getS("Erreur interne: argument non valide"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 192,196 ****
_analyze.addFatalError(DodicoResource.getS("Erreur à l'exécution"));
_analyze.addInfo(_e.getMessage());
! if (DodicoLib.DEBUG)
_e.printStackTrace();
}
--- 195,199 ----
_analyze.addFatalError(DodicoResource.getS("Erreur à l'exécution"));
_analyze.addInfo(_e.getMessage());
! if (CtuluLib.DEBUG)
_e.printStackTrace();
}
***************
*** 216,220 ****
_bufferStockage.append(_prefix);
_bufferStockage.append(_titre);
! String lineSep= DodicoLib.LINE_SEP;
Field element;
int nb= _ls.length;
--- 219,223 ----
_bufferStockage.append(_prefix);
_bufferStockage.append(_titre);
! String lineSep= CtuluLib.LINE_SEP;
Field element;
int nb= _ls.length;
***************
*** 225,232 ****
int t= element.getOffset();
_bufferStockage.append(
! DodicoLib.ESPACE
+ DodicoResource.getS("Ligne")
! + DodicoLib.ESPACE
! + (t > 0 ? Integer.toString(t) : DodicoLib.EMPTY_STRING)
+ ": "
+ element.getMessage());
--- 228,235 ----
int t= element.getOffset();
_bufferStockage.append(
! CtuluLib.ESPACE
+ DodicoResource.getS("Ligne")
! + CtuluLib.ESPACE
! + (t > 0 ? Integer.toString(t) : CtuluLib.EMPTY_STRING)
+ ": "
+ element.getMessage());
***************
*** 511,515 ****
public String toString() {
return DodicoResource.getS("Ligne")
! + DodicoLib.ESPACE
+ offset_
+ " :"
--- 514,518 ----
public String toString() {
return DodicoResource.getS("Ligne")
! + CtuluLib.ESPACE
+ offset_
+ " :"
Index: DodicoDoubleDoubleSortedList.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoDoubleDoubleSortedList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DodicoDoubleDoubleSortedList.java 11 Dec 2003 12:41:26 -0000 1.5
--- DodicoDoubleDoubleSortedList.java 12 Dec 2003 10:30:52 -0000 1.6
***************
*** 9,13 ****
package org.fudaa.dodico.commun;
import gnu.trove.TDoubleArrayList;
! import gnu.trove.TDoubleDoubleHashMap;
/**
* @author deniger
--- 9,14 ----
package org.fudaa.dodico.commun;
import gnu.trove.TDoubleArrayList;
!
! import org.fudaa.ctulu.CtuluLib;
/**
* @author deniger
***************
*** 21,31 ****
val_= new TDoubleArrayList();
}
!
public DodicoDoubleDoubleSortedList(DodicoDoubleDoubleSortedList _l) {
! t_= new TDoubleArrayList(_l.t_.toNativeArray());
! val_= new TDoubleArrayList(_l.val_.toNativeArray());
! }
!
!
public boolean containsKey(double _key) {
return indexOfKey(_key) >= 0;
--- 22,31 ----
val_= new TDoubleArrayList();
}
!
public DodicoDoubleDoubleSortedList(DodicoDoubleDoubleSortedList _l) {
! t_= new TDoubleArrayList(_l.t_.toNativeArray());
! val_= new TDoubleArrayList(_l.val_.toNativeArray());
! }
!
public boolean containsKey(double _key) {
return indexOfKey(_key) >= 0;
***************
*** 35,38 ****
--- 35,76 ----
val_.ensureCapacity(_c);
}
+
+ public double getMinX() {
+ return (t_.size() == 0) ? 0 : t_.getQuick(0);
+ }
+
+ public double getMaxX() {
+ int n= t_.size() - 1;
+ return n < 0 ? 0 : t_.getQuick(n);
+ }
+
+ public double getMinY() {
+ int n= t_.size() - 1;
+ if (n < 0)
+ return 0;
+ double r= val_.getQuick(n);
+ double temp;
+ for (int i= n - 1; i >= 0; i--) {
+ temp= val_.getQuick(i);
+ if (temp < r)
+ r= temp;
+ }
+ return r;
+ }
+
+ public double getMaxY() {
+ int n= t_.size() - 1;
+ if (n < 0)
+ return 0;
+ double r= val_.getQuick(n);
+ double temp;
+ for (int i= n - 1; i >= 0; i--) {
+ temp= val_.getQuick(i);
+ if (temp > r)
+ r= temp;
+ }
+ return r;
+ }
+
/**
*
***************
*** 66,70 ****
}
public String toString() {
! return t_.toString() + DodicoLib.LINE_SEP + val_.toString();
}
public void removeKey(double _key) {
--- 104,108 ----
}
public String toString() {
! return t_.toString() + CtuluLib.LINE_SEP + val_.toString();
}
public void removeKey(double _key) {
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DodicoLib.java 11 Dec 2003 12:41:26 -0000 1.19
--- DodicoLib.java 12 Dec 2003 10:30:52 -0000 1.20
***************
*** 39,42 ****
--- 39,45 ----
import java.util.Locale;
import java.util.StringTokenizer;
+
+ import org.fudaa.ctulu.CtuluLib;
+
import com.memoire.fu.FuLib;
/**
***************
*** 47,76 ****
*/
public class DodicoLib {
- public final static boolean DEBUG= "TRUE".equals(System.getProperty("DEBUG"));
- public final static String[] EMPTY_STRING_ARRAY= new String[0];
- public final static String EMPTY_STRING= "";
- public final static String ZERO= "0";
- public final static String UN= "1";
- public final static String DEUX= "2";
- public final static String TROIS= "3";
- public final static String QUATRE= "4";
- public final static String CINQ= "5";
- public final static String SIX= "6";
- public final static String SEPT= "7";
- public final static String HUIT= "8";
- public final static String NEUF= "9";
- public final static String DIX= "10";
- public final static String SEP_LINE= "\n";
- public final static String ESPACE= " ";
private DodicoLib() {}
! /** */
! public final static String LINE_SEP= System.getProperty("line.separator");
! public static void debug(String _s) {
! System.out.println("DEBUG: " + _s);
! }
!
! public static void error(String _s) {
! System.out.println("ERROR: " + _s);
! }
public final static Object[] sort(Object[] _o) {
Arrays.sort(_o);
--- 50,55 ----
*/
public class DodicoLib {
private DodicoLib() {}
!
public final static Object[] sort(Object[] _o) {
Arrays.sort(_o);
***************
*** 142,176 ****
}
}
! public static String getString(int _i) {
! if (_i < 11) {
! switch (_i) {
! case 0 :
! return ZERO;
! case 1 :
! return UN;
! case 2 :
! return DEUX;
! case 3 :
! return TROIS;
! case 4 :
! return QUATRE;
! case 5 :
! return CINQ;
! case 6 :
! return SIX;
! case 7 :
! return SEPT;
! case 8 :
! return HUIT;
! case 9 :
! return NEUF;
! case 10 :
! return DIX;
! default :
! return _i + "";
! }
! } else
! return _i + "";
! }
public static void printObject(Object _o, boolean _v) {
System.out.println(_printObject(_o, _v));
--- 121,125 ----
}
}
!
public static void printObject(Object _o, boolean _v) {
System.out.println(_printObject(_o, _v));
***************
*** 181,185 ****
public static void addi18n(StringBuffer _v, String _s) {
_v.append(DodicoResource.getS(_s));
! _v.append(LINE_SEP);
}
public static void printStringArray(String[] _s) {
--- 130,134 ----
public static void addi18n(StringBuffer _v, String _s) {
_v.append(DodicoResource.getS(_s));
! _v.append(CtuluLib.LINE_SEP);
}
public static void printStringArray(String[] _s) {
***************
*** 398,449 ****
return enTableau(l);
}
! /**
! * Renvoie le chemin canonique du fichier _f. Si une exception est levee
! * renvoie le chemin absolu.
! * @return une valeur non nulle
! * @see java.io.File#getCanonicalFile();
! * @see java.io.File#getAbsoluteFile();
! */
! public static String getCanonicalPath(File _f) {
! String path= null;
! try {
! path= _f.getCanonicalPath();
! } catch (IOException e) {
! e.printStackTrace();
! path= _f.getAbsolutePath();
! }
! return path;
! }
! public static File getConanicalPathFile(File _f) {
! File path= null;
! try {
! path= _f.getCanonicalFile();
! } catch (IOException e) {
! e.printStackTrace();
! path= _f.getAbsoluteFile();
! }
! return path;
! }
! public static File getAbsolutePath(String _baseDir, String _path) {
! File f= new File(_path);
! if (f.isAbsolute())
! return f;
! else
! return new File(_baseDir, _path);
! }
! /**
! * if _path is absolute return new File(_path) else return
! * new File(_baseDir,_path)
! * @return null if one arg is null.
! */
! public static File getAbsolutePath(File _baseDir, String _path) {
! if ((_path == null) || (_baseDir == null))
! return null;
! File f= new File(_path);
! if (f.isAbsolute())
! return f;
! else
! return getConanicalPathFile(new File(_baseDir, _path));
! }
public static TObjectDoubleHashMap copy(TObjectDoubleHashMap _m){
--- 347,351 ----
return enTableau(l);
}
!
public static TObjectDoubleHashMap copy(TObjectDoubleHashMap _m){
Index: DodicoUIDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoUIDefault.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DodicoUIDefault.java 25 Nov 2003 10:11:25 -0000 1.3
--- DodicoUIDefault.java 12 Dec 2003 10:30:52 -0000 1.4
***************
*** 8,11 ****
--- 8,14 ----
*/
package org.fudaa.dodico.commun;
+
+ import org.fudaa.ctulu.CtuluLib;
+
/**
* @author fred deniger
***************
*** 34,38 ****
*/
public void error(String _msg) {
! error(DodicoLib.EMPTY_STRING, _msg);
}
/**
--- 37,41 ----
*/
public void error(String _msg) {
! error(CtuluLib.EMPTY_STRING, _msg);
}
/**
***************
*** 40,44 ****
*/
public void message(String _msg) {
! message(DodicoLib.EMPTY_STRING, _msg);
}
}
--- 43,47 ----
*/
public void message(String _msg) {
! message(CtuluLib.EMPTY_STRING, _msg);
}
}
|
