|
From: <de...@us...> - 2003-08-19 07:44:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac
In directory sc8-pr-cvs1:/tmp/cvs-serv9684/telemac
Modified Files:
TelemacDicoManager.java
Log Message:
Maj des import
Index: TelemacDicoManager.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TelemacDicoManager.java 18 Aug 2003 11:05:20 -0000 1.6
--- TelemacDicoManager.java 19 Aug 2003 07:44:22 -0000 1.7
***************
*** 40,44 ****
map.put(new TelemacDicoFileFormat("tomawac"), new String[] { "v5p3" });
INSTANCE.init(map);
!
}
--- 40,44 ----
map.put(new TelemacDicoFileFormat("tomawac"), new String[] { "v5p3" });
INSTANCE.init(map);
! INSTANCE.load();
}
***************
*** 62,70 ****
public DicoCasFileFormatVersion createVersionImpl(
! DicoCasFileFormat _ft,
String _v,
int _language) {
! if (("telemac2d".equals(_ft.getName()))
! && ("v5p3".equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
if (DodicoLib.DEBUG)
--- 62,71 ----
public DicoCasFileFormatVersion createVersionImpl(
! Telemac2dFileFormat _ft,
String _v,
int _language) {
! String name= Telemac2dFileFormat.getInstance().getName();
! String lastVersion= "v5p3";
! if ((lastVersion.equals(_v))
&& (DicoLanguage.getCurrentID() == _language)) {
if (DodicoLib.DEBUG)
***************
*** 72,78 ****
if (telemac2dv5p3_ == null)
telemac2dv5p3_=
! createVersionImpl(getFileFormat("telemac2d"), "v5p3", _language);
return telemac2dv5p3_;
}
return super.createVersionImpl(_ft, _v, _language);
--- 73,92 ----
if (telemac2dv5p3_ == null)
telemac2dv5p3_=
! _ft.createVersion(createDico(name, lastVersion, _language));
! super.createVersionImpl(getFileFormat(name), lastVersion, _language);
return telemac2dv5p3_;
}
+ return _ft.createVersion(createDico(name, _v, _language));
+ }
+
+ public DicoCasFileFormatVersion createVersionImpl(
+ DicoCasFileFormat _ft,
+ String _v,
+ int _language) {
+ if (Telemac2dFileFormat.getInstance().getName().equals(_ft.getName()))
+ return (DicoCasFileFormatVersion)createVersionImpl(
+ (Telemac2dFileFormat)_ft,
+ _v,
+ _language);
return super.createVersionImpl(_ft, _v, _language);
|