Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2014-10-09 20:18:56
|
Revision: 8864
http://sourceforge.net/p/fudaa/svn/8864
Author: deniger
Date: 2014-10-09 20:18:51 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java 2014-10-09 19:56:29 UTC (rev 8863)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java 2014-10-09 20:18:51 UTC (rev 8864)
@@ -43,7 +43,7 @@
final Map map = new HashMap(11);
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getArtemisId()), versions);
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[]{
- "v5p9", "v6p0"});
+ "v5p9", "v6p0"});
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getPostel3dId()), new String[]{
"v5p9", "v6p0", "v6p2", "v6p3"});
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getSisypheId()), versions);
@@ -108,17 +108,17 @@
* @return une version de telemac 2d.
*/
public Telemac2dFileFormat.TelemacVersion createTelemac2dVersionImpl(final Telemac2dFileFormat _ft,
- final DicoModelAbstract _dico, final int _language) {
+ final DicoModelAbstract _dico, final int _language) {
return _ft.createVersion(_dico);
}
public TelemacDicoFileFormatVersion createTelemacVersionImpl(final Telemac2dFileFormat _ft,
- final DicoModelAbstract _dico, final int _language) {
+ final DicoModelAbstract _dico, final int _language) {
return createTelemac2dVersionImpl(_ft, _dico, _language);
}
public CtuluResult<DicoModelAbstract> getDicoModel(final DicoCasFileFormat _ft, final String _v, final File _f,
- final int _language, ProgressionInterface progression) {
+ final int _language, ProgressionInterface progression) {
CtuluResult<DicoModelAbstract> res = new CtuluResult<DicoModelAbstract>();
if (_f != null) {
DicoDynamiqueGenerator generator = DicoDynamiqueGenerator.loadGenerator(_f, progression);
@@ -132,8 +132,8 @@
}
public CtuluResult<TelemacDicoFileFormatVersion> createTelemacVersionImpl(final DicoCasFileFormat _ft,
- final String _versionKnown, final File _dicoFile,
- final int _language, ProgressionInterface progression) {
+ final String _versionKnown, final File _dicoFile,
+ final int _language, ProgressionInterface progression) {
CtuluResult<DicoModelAbstract> res = getDicoModel(_ft, _versionKnown, _dicoFile, _language, progression);
CtuluResult<TelemacDicoFileFormatVersion> finalRes = new CtuluResult<TelemacDicoFileFormatVersion>();
finalRes.setAnalyze(res.getAnalyze());
@@ -144,23 +144,23 @@
}
public TelemacDicoFileFormatVersion createTelemacVersionImpl(final DicoCasFileFormat _ft,
- final DicoModelAbstract model, final int _language) {
+ final DicoModelAbstract model, final int _language) {
if (Telemac2dFileFormat.getInstance() == _ft) {
return createTelemac2dVersionImpl((Telemac2dFileFormat) _ft, model,
- _language);
+ _language);
}
if (model == null) {
return null;
}
if (_ft.getName().equals(H2dTelemacDicoParams.getSubief2dId())) {
return new TelemacSubief2dFileFormatVersion(_ft,
- model);
+ model);
}
if (_ft.getName().equals(H2dTelemacDicoParams.getStbtelId())) {
return new TelemacStbtelFileFormatVersion(_ft,
- model);
+ model);
}
return new TelemacDicoFileFormatVersion(_ft, model);
}
-}
\ No newline at end of file
+}
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java 2014-10-09 19:56:29 UTC (rev 8863)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java 2014-10-09 20:18:51 UTC (rev 8864)
@@ -1797,15 +1797,15 @@
valueByLanguage[0]="ORDONNEES DES SOURCES";
valueByLanguage[1]="ORDINATES OF SOURCES";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Valeurs des ordonnees des sources de debit et de traceur.";
valueByLanguage[1]="ordinates of sources of flowrate and/or tracer";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="EQUATIONS, SOURCES";
valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
- entites[67]=entiteSimple.getImmutable();
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+ entites[67]=entiteVecteur.getImmutable();
//start DEBITS DES SOURCES
@@ -1813,15 +1813,15 @@
valueByLanguage[0]="DEBITS DES SOURCES";
valueByLanguage[1]="WATER DISCHARGE OF SOURCES";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Valeurs des debits des sources.";
valueByLanguage[1]="values of water discharge of sources";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="EQUATIONS, SOURCES";
valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
- entites[68]=entiteSimple.getImmutable();
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+ entites[68]=entiteVecteur.getImmutable();
//start VALEURS DES TRACEURS DES SOURCES
@@ -1845,17 +1845,17 @@
valueByLanguage[0]="VITESSES DES SOURCES SELON X";
valueByLanguage[1]="VELOCITIES OF THE SOURCES ALONG X";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Vitesses du courant a chacune des sources. Si elles ne sont pas"
+"\ndonnees, on considere que la vitesse est celle du courant";
valueByLanguage[1]="Velocities at the sources. If they are not given, the velocity"
+"\nof the flow at this location is taken";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="EQUATIONS, SOURCES";
valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
- entites[70]=entiteSimple.getImmutable();
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+ entites[70]=entiteVecteur.getImmutable();
//start VITESSES DES SOURCES SELON Y
@@ -1863,15 +1863,15 @@
valueByLanguage[0]="VITESSES DES SOURCES SELON Y";
valueByLanguage[1]="VELOCITIES OF THE SOURCES ALONG Y";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Vitesses du courant a chacune des sources";
valueByLanguage[1]="Velocities at the sources";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="EQUATIONS, SOURCES";
valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
- entites[71]=entiteSimple.getImmutable();
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+ entites[71]=entiteVecteur.getImmutable();
//start COEFFICIENTS DE DECENTREMENT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 19:56:33
|
Revision: 8863
http://sourceforge.net/p/fudaa/svn/8863
Author: deniger
Date: 2014-10-09 19:56:29 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/soft/fudaa-mesh/pom.xml
Modified: trunk/soft/fudaa-mesh/pom.xml
===================================================================
--- trunk/soft/fudaa-mesh/pom.xml 2014-10-09 19:50:10 UTC (rev 8862)
+++ trunk/soft/fudaa-mesh/pom.xml 2014-10-09 19:56:29 UTC (rev 8863)
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.5-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.6-SNAPSHOT</fudaa-sig.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 19:50:17
|
Revision: 8862
http://sourceforge.net/p/fudaa/svn/8862
Author: deniger
Date: 2014-10-09 19:50:10 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-10-09 19:49:27 UTC (rev 8861)
+++ trunk/business/fudaa-sig/pom.xml 2014-10-09 19:50:10 UTC (rev 8862)
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <dodico-h2d.version>1.5</dodico-h2d.version>
+ <dodico-h2d.version>1.6-SNAPSHOT</dodico-h2d.version>
<javaCompiler>1.7</javaCompiler>
<targetJdk>1.7</targetJdk>
</properties>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 19:49:37
|
Revision: 8861
http://sourceforge.net/p/fudaa/svn/8861
Author: deniger
Date: 2014-10-09 19:49:27 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/soft/fudaa-mesh/pom.xml
Modified: trunk/soft/fudaa-mesh/pom.xml
===================================================================
--- trunk/soft/fudaa-mesh/pom.xml 2014-10-09 19:48:57 UTC (rev 8860)
+++ trunk/soft/fudaa-mesh/pom.xml 2014-10-09 19:49:27 UTC (rev 8861)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</parent>
<groupId>org.fudaa.soft.fudaa-mesh</groupId>
<artifactId>fudaa-mesh</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-09 19:47:50
|
Revision: 8859
http://sourceforge.net/p/fudaa/svn/8859
Author: deniger
Date: 2014-10-09 19:47:45 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
dico 7.0
Modified Paths:
--------------
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2014-10-03 16:41:32 UTC (rev 8858)
+++ trunk/business/dodico-h2d/pom.xml 2014-10-09 19:47:45 UTC (rev 8859)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-10-03 16:41:36
|
Revision: 8858
http://sourceforge.net/p/fudaa/svn/8858
Author: deniger
Date: 2014-10-03 16:41:32 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
xcas au lancement du calcul + corrections fiichiers xcas
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaObject.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java 2014-10-01 15:18:40 UTC (rev 8857)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGridInteractive.java 2014-10-03 16:41:32 UTC (rev 8858)
@@ -316,6 +316,7 @@
transferFocus();
}
repaint();
+ firePropertyChange("interactive", !interactive_, interactive_);
}
}
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaObject.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaObject.java 2014-10-01 15:18:40 UTC (rev 8857)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaObject.java 2014-10-03 16:41:32 UTC (rev 8858)
@@ -1,14 +1,13 @@
/**
* @modification $Date: 2007-03-19 13:25:37 $
- * @statut unstable
- * @file DjaObject.java
- * @version 0.36
- * @author Guillaume Desnoix
- * @email gui...@de...
- * @license GNU General Public License 2 (GPL2)
- * @copyright 1998-2001 Guillaume Desnoix
+ * @statut unstable
+ * @file DjaObject.java
+ * @version 0.36
+ * @author Guillaume Desnoix
+ * @email gui...@de...
+ * @license GNU General Public License 2 (GPL2)
+ * @copyright 1998-2001 Guillaume Desnoix
*/
-
package com.memoire.dja;
import java.awt.Color;
@@ -22,74 +21,78 @@
import com.memoire.bu.BuLib;
import com.memoire.fu.FuHashtablePublic;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
public abstract class DjaObject
- implements DjaOwner, DjaOptions, Cloneable, Serializable
-{
- private boolean selected_;
- protected DjaColor foreground_;
- protected DjaColor background_;
- private DjaColor color_;
- private DjaFont font_;
- private DjaText[] texts_;
+ implements DjaOwner, DjaOptions, Cloneable, Serializable {
+ private boolean selected_;
+ protected DjaColor foreground_;
+ protected DjaColor background_;
+ private DjaColor color_;
+ private DjaFont font_;
+ private DjaText[] texts_;
+
private FuHashtablePublic properties_;
- private transient DjaOwner owner_;
+ private transient DjaOwner owner_;
private transient FuHashtablePublic datas_;
- public DjaObject()
- {
- properties_=new FuHashtablePublic(11);
- texts_ =new DjaText[0];
+ public DjaObject() {
+ properties_ = new FuHashtablePublic(11);
+ texts_ = new DjaText[0];
- setSelected (false);
+ setSelected(false);
setForeground(Color.black);
setBackground(Color.white);
- setFont (defaultPlainFont);
- setColor (Color.black);
+ setFont(defaultPlainFont);
+ setColor(Color.black);
}
- public DjaOwner getOwner()
- { return owner_; }
+ public DjaOwner getOwner() {
+ return owner_;
+ }
- void setOwner(DjaOwner _owner)
- { owner_=_owner; }
+ void setOwner(DjaOwner _owner) {
+ owner_ = _owner;
+ }
- public DjaGrid getGrid()
- {
- DjaGrid r=null;
+ public DjaGrid getGrid() {
+ DjaGrid r = null;
- DjaOwner o=getOwner();
- while(o!=null)
- {
- if(o instanceof DjaGrid)
- { r=(DjaGrid)o; break; }
- o=o.getOwner();
+ DjaOwner o = getOwner();
+ while (o != null) {
+ if (o instanceof DjaGrid) {
+ r = (DjaGrid) o;
+ break;
+ }
+ o = o.getOwner();
}
return r;
}
- public void fireGridEvent(DjaOwner _object,int _id)
- {
- DjaGrid grid=getGrid();
- if(grid!=null) grid.fireGridEvent(_object,_id);
+ public void fireGridEvent(DjaOwner _object, int _id) {
+ DjaGrid grid = getGrid();
+ if (grid != null) {
+ grid.fireGridEvent(_object, _id);
+ }
}
- public Object clone() throws CloneNotSupportedException
- {
- DjaObject r=(DjaObject)super.clone();
+ public Object clone() throws CloneNotSupportedException {
+ DjaObject r = (DjaObject) super.clone();
- properties_=(FuHashtablePublic)properties_.clone();
+ properties_ = (FuHashtablePublic) properties_.clone();
- if(datas_!=null) datas_=(FuHashtablePublic)datas_.clone();
+ if (datas_ != null) {
+ datas_ = (FuHashtablePublic) datas_.clone();
+ }
- DjaText[] t=r.getTextArray();
- DjaText[] u=new DjaText[t.length];
- for(int i=0;i<t.length;i++)
- {
- u[i]=(DjaText)t[i].clone();
+ DjaText[] t = r.getTextArray();
+ DjaText[] u = new DjaText[t.length];
+ for (int i = 0; i < t.length; i++) {
+ u[i] = (DjaText) t[i].clone();
u[i].setParent(r);
}
r.setTextArray(u);
@@ -97,316 +100,326 @@
return r;
}
- public Icon getIcon()
- {
- String s=getClass().getName().toLowerCase();
- int i=s.indexOf("dja");
- if(i>=0) s="dja-"+s.substring(i+3);
- return DjaResource.DJA.getIcon(s,16);
+ public Icon getIcon() {
+ String s = getClass().getName().toLowerCase();
+ int i = s.indexOf("dja");
+ if (i >= 0) {
+ s = "dja-" + s.substring(i + 3);
+ }
+ return DjaResource.DJA.getIcon(s, 16);
}
- public String getProperty(String _key)
- {
- return (String)properties_.get(_key);
+ public String getProperty(String _key) {
+ return (String) properties_.get(_key);
}
- public void putProperty(String _key, String _value)
- {
- if(_value!=null) properties_.put(_key,_value);
- else removeProperty(_key);
+ public void putProperty(String _key, String _value) {
+ if (_value != null) {
+ properties_.put(_key, _value);
+ } else {
+ removeProperty(_key);
+ }
}
- public void removeProperty(String _key)
- {
+ public void removeProperty(String _key) {
properties_.remove(_key);
}
- public Object getData(String _key)
- {
- return datas_==null ? null : datas_.get(_key);
+ public Object getData(String _key) {
+ return datas_ == null ? null : datas_.get(_key);
}
- public void putData(String _key, Object _value)
- {
- if(datas_==null) datas_=new FuHashtablePublic(11);
- datas_.put(_key,_value);
+ public void putData(String _key, Object _value) {
+ if (datas_ == null) {
+ datas_ = new FuHashtablePublic(11);
+ }
+ datas_.put(_key, _value);
}
- public void removeData(String _key)
- {
- if(datas_!=null) datas_.remove(_key);
+ public void removeData(String _key) {
+ if (datas_ != null) {
+ datas_.remove(_key);
+ }
}
// Saver
- Enumeration getPropertyKeys()
- { return properties_.keys(); }
+ Enumeration getPropertyKeys() {
+ return properties_.keys();
+ }
- public void beforeSaving() { }
- public void afterLoading() { }
+ public void beforeSaving() {
+ }
+ public void afterLoading() {
+ }
+
public abstract Rectangle getBounds();
- public abstract void setX (int _x);
- public abstract void setY (int _y);
- public abstract void setWidth (int _w);
+
+ public abstract void setX(int _x);
+
+ public abstract void setY(int _y);
+
+ public abstract void setWidth(int _w);
+
public abstract void setHeight(int _h);
- public boolean contains(int _x, int _y)
- { return getBounds().contains(_x,_y); }
+ public boolean contains(int _x, int _y) {
+ return getBounds().contains(_x, _y);
+ }
- public int getX()
- { return getBounds().x; }
+ public int getX() {
+ return getBounds().x;
+ }
- public int getY()
- { return getBounds().y; }
+ public int getY() {
+ return getBounds().y;
+ }
- public int getWidth()
- { return getBounds().width; }
+ public int getWidth() {
+ return getBounds().width;
+ }
- public Rectangle getExtendedBounds()
- {
+ public Rectangle getExtendedBounds() {
return getExtendedBounds(getBounds());
}
- protected Rectangle getExtendedBounds(Rectangle _r)
- {
- Rectangle r=_r;
- if(isSelected()) r.grow(deltaX,deltaY);
- if(this instanceof DjaLink) r.grow(11,11);
+ protected Rectangle getExtendedBounds(Rectangle _r) {
+ Rectangle r = _r;
+ if (isSelected()) {
+ r.grow(deltaX, deltaY);
+ }
+ if (this instanceof DjaLink) {
+ r.grow(11, 11);
+ }
/*
- {
- DjaAnchor[] anchors=getAnchors();
- for(int i=0;i<anchors.length;i++)
- anchors[i].paint(_g);
- }
+ {
+ DjaAnchor[] anchors=getAnchors();
+ for(int i=0;i<anchors.length;i++)
+ anchors[i].paint(_g);
+ }
- {
- DjaAttach[] attachs=getAttachs();
- for(int i=0;i<attachs.length;i++)
- attachs[i].paint(_g);
- }
+ {
+ DjaAttach[] attachs=getAttachs();
+ for(int i=0;i<attachs.length;i++)
+ attachs[i].paint(_g);
+ }
- {
- DjaHandle[] handles=getHandles();
- for(int i=0;i<handles.length;i++)
- handles[i].paint(_g);
- }
+ {
+ DjaHandle[] handles=getHandles();
+ for(int i=0;i<handles.length;i++)
+ handles[i].paint(_g);
+ }
+ {
+ DjaControl[] controls=getControls();
+ for(int i=0;i<controls.length;i++)
+ controls[i].paint(_g);
+ }
+ */
{
- DjaControl[] controls=getControls();
- for(int i=0;i<controls.length;i++)
- controls[i].paint(_g);
+ DjaText[] texts = getTexts();
+ for (int i = 0; i < texts.length; i++) {
+ r = r.union(texts[i].getBounds());
+ }
}
- */
- {
- DjaText[] texts=getTexts();
- for(int i=0;i<texts.length;i++)
- r=r.union(texts[i].getBounds());
- }
+ r.grow(3, 3);
- r.grow(3,3);
-
- String epaisseur=getProperty("epaisseur");
- if(epaisseur!=null)
- {
- int e=Integer.parseInt(epaisseur);
- r.grow(e,e);
+ String epaisseur = getProperty("epaisseur");
+ if (epaisseur != null) {
+ int e = Integer.parseInt(epaisseur);
+ r.grow(e, e);
}
return r;
}
- public int getHeight()
- { return getBounds().height; }
+ public int getHeight() {
+ return getBounds().height;
+ }
- public boolean isSelected()
- { return selected_; }
+ public boolean isSelected() {
+ return selected_;
+ }
- public void setSelected(boolean _selected)
- {
- if(selected_!=_selected)
- {
- selected_=_selected;
- fireGridEvent(this,selected_
- ? DjaGridEvent.SELECTED
- : DjaGridEvent.UNSELECTED);
+ public void setSelected(boolean _selected) {
+ if (selected_ != _selected) {
+ selected_ = _selected;
+ fireGridEvent(this, selected_
+ ? DjaGridEvent.SELECTED
+ : DjaGridEvent.UNSELECTED);
}
}
- public Color getForeground()
- {
- Color r=null;
+ public Color getForeground() {
+ Color r = null;
- if(foreground_!=null)
- {
- if(selected_)
- r=BuLib.mixColors(foreground_.getColor(),selectionForeground);
- else
- r=foreground_.getColor();
+ if (foreground_ != null) {
+ if (selected_) {
+ r = BuLib.mixColors(foreground_.getColor(), selectionForeground);
+ } else {
+ r = foreground_.getColor();
+ }
}
return r;
}
- public void setForeground(Color _foreground)
- {
- if(_foreground!=null)
- foreground_=new DjaColor(_foreground);
- else
- foreground_=null;
+ public void setForeground(Color _foreground) {
+ if (_foreground != null) {
+ foreground_ = new DjaColor(_foreground);
+ } else {
+ foreground_ = null;
+ }
}
- public Color getBackground()
- {
- Color r=null;
+ public Color getBackground() {
+ Color r = null;
- if(background_!=null)
- {
- if(selected_)
- r=BuLib.mixColors(background_.getColor(),selectionBackground);
- else
- r=background_.getColor();
+ if (background_ != null) {
+ if (selected_) {
+ r = BuLib.mixColors(background_.getColor(), selectionBackground);
+ } else {
+ r = background_.getColor();
+ }
}
return r;
}
- public void setBackground(Color _background)
- {
- if(_background!=null)
- background_=new DjaColor(_background);
- else
- background_=null;
+ public void setBackground(Color _background) {
+ if (_background != null) {
+ background_ = new DjaColor(_background);
+ } else {
+ background_ = null;
+ }
}
- public DjaAnchor[] getAnchors()
- {
+ public DjaAnchor[] getAnchors() {
return new DjaAnchor[0];
}
- public DjaAttach[] getAttachs()
- {
+ public DjaAttach[] getAttachs() {
return new DjaAttach[0];
}
- public DjaHandle[] getHandles()
- {
- int x=getX();
- int y=getY();
- int w=getWidth();
- int h=getHeight();
+ public DjaHandle[] getHandles() {
+ int x = getX();
+ int y = getY();
+ int w = getWidth();
+ int h = getHeight();
- DjaHandle[] r=new DjaHandle[8];
- r[0]=new DjaHandle(this,NORTH ,x+w/2 ,y -deltaY);
- r[2]=new DjaHandle(this,EAST ,x+w-1+deltaX,y+h/2 );
- r[4]=new DjaHandle(this,SOUTH ,x+w/2 ,y+h-1+deltaY);
- r[6]=new DjaHandle(this,WEST ,x -deltaX,y+h/2 );
- r[1]=new DjaHandle(this,NORTH_EAST,x+w-1+deltaX,y -deltaY);
- r[3]=new DjaHandle(this,SOUTH_EAST,x+w-1+deltaX,y+h-1+deltaY);
- r[5]=new DjaHandle(this,SOUTH_WEST,x -deltaX,y+h-1+deltaY);
- r[7]=new DjaHandle(this,NORTH_WEST,x -deltaX,y -deltaY);
+ DjaHandle[] r = new DjaHandle[8];
+ r[0] = new DjaHandle(this, NORTH, x + w / 2, y - deltaY);
+ r[2] = new DjaHandle(this, EAST, x + w - 1 + deltaX, y + h / 2);
+ r[4] = new DjaHandle(this, SOUTH, x + w / 2, y + h - 1 + deltaY);
+ r[6] = new DjaHandle(this, WEST, x - deltaX, y + h / 2);
+ r[1] = new DjaHandle(this, NORTH_EAST, x + w - 1 + deltaX, y - deltaY);
+ r[3] = new DjaHandle(this, SOUTH_EAST, x + w - 1 + deltaX, y + h - 1 + deltaY);
+ r[5] = new DjaHandle(this, SOUTH_WEST, x - deltaX, y + h - 1 + deltaY);
+ r[7] = new DjaHandle(this, NORTH_WEST, x - deltaX, y - deltaY);
return r;
}
- public DjaControl[] getControls()
- {
+ public DjaControl[] getControls() {
return new DjaControl[0];
}
- public DjaLink[] getBeginConnections()
- {
- DjaGrid grid=getGrid();
- if(grid==null) return new DjaLink[0];
+ public DjaLink[] getBeginConnections() {
+ DjaGrid grid = getGrid();
+ if (grid == null) {
+ return new DjaLink[0];
+ }
- DjaVector v=new DjaVector();
- for(Enumeration e=grid.enumerate(DjaLink.class);
- e.hasMoreElements(); )
- {
- DjaLink l=(DjaLink)e.nextElement();
- if(l.getBeginObject()==this)
- v.addElement(l);
+ DjaVector v = new DjaVector();
+ for (Enumeration e = grid.enumerate(DjaLink.class);
+ e.hasMoreElements();) {
+ DjaLink l = (DjaLink) e.nextElement();
+ if (l.getBeginObject() == this) {
+ v.addElement(l);
+ }
}
- int t=v.size();
- DjaLink[] r=new DjaLink[t];
- for(int i=0; i<t; i++) r[i]=(DjaLink)v.elementAt(i);
+ int t = v.size();
+ DjaLink[] r = new DjaLink[t];
+ for (int i = 0; i < t; i++) {
+ r[i] = (DjaLink) v.elementAt(i);
+ }
return r;
}
- public DjaLink[] getEndConnections()
- {
- DjaGrid grid=getGrid();
- if(grid==null) return new DjaLink[0];
+ public DjaLink[] getEndConnections() {
+ DjaGrid grid = getGrid();
+ if (grid == null) {
+ return new DjaLink[0];
+ }
- DjaVector v=new DjaVector();
- for(Enumeration e=grid.enumerate(DjaLink.class);
- e.hasMoreElements(); )
- {
- DjaLink l=(DjaLink)e.nextElement();
- if(l.getEndObject()==this)
- v.addElement(l);
+ DjaVector v = new DjaVector();
+ for (Enumeration e = grid.enumerate(DjaLink.class);
+ e.hasMoreElements();) {
+ DjaLink l = (DjaLink) e.nextElement();
+ if (l.getEndObject() == this) {
+ v.addElement(l);
+ }
}
- int t=v.size();
- DjaLink[] r=new DjaLink[t];
- for(int i=0; i<t; i++) r[i]=(DjaLink)v.elementAt(i);
+ int t = v.size();
+ DjaLink[] r = new DjaLink[t];
+ for (int i = 0; i < t; i++) {
+ r[i] = (DjaLink) v.elementAt(i);
+ }
return r;
}
- public DjaText[] getTexts()
- {
- DjaText[] r=texts_;
- if(r==null) r=new DjaText[0];
+ public DjaText[] getTexts() {
+ DjaText[] r = texts_;
+ if (r == null) {
+ r = new DjaText[0];
+ }
return r;
}
- protected final DjaText[] getTextArray()
- {
+ protected final DjaText[] getTextArray() {
return texts_;
}
- protected final void setTextArray(DjaText[] _texts)
- {
- texts_=_texts;
+ protected final void setTextArray(DjaText[] _texts) {
+ texts_ = _texts;
}
- public final synchronized void addText(DjaText _text)
- {
- if(texts_==null)
- {
+ public final synchronized void addText(DjaText _text) {
+ if (texts_ == null) {
_text.setNum(0);
- texts_=new DjaText[] { _text };
- }
- else
- {
- int l=texts_.length;
- int n=_text.getNum();
+ texts_ = new DjaText[]{_text};
+ } else {
+ int l = texts_.length;
+ int n = _text.getNum();
- if((n>=0)&&(n<l))
- texts_[n]=_text;
- else
- {
- DjaText[] a=new DjaText[l+1];
- for(int i=0;i<l;i++) a[i]=texts_[i];
- _text.setNum(l);
- a[l]=_text;
- texts_=a;
+ if ((n >= 0) && (n < l)) {
+ texts_[n] = _text;
+ } else {
+ DjaText[] a = new DjaText[l + 1];
+ for (int i = 0; i < l; i++) {
+ a[i] = texts_[i];
+ }
+ _text.setNum(l);
+ a[l] = _text;
+ texts_ = a;
}
}
}
-
-
- public DjaText getTextAt(int _i){
- if(texts_!=null&& texts_.length>_i) return texts_[_i];
+
+ public DjaText getTextAt(int _i) {
+ if (texts_ != null && texts_.length > _i) {
+ return texts_[_i];
+ }
return null;
}
-
- public void addText(String _text)
- {
- DjaText t=new DjaText(this,-1,_text);
+ public void addText(String _text) {
+ DjaText t = new DjaText(this, -1, _text);
t.setPosition(ABSOLUTE);
addText(t);
}
@@ -414,238 +427,258 @@
/**
* Notify when a text was modified
*/
- public void textChanged(DjaText _text) { }
+ public void textChanged(DjaText _text) {
+ }
// Simplify text
-
/**
* @deprecated use getText(0)
*/
- public /*final*/ String getText()
- {
+ public /*final*/ String getText() {
return getText(0);
}
- public String getText(int _i)
- {
- String r=null;
- if(texts_.length>_i) texts_[_i].getText();
+ public String getText(int _i) {
+ String r = null;
+ if (texts_.length > _i) {
+ texts_[_i].getText();
+ }
return r;
}
/**
* @deprecated use setText(0)
*/
- public /*final*/ void setText(String _text)
- {
- setText(_text,0);
+ public /*final*/ void setText(String _text) {
+ setText(_text, 0);
}
- public void setText(String _text, int _i)
- {
- String txt=_text;
- if("".equals(txt)) txt=null;
- if(texts_.length>_i) texts_[_i].setText(txt);
+ public void setText(String _text, int _i) {
+ String txt = _text;
+ if ("".equals(txt)) {
+ txt = null;
+ }
+ if (texts_.length > _i) {
+ texts_[_i].setText(txt);
+ }
}
- public Font getFont()
- {
- Font r=null;
- if(font_!=null) r=font_.getFont();
- if(r==null) r=defaultPlainFont;
+ public Font getFont() {
+ Font r = null;
+ if (font_ != null) {
+ r = font_.getFont();
+ }
+ if (r == null) {
+ r = defaultPlainFont;
+ }
return r;
}
- public void setFont(Font _font)
- {
- font_=new DjaFont(_font);
+ public void setFont(Font _font) {
+ font_ = new DjaFont(_font);
}
- public Color getColor()
- {
- Color r=null;
- if(color_!=null) r=color_.getColor();
+ public Color getColor() {
+ Color r = null;
+ if (color_ != null) {
+ r = color_.getColor();
+ }
return r;
}
- public void setColor(Color _color)
- {
- if(_color!=null)
- color_=new DjaColor(_color);
- else
- color_=null;
+ public void setColor(Color _color) {
+ if (_color != null) {
+ color_ = new DjaColor(_color);
+ } else {
+ color_ = null;
+ }
}
/**
* @deprecated
*/
- public Color getTextColor()
- {
- Color r=null;
+ public Color getTextColor() {
+ Color r = null;
/*
- if(selected_) r=selectionForeground;
- else r=textcolor_;
- */
- if(texts_.length>0) r=texts_[0].getColor();
+ if(selected_) r=selectionForeground;
+ else r=textcolor_;
+ */
+ if (texts_.length > 0) {
+ r = texts_[0].getColor();
+ }
return r;
}
/**
* @deprecated
*/
- public void setTextColor(Color _color)
- {
- if(texts_.length>0) texts_[0].setColor(_color);
+ public void setTextColor(Color _color) {
+ if (texts_.length > 0) {
+ texts_[0].setColor(_color);
+ }
}
/**
* @deprecated
*/
- public int getTextPosition()
- {
- int r=CENTER;
- if(texts_.length>0) r=texts_[0].getPosition();
+ public int getTextPosition() {
+ int r = CENTER;
+ if (texts_.length > 0) {
+ r = texts_[0].getPosition();
+ }
return r;
}
/**
* @deprecated
*/
- public void setTextPosition(int _pos)
- {
- if(texts_.length>0) texts_[0].setPosition(_pos);
+ public void setTextPosition(int _pos) {
+ if (texts_.length > 0) {
+ texts_[0].setPosition(_pos);
+ }
}
/**
* @deprecated
*/
- public boolean isTextMultiline()
- {
- boolean r=false;
- if(texts_.length>0) texts_[0].isMultiline();
+ public boolean isTextMultiline() {
+ boolean r = false;
+ if (texts_.length > 0) {
+ texts_[0].isMultiline();
+ }
return r;
}
/**
* @deprecated
*/
- protected void setTextBounds(Rectangle _r) { }
+ protected void setTextBounds(Rectangle _r) {
+ }
/*
- private Rectangle textBounds_=null;
+ private Rectangle textBounds_=null;
- public boolean textContains(int _x, int _y)
- {
- Rectangle tb=getTextBounds();
- return (tb==null ? false : tb.contains(_x,_y));
+ public boolean textContains(int _x, int _y)
+ {
+ Rectangle tb=getTextBounds();
+ return (tb==null ? false : tb.contains(_x,_y));
+ }
+
+ protected Rectangle getTextBounds() { return textBounds_; }
+ protected void setTextBounds(Rectangle _r) { textBounds_=_r; }
+ */
+
+ public static void setBestQuality(final Graphics2D _g) {
+ _g.getRenderingHints().put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ _g.getRenderingHints().put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ _g.getRenderingHints().put(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ _g.getRenderingHints()
+ .put(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ _g.getRenderingHints().put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+ _g.getRenderingHints().put(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+ _g.getRenderingHints().put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
}
- protected Rectangle getTextBounds() { return textBounds_; }
- protected void setTextBounds(Rectangle _r) { textBounds_=_r; }
- */
-
- public void paint(Graphics _g)
- {
+ public void paint(Graphics _g) {
+ setBestQuality((Graphics2D) _g);
paintObject(_g);
paintText(_g);
paintTexts(_g);
}
- public void paintObject(Graphics _g)
- {
+ public void paintObject(Graphics _g) {
}
/**
* @deprecated
*/
- public void paintText(Graphics _g)
- {
+ public void paintText(Graphics _g) {
}
- public void paintInteractive(Graphics _g)
- {
- if(isSelected())
- {
- DjaText[] texts=getTexts();
- for(int k=0;k<texts.length;k++)
- {
- boolean moveable=texts[k].isMoveable();
- boolean selected=texts[k].isSelected();
+ public void paintInteractive(Graphics _g) {
+ if (isSelected()) {
+ DjaText[] texts = getTexts();
+ for (int k = 0; k < texts.length; k++) {
+ boolean moveable = texts[k].isMoveable();
+ boolean selected = texts[k].isSelected();
- Rectangle r=texts[k].getBounds();
+ Rectangle r = texts[k].getBounds();
- int x=r.x;
- int y=r.y;
- int w=r.width;
- int h=r.height;
-
- _g.setColor(selected
- ? selectionZone
- : texts[k].getColor());
+ int x = r.x;
+ int y = r.y;
+ int w = r.width;
+ int h = r.height;
- for(int i=1;i<=w;i+=4)
- {
- if(moveable) _g.drawLine(x+i,y-1,x+i+1,y-1);
- _g.drawLine(x+i,y+h+1,x+i+1,y+h+1);
- }
+ _g.setColor(selected
+ ? selectionZone
+ : texts[k].getColor());
- if(moveable)
- for(int j=1;j<=h;j+=4)
- {
- _g.drawLine(x-1 ,y+j,x-1 ,y+j+1);
- _g.drawLine(x+w+1,y+j,x+w+1,y+j+1);
- }
+ for (int i = 1; i <= w; i += 4) {
+ if (moveable) {
+ _g.drawLine(x + i, y - 1, x + i + 1, y - 1);
+ }
+ _g.drawLine(x + i, y + h + 1, x + i + 1, y + h + 1);
+ }
- if(selected)
- {
- _g.drawLine(x,y,x+5,y );
- _g.drawLine(x+5,y,x,y+5);
- _g.drawLine(x,y+5,x,y );
- }
+ if (moveable) {
+ for (int j = 1; j <= h; j += 4) {
+ _g.drawLine(x - 1, y + j, x - 1, y + j + 1);
+ _g.drawLine(x + w + 1, y + j, x + w + 1, y + j + 1);
+ }
+ }
+
+ if (selected) {
+ _g.drawLine(x, y, x + 5, y);
+ _g.drawLine(x + 5, y, x, y + 5);
+ _g.drawLine(x, y + 5, x, y);
+ }
}
}
}
- public void paintAnchors(Graphics _g)
- {
- DjaAnchor[] anchors=getAnchors();
- for(int i=0;i<anchors.length;i++)
+ public void paintAnchors(Graphics _g) {
+ DjaAnchor[] anchors = getAnchors();
+ for (int i = 0; i < anchors.length; i++) {
anchors[i].paint(_g);
+ }
}
- public void paintAttachs(Graphics _g)
- {
- DjaAttach[] attachs=getAttachs();
- for(int i=0;i<attachs.length;i++)
+ public void paintAttachs(Graphics _g) {
+ DjaAttach[] attachs = getAttachs();
+ for (int i = 0; i < attachs.length; i++) {
attachs[i].paint(_g);
+ }
}
- public void paintHandles(Graphics _g)
- {
- DjaHandle[] handles=getHandles();
- for(int i=0;i<handles.length;i++)
+ public void paintHandles(Graphics _g) {
+ DjaHandle[] handles = getHandles();
+ for (int i = 0; i < handles.length; i++) {
handles[i].paint(_g);
+ }
}
- public void paintControls(Graphics _g)
- {
- DjaControl[] controls=getControls();
- for(int i=0;i<controls.length;i++)
+ public void paintControls(Graphics _g) {
+ DjaControl[] controls = getControls();
+ for (int i = 0; i < controls.length; i++) {
controls[i].paint(_g);
+ }
}
- public void paintTexts(Graphics _g)
- {
- DjaText[] texts=getTexts();
- for(int i=0;i<texts.length;i++)
+ public void paintTexts(Graphics _g) {
+ DjaText[] texts = getTexts();
+ for (int i = 0; i < texts.length; i++) {
texts[i].paint(_g);
+ }
}
- public String toString()
- {
- String r=getClass().getName();
- int i=r.lastIndexOf('.');
- if(i>=0) r=r.substring(i+1);
- if(r.startsWith("Dja")) r=r.substring(3);
+ public String toString() {
+ String r = getClass().getName();
+ int i = r.lastIndexOf('.');
+ if (i >= 0) {
+ r = r.substring(i + 1);
+ }
+ if (r.startsWith("Dja")) {
+ r = r.substring(3);
+ }
return r;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-23 19:35:19
|
Revision: 8854
http://sourceforge.net/p/fudaa/svn/8854
Author: deniger
Date: 2014-09-23 19:35:17 +0000 (Tue, 23 Sep 2014)
Log Message:
-----------
xcas au lancement du calcul + corrections fiichiers xcas
Modified Paths:
--------------
trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNumHelper.java
Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-09-23 19:35:08 UTC (rev 8853)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-09-23 19:35:17 UTC (rev 8854)
@@ -18,7 +18,7 @@
public boolean attenuationConvection = false;
// termes non hydrostatiques pour le noyau transcritique
- public org.fudaa.dodico.corba.mascaret.SParametresNumCasier parametresNumeriqueCasier = null;
+// public org.fudaa.dodico.corba.mascaret.SParametresNumCasier parametresNumeriqueCasier = null;
public SParametresNum() {
} // ctor
@@ -34,7 +34,6 @@
optimisNoyauTrans = _optimisNoyauTrans;
perteChargeAutoElargissement = _perteChargeAutoElargissement;
termesNonHydrostatiques = _termesNonHydrostatiques;
- parametresNumeriqueCasier = _parametresNumeriqueCasier;
} // ctor
} // class SParametresNum
Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNumHelper.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNumHelper.java 2014-09-23 19:35:08 UTC (rev 8853)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNumHelper.java 2014-09-23 19:35:17 UTC (rev 8854)
@@ -119,7 +119,7 @@
value.optimisNoyauTrans = istream.read_boolean ();
value.perteChargeAutoElargissement = istream.read_boolean ();
value.termesNonHydrostatiques = istream.read_boolean ();
- value.parametresNumeriqueCasier = org.fudaa.dodico.corba.mascaret.SParametresNumCasierHelper.read (istream);
+// value.parametresNumeriqueCasier = org.fudaa.dodico.corba.mascaret.SParametresNumCasierHelper.read (istream);
return value;
}
@@ -133,7 +133,7 @@
ostream.write_boolean (value.optimisNoyauTrans);
ostream.write_boolean (value.perteChargeAutoElargissement);
ostream.write_boolean (value.termesNonHydrostatiques);
- org.fudaa.dodico.corba.mascaret.SParametresNumCasierHelper.write (ostream, value.parametresNumeriqueCasier);
+// org.fudaa.dodico.corba.mascaret.SParametresNumCasierHelper.write (ostream, value.parametresNumeriqueCasier);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-23 19:35:10
|
Revision: 8853
http://sourceforge.net/p/fudaa/svn/8853
Author: deniger
Date: 2014-09-23 19:35:08 +0000 (Tue, 23 Sep 2014)
Log Message:
-----------
xcas au lancement du calcul + corrections fiichiers xcas
Modified Paths:
--------------
trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java
Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java 2014-09-23 19:34:53 UTC (rev 8852)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/boony/BoonyDeserializerHandler.java 2014-09-23 19:35:08 UTC (rev 8853)
@@ -36,6 +36,7 @@
* @version $Id: BoonyDeserializerHandler.java,v 1.21 2008-02-11 10:11:50 jm_lacombe Exp $
*/
public class BoonyDeserializerHandler implements ContentHandler, BoonyDeserializerHandlerInterface {
+
private final Stack arrays_;
// Map options_ = new Properties();
@@ -59,6 +60,7 @@
private final Map typeClass_;
private final Map classNameTypeData_ = new TreeMap();
+ private boolean ignoreInexistantFields;
/**
* @param _containsCorbaObject true si des objets corba sont utilisees
@@ -87,9 +89,20 @@
typeClass_.put("double", Double.TYPE);
typeClass_.put("void", Void.TYPE);
typeClass_.put("String", String.class);
+ }
+ public boolean isIgnoreInexistantFields() {
+ return ignoreInexistantFields;
}
+ /**
+ *
+ * @param ignoreInexistantFields true is pas de warning lorsqu'un champ inconnu est rencontr\xE9
+ */
+ public void setIgnoreInexistantFields(boolean ignoreInexistantFields) {
+ this.ignoreInexistantFields = ignoreInexistantFields;
+ }
+
private Class getClass(final String _className) throws ClassNotFoundException {
TypeData d = (TypeData) classNameTypeData_.get(_className);
if (d == null) {
@@ -193,7 +206,8 @@
data_.append(_ch, _start, _length);
}
- public void endDocument() throws SAXException {}
+ public void endDocument() throws SAXException {
+ }
public void endElement(final String _namespaceURI, final String _localName, final String _element) throws SAXException {
if (isTypeArrayByte_ || isTypeArrayDouble_) {
@@ -202,9 +216,9 @@
}
final String data = data_.toString().trim();
- /* if (data.length() > 0) {
- trace(data);
- }*/
+ /* if (data.length() > 0) {
+ trace(data);
+ }*/
if ("yapod".equals(_element)) {
// la base
@@ -256,7 +270,7 @@
if (data_.length() > tailleStringBuffer) {
// data_ = null;
//a laisser ?
- // System.gc();
+ // System.gc();
data_ = new StringBuffer(tailleStringBuffer);
}
}
@@ -296,10 +310,10 @@
o = BoonyLib.fromXmlCharset(_data);
} else { // Number
try {
- final Constructor x = c.getDeclaredConstructor(new Class[] { String.class });
+ final Constructor x = c.getDeclaredConstructor(new Class[]{String.class});
x.setAccessible(true);
// YapodLib.setAccessible(x, true);
- o = x.newInstance(new Object[] { _data });
+ o = x.newInstance(new Object[]{_data});
} catch (final NoSuchMethodException ex) {
BoonyLib.warning("constructor(string) not found for class " + singleClass_);
} catch (final IllegalAccessException ex) {
@@ -317,31 +331,31 @@
private void endElementTypeArray() {
if (isTypeArrayByte_) {
- singles_.add(BoonyBase64.decode(data_.toString().getBytes()));
- isTypeArrayByte_ = false;
- }
- else if (isTypeArrayDouble_) {
- singles_.add(decodeArrayDouble(data_.toString()));
- isTypeArrayDouble_ = false;
+ singles_.add(BoonyBase64.decode(data_.toString().getBytes()));
+ isTypeArrayByte_ = false;
+ } else if (isTypeArrayDouble_) {
+ singles_.add(decodeArrayDouble(data_.toString()));
+ isTypeArrayDouble_ = false;
}
if (data_.length() > tailleStringBuffer) {
// data_ = null;
- // System.gc();
- data_ = new StringBuffer(tailleStringBuffer);
+ // System.gc();
+ data_ = new StringBuffer(tailleStringBuffer);
}
}
private final static double[] decodeArrayDouble(final String _tab) {
- final StringTokenizer stk = new StringTokenizer(_tab," ");
- TDoubleArrayList liste = new TDoubleArrayList(_tab.length()/5);
- while(stk.hasMoreElements()) {
+ final StringTokenizer stk = new StringTokenizer(_tab, " ");
+ TDoubleArrayList liste = new TDoubleArrayList(_tab.length() / 5);
+ while (stk.hasMoreElements()) {
liste.add(Double.parseDouble(stk.nextToken()));
}
return liste.toNativeArray();
}
- public void endPrefixMapping(final String _prefix) throws SAXException {}
+ public void endPrefixMapping(final String _prefix) throws SAXException {
+ }
public Object getFirstObject() {
if (singles_.size() == 0) {
@@ -355,21 +369,27 @@
return getFinalObjectToSet(r);
}
- public void ignorableWhitespace(final char[] _ch, final int _start, final int _length) throws SAXException {}
+ public void ignorableWhitespace(final char[] _ch, final int _start, final int _length) throws SAXException {
+ }
- public void processingInstruction(final String _target, final String _data) throws SAXException {}
+ public void processingInstruction(final String _target, final String _data) throws SAXException {
+ }
- public void setDocumentLocator(final Locator _locator) {}
+ public void setDocumentLocator(final Locator _locator) {
+ }
- public void skippedEntity(final String _name) throws SAXException {}
+ public void skippedEntity(final String _name) throws SAXException {
+ }
- public void startDocument() throws SAXException {}
+ public void startDocument() throws SAXException {
+ }
public void startElement(final String _namespaceURI, final String _toto, final String _element, final Attributes _atts) throws SAXException {
// public void startElement(String _element,AttributeList _atts) throws SAXException {
// trace(_element);
isTypeArrayByte_ = false;
- if ("yapod".equals(_element)) {} else if (("object".equals(_element)) || (isCorba_ && ("iobject".equals(_element)))) {
+ if ("yapod".equals(_element)) {
+ } else if (("object".equals(_element)) || (isCorba_ && ("iobject".equals(_element)))) {
final String type = _atts.getValue("type");
final String id = _atts.getValue("id");
Object o = nullValue_;
@@ -389,21 +409,16 @@
startSaveObject(_element, id, o);
}
objects_.push(o);
- }
-
- else if ("field".equals(_element)) {
+ } else if ("field".equals(_element)) {
startElementField(_atts);
} else if ("array-byte".equals(_element)) {
isTypeArrayByte_ = true;
- }
- else if ("array-double".equals(_element)) {
- isTypeArrayDouble_ = true;
- }
-
- /*
+ } else if ("array-double".equals(_element)) {
+ isTypeArrayDouble_ = true;
+ } /*
* else if("array-int".equals(_element)) { }
- */
- else if ("null".equals(_element)) {} else if ("single".equals(_element)) {
+ */ else if ("null".equals(_element)) {
+ } else if ("single".equals(_element)) {
singleClass_ = _atts.getValue("type");
} else if ("array".equals(_element)) {
startElementArray(_atts);
@@ -421,7 +436,6 @@
// TMP @GDX
// if(!"".equals(data_.toString().trim()))
// warning("data should be empty: "+data_);
-
// Slow on 1.4
// data_.setLength(0);
// Change to:
@@ -468,7 +482,7 @@
fields_.push(f);
singles_ = new ArrayList();
- if (f == null) {
+ if (f == null && !ignoreInexistantFields) {
FuLog.error("### field " + name + " removed in " + objects_.peek().getClass());
}
}
@@ -484,11 +498,15 @@
private Object startCreateObject(final String _type, final Object _o, final Class _c) {
Object o = _o;
try {
- final Constructor x = _c.getDeclaredConstructor(new Class[] {});
+ final Constructor x = _c.getDeclaredConstructor(new Class[]{});
x.setAccessible(true);
- o = x.newInstance(new Object[] {});
- // trace(o);
- } catch (final NoSuchMethodException ex) {} catch (final IllegalAccessException ex) {} catch (final InstantiationException ex) {} catch (final InvocationTargetException ex) {}
+ o = x.newInstance(new Object[]{});
+ // trace(o);
+ } catch (final NoSuchMethodException ex) {
+ } catch (final IllegalAccessException ex) {
+ } catch (final InstantiationException ex) {
+ } catch (final InvocationTargetException ex) {
+ }
// CORBA Enum ?
if (o == nullValue_) {
@@ -507,9 +525,9 @@
/**
* @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
*/
- public void startPrefixMapping(final String _prefix, final String _uri) throws SAXException {}
+ public void startPrefixMapping(final String _prefix, final String _uri) throws SAXException {
+ }
-
/**
* utilise une map interne pour enregistrer l'etat d'une classe.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-17 20:42:51
|
Revision: 8851
http://sourceforge.net/p/fudaa/svn/8851
Author: deniger
Date: 2014-09-17 20:42:47 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
xcas au lancement du calcul
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DCalculMascaret.java
Removed Paths:
-------------
trunk/soft/fudaa-mascaret/distrib/build.xml
Deleted: trunk/soft/fudaa-mascaret/distrib/build.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/build.xml 2014-09-17 20:08:25 UTC (rev 8850)
+++ trunk/soft/fudaa-mascaret/distrib/build.xml 2014-09-17 20:42:47 UTC (rev 8851)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-! @creation 2002-04-05
-! @modification $Date$
-! @license GNU General Public License 2
-! @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version $Id$
-! @author Fred deniger
-!
-! build permettant de construire le jar
--->
-<project name="mascaret" default="izpack" basedir=".">
- <taskdef name="izpack" classpath="src/dist/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
-
- <target name="izpack" description="cree installeur izpack">
- <!--F.Deniger: j'ai comment\xE9 ce point car je ne vois pas \xE0 quoi sert le jar serveurs.jar-->
- <!--<delete file="target/serveurs.jar" />-->
- <delete file="target/fudaa-mascaret.jar" failonerror="false"/>
- <delete file="src/dist/izpack/izpack_fudaa_mascaret_version.xml" failonerror="false"/>
- <echo>basedir=${basedir}</echo>
- <echo>project version=${project.version}</echo>
- <echo>creation date=${timestamp}</echo>
- <copy file="target/mascaret-distrib-${project.version}-all.jar" tofile="target/fudaa-mascaret.jar"/>
- <!--F.Deniger: j'ai comment\xE9 ce point car je ne vois pas \xE0 quoi sert le jar serveurs.jar-->
- <!--<jar destfile="target/serveurs.jar" basedir="../../fudaa" includes="serveurs/mascaret/**" />-->
- <copy file="src/dist/izpack/izpack_fudaa_mascaret.xml" tofile="src/dist/izpack/izpack_fudaa_mascaret_version.xml" filtering="true">
- <filterset>
- <filter token="project.version" value="${project.version}"/>
- <filter token="timestamp" value="${timestamp}"/>
- </filterset>
- </copy>
- <izpack input="${basedir}/src/dist/izpack/izpack_fudaa_mascaret_version.xml" output="${basedir}/target/Fudaa_Mascaret${project.version}_Setup.jar" basedir="${basedir}/src/dist" />
- <delete file="src/dist/izpack/izpack_fudaa_mascaret_version.xml" failonerror="false"/>
- <delete file="target/fudaa-mascaret.jar" failonerror="false"/>
- </target>
-</project>
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DCalculMascaret.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DCalculMascaret.java 2014-09-17 20:08:25 UTC (rev 8850)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/DCalculMascaret.java 2014-09-17 20:42:47 UTC (rev 8851)
@@ -62,6 +62,7 @@
private CExec execCalculEnCours;
private final static String SOUS_REP_5_2 = "mascaret_5_2";
private final static String SOUS_REP_7_0 = "mascaret_7_0";
+ private final static String SOUS_REP_8_0 = "mascaret_8_0";
public DCalculMascaret() {
super();
@@ -128,11 +129,11 @@
if (!etatCalcul_.equals("calcul")) {
return strOperation_;
} else {
- String sousRep = SOUS_REP_7_0;
+ String sousRep = SOUS_REP_8_0;
if (noyau5_2_) {
sousRep = SOUS_REP_5_2;
} else {
- sousRep = SOUS_REP_7_0;
+ sousRep = SOUS_REP_8_0;
}
File controle = new File(cheminServeur() + sousRep + File.separator + "Controle.txt");
if (!controle.exists()) {
@@ -141,12 +142,12 @@
} else {
try {
- String res =
- CtuluLibFile.litFichierTexte(
- controle,
- controle.length(),
- false,
- false);
+ String res
+ = CtuluLibFile.litFichierTexte(
+ controle,
+ controle.length(),
+ false,
+ false);
if (res != null) {
int index = res.indexOf("CALCUL");
if (index != -1) {
@@ -164,7 +165,6 @@
long estimationDureeFinCalcul = (long) estimationDureeDouble;
String estimationFormate = formatTemps(estimationDureeFinCalcul);
-
setProgression(bcalage_ ? getS("Calcul calage") + "..."
: getS("Calcul") + "..." + pourcentBorne + "% " + getS("Temps \xE9coul\xE9") + " : " + tpsEcouleFormate
+ " " + getS("Dur\xE9e estim\xE9e") + " : " + estimationFormate, pourcentBorne);
@@ -239,29 +239,29 @@
String os = System.getProperty("os.name");
//String drive;
String path = cheminServeur();
- String sousRep = SOUS_REP_7_0;
+ String sousRep = SOUS_REP_8_0;
if (noyau5_2_) {
path = path + SOUS_REP_5_2 + File.separator;
sousRep = SOUS_REP_5_2;
} else {
- path = path + SOUS_REP_7_0 + File.separator;
- sousRep = SOUS_REP_7_0;
+ path = path + SOUS_REP_8_0 + File.separator;
+ sousRep = SOUS_REP_8_0;
}
String nomEtude = "mascaret" + noEtude;
setProgression("Ecriture des fichiers param\xE8tres", 0);
System.out.println("Ecriture des fichiers parametres");
//XCAS start
-// File ficXCAS = getFichier(c, ".xcas", sousRep);
-// if (ficXCAS.exists()) {
-// ficXCAS.delete();
-// }
+ File ficXCAS = getFichier(c, ".xcas", sousRep);
+ if (ficXCAS.exists()) {
+ ficXCAS.delete();
+ }
//XCAS end
//ici on \xE9crit dans le dossier temporaire de Fudaa
- File ficCAS = getFichier(c, ".cas", sousRep);
- if (ficCAS.exists()) {
- ficCAS.delete();
- }
- ficCAS.getParentFile().mkdirs();
+// File ficCAS = getFichier(c, ".cas", sousRep);
+// if (ficCAS.exists()) {
+// ficCAS.delete();
+// }
+ ficXCAS.getParentFile().mkdirs();
File ficGEO = getFichier(c, ".geo", sousRep);
if (ficGEO.exists()) {
ficGEO.delete();
@@ -406,10 +406,7 @@
if (bInterrompu_) {
return;
}
- //XCAS start
-// DParametresMascaret.ecritParametresXCAS(ficXCAS, params.parametresCAS());
- //XCAS end
- DParametresMascaret.ecritParametresCAS(ficCAS, params.parametresCAS());
+ DParametresMascaret.ecritParametresXCAS(ficXCAS, params.parametresCAS());
setProgression("Ecriture des fichiers param\xE8tres", 55);
if (bInterrompu_) {
return;
@@ -587,8 +584,8 @@
if (ficDamocles.exists()) {
results.resultatsDAMOC(
DResultatsMascaret.litResultatsDAMOC(
- ficDamocles,
- t.maxListingDamocles));
+ ficDamocles,
+ t.maxListingDamocles));
long tailleMaxOctet = Math.round(t.maxListingDamocles * 1024);
long tailleFichier = ficDamocles.length();
if (tailleFichier > tailleMaxOctet) {
@@ -603,8 +600,8 @@
+ " est trop volumineux : "
+ (tailleFichier / 1024)
+ "Ko.\n";
- messagesAvertissements_ +=
- "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ messagesAvertissements_
+ += "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ h
+ ".\n\n";
}
@@ -631,8 +628,8 @@
+ " est trop volumineux : "
+ (tailleFichier / 1024)
+ "Ko.\n";
- messagesAvertissements_ +=
- "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ messagesAvertissements_
+ += "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ h
+ ".\n\n";
}
@@ -660,8 +657,8 @@
+ " est trop volumineux : "
+ (tailleFichier / 1024)
+ "Ko.\n";
- messagesAvertissements_ +=
- "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ messagesAvertissements_
+ += "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ h
+ ".\n\n";
}
@@ -694,7 +691,7 @@
} else {
SResultatsTemporelSpatial sres = DResultatsMascaret.
litResultatsCalAuto(ficCalOPT, t.maxResultatOpthyca,
- DResultatsMascaret.OPTYCA);
+ DResultatsMascaret.OPTYCA);
results.resultatsCalAuto(sres);
}
} else {
@@ -717,8 +714,8 @@
+ " est trop volumineux : "
+ (tailleFichier / 1024)
+ "Ko.\n";
- messagesAvertissements_ +=
- "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ messagesAvertissements_
+ += "Lecture de la fin du fichier, pour le r\xE9cup\xE9rer enti\xE8rement, veuillez le copier \xE0 partir de la machine "
+ h
+ ".\n\n";
}
@@ -731,7 +728,6 @@
results.resultatsTracerLIS(null);
}
-
if (bInterrompu_ && !bRecupererResultats_) {
return;
}
@@ -740,8 +736,8 @@
long tailleMaxOctet = Math.round(t.maxResultatOpthycaTracer * 1024);
long tailleFichier = ficTraOPT.length();
if (tailleFichier > tailleMaxOctet) {
- messagesAvertissements_ +=
- "Le fichier r\xE9sultat Opthyca de la qualit\xE9 d'eau : "
+ messagesAvertissements_
+ += "Le fichier r\xE9sultat Opthyca de la qualit\xE9 d'eau : "
+ ficOPT.getAbsolutePath()
+ " est trop volumineux : "
+ (tailleFichier / 1024)
@@ -753,15 +749,15 @@
SResultatsTemporelSpatial sres = DResultatsMascaret.
litResultatsTracer(ficTraOPT,
- t.maxResultatOpthycaTracer, DResultatsMascaret.OPTYCA);
+ t.maxResultatOpthycaTracer, DResultatsMascaret.OPTYCA);
results.resultatsTracer(sres);
}
} else if (ficTraRUB.exists()) {
long tailleMaxOctet = Math.round(t.maxResultatRubensTracer * 1024);
long tailleFichier = (ficTraRUB.length() / 1024) + 1;
if (tailleFichier > tailleMaxOctet) {
- messagesAvertissements_ +=
- "Le fichier r\xE9sultat Opthyca de la qualit\xE9 d'eau : "
+ messagesAvertissements_
+ += "Le fichier r\xE9sultat Opthyca de la qualit\xE9 d'eau : "
+ ficOPT.getAbsolutePath()
+ " est trop volumineux : "
+ (tailleFichier / 1024)
@@ -773,7 +769,7 @@
SResultatsTemporelSpatial sres = DResultatsMascaret.
litResultatsTracer(ficTraRUB,
- t.maxResultatRubensTracer, DResultatsMascaret.RUBENS);
+ t.maxResultatRubensTracer, DResultatsMascaret.RUBENS);
results.resultatsTracer(sres);
}
} else {
@@ -805,8 +801,8 @@
} else {
results.resultatsREP(
DResultatsMascaret.litResultatsREP(
- ficEcrREP,
- t.maxResultatReprise));
+ ficEcrREP,
+ t.maxResultatReprise));
}
} else {
results.resultatsREP(null);
@@ -835,7 +831,7 @@
} else {
SResultatsTemporelSpatial sres = DResultatsMascaret.
litResultatsTemporelSpatial(ficOPT, t.maxResultatOpthyca,
- DResultatsMascaret.OPTYCA);
+ DResultatsMascaret.OPTYCA);
sres.resultatsPermanent = params.parametresCAS().parametresGen.code == 1;
results.resultatsTemporelSpatial(sres);
// results.resultatsOPT(
@@ -996,12 +992,10 @@
System.err.println("Interruption du calcul par l'utilisateur avant le d\xE9but du calcul ! ");
messagesAvertissements_ += "Interruption du calcul par l'utilisateur avant le d\xE9but du calcul !\n\n";
-
} else if (etatCalcul_.equals("calcul")) {
System.err.println("Interruption du calcul par l'utilisateur ! (" + strOperation_.pourcentage + "% effectu\xE9)");
messagesAvertissements_ += "Interruption du calcul par l'utilisateur !(" + strOperation_.pourcentage + "% effectu\xE9)\n\n";
-
}
if (execCalculEnCours != null) {
execCalculEnCours.getProcess().destroy();
@@ -1010,7 +1004,6 @@
}
//JOptionPane.showMessageDialog(null,"cbResultat="+bRecupererResultats_);
-
}
@Override
@@ -1044,8 +1037,7 @@
/**
* Cree une connexion pour la IPersonne _p en faisant appel a la methode mere de DTache. Si la connexion est correcte (non nulle), des instances de
- * IParametres et de IResultats sont crees et referencees dans la hashtable
- * <code>donnees_</code>.
+ * IParametres et de IResultats sont crees et referencees dans la hashtable <code>donnees_</code>.
*
* @return IConnexion cree par DTache.connexion(_p)
* @see org.fudaa.dodico.objet.DTache
@@ -1056,16 +1048,13 @@
try {
// Dans tous les cas (JavaWebStart ou pas), on copie les ex\xE9cutables dans le r\xE9pertoire temporaire pour \xE9viter
// des probl\xE8mes de droits d'\xE9criture.
- String cheminTmp=cheminTmp();
+ String cheminTmp = cheminTmp();
// cr\xE9ation, si n\xE9cessaire, des r\xE9pertoires <tmp>\mascaret\mascaret_5_2 et <tmp>\mascaret\mascaret_7_0
// dans le r\xE9pertoire temporaire
- String cheminNoyau5_2 = cheminTmp + File.separatorChar + SOUS_REP_5_2;
- String cheminNoyau7_0 = cheminTmp + File.separatorChar + SOUS_REP_7_0;
- File repNoyau5_2 = new File(cheminNoyau5_2);
- repNoyau5_2.mkdirs();
- File repNoyau6_1 = new File(cheminNoyau7_0);
- repNoyau6_1.mkdirs();
+ new File(cheminTmp + File.separatorChar + SOUS_REP_5_2).mkdirs();
+ new File(cheminTmp + File.separatorChar + SOUS_REP_7_0).mkdirs();
+ new File(cheminTmp + File.separatorChar + SOUS_REP_8_0).mkdirs();
// les fichiers n\xE9cessaires pour le noyau 5.2
copieResource(cheminTmp, SOUS_REP_5_2 + File.separatorChar + "Abaques.txt");
@@ -1075,12 +1064,15 @@
copieResource(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "Abaques.txt");
copieResource(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "dico.txt");
copieResource(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "dico_sans_calage.txt");
- copieResource(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "mascaret.exe");
- copieResource(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "mascaret");
-
+
+ // les fichiers n\xE9cessaires pour le noyau 8.0
+ copieResource(cheminTmp, SOUS_REP_8_0 + File.separatorChar + "Abaques.txt");
+ copieResource(cheminTmp, SOUS_REP_8_0 + File.separatorChar + "mascaret.exe");
+ copieResource(cheminTmp, SOUS_REP_8_0 + File.separatorChar + "mascaret");
+
// On rend les exes executables.
- new File(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "mascaret.exe").setExecutable(true);
- new File(cheminTmp, SOUS_REP_7_0 + File.separatorChar + "mascaret") .setExecutable(true);
+ new File(cheminTmp, SOUS_REP_8_0 + File.separatorChar + "mascaret.exe").setExecutable(true);
+ new File(cheminTmp, SOUS_REP_8_0 + File.separatorChar + "mascaret").setExecutable(true);
System.setProperty("FUDAA_SERVEUR", cheminTmp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-17 20:08:33
|
Revision: 8850
http://sourceforge.net/p/fudaa/svn/8850
Author: deniger
Date: 2014-09-17 20:08:25 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml 2014-09-17 13:05:36 UTC (rev 8849)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml 2014-09-17 20:08:25 UTC (rev 8850)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<langpack>
- <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret ne peut être installé que sur un machine 64 bits"/>
+ <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret ne peut être installé que sur un machine 64 bits et une version 64 bits de java est nécessaire."/>
<str id="data.validation.error.title" txt="Installation impossible"/>
</langpack>
\ No newline at end of file
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml 2014-09-17 13:05:36 UTC (rev 8849)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml 2014-09-17 20:08:25 UTC (rev 8850)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<langpack>
- <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret requires a 64 bits OS"/>
+ <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret requires a 64 bits OS and a Java 64 bits version."/>
<str id="data.validation.error.title" txt="Installation can't be done"/>
</langpack>
\ No newline at end of file
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml 2014-09-17 13:05:36 UTC (rev 8849)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml 2014-09-17 20:08:25 UTC (rev 8850)
@@ -155,7 +155,7 @@
<file os="windows" src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
<parsable os="windows" type="shell" targetfile="$INSTALL_PATH/fudaa-mascaret.bat" />
<executable os="windows" targetfile="$INSTALL_PATH/fudaa-mascaret.bat" />
- <executable os="windows" targetfile="$INSTALL_PATH/serveurs/mascaret/mascaret_7_0/mascaret.exe" />
+ <executable os="windows" targetfile="$INSTALL_PATH/serveurs/mascaret/mascaret_8_0/mascaret.exe" />
<fileset os="unix" dir="icons" targetdir="$INSTALL_PATH/icons">
@@ -169,7 +169,7 @@
<file os="unix" src="fudaa-mascaret.sh" targetdir="$INSTALL_PATH" />
<parsable os="unix" type="shell" targetfile="$INSTALL_PATH/fudaa-mascaret.sh" />
<executable os="unix" targetfile="$INSTALL_PATH/fudaa-mascaret.sh" />
- <executable os="unix" targetfile="$INSTALL_PATH/serveurs/mascaret/mascaret_7_0/mascaret" />
+ <executable os="unix" targetfile="$INSTALL_PATH/serveurs/mascaret/mascaret_8_0/mascaret" />
</pack>
<pack name="Exemples" required="no">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 23:33:52
|
Revision: 8845
http://sourceforge.net/p/fudaa/svn/8845
Author: deniger
Date: 2014-09-16 23:33:49 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/pom.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml
Added Paths:
-----------
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml
Removed Paths:
-------------
trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/standalone-compiler.jar
Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml 2014-09-16 20:27:17 UTC (rev 8844)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml 2014-09-16 23:33:49 UTC (rev 8845)
@@ -11,6 +11,8 @@
<artifactId>mascaret-distrib</artifactId>
<properties>
<project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ <info.appversion>${project.version}</info.appversion>
+
</properties>
<dependencies>
@@ -45,6 +47,8 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>fudaa-mascaret</finalName>
<archive>
<manifest>
<mainClass>org.fudaa.fudaa.mascaret.Mascaret</mainClass>
@@ -58,21 +62,42 @@
<executions>
<!--pour etre utiliser dans le build normal-->
<execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
+ <!--this is used for inheritance merges-->
+ <id>make-assembly</id>
+ <!--bind to the packaging phase-->
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
+
<plugin>
-
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-maven-plugin</artifactId>
+ <version>5.0.0-rc3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>izpack</goal>
+ </goals>
+ <configuration>
+ <output>${project.build.directory}/Fudaa-Mascaret-${project.version}-installer.jar</output>
+ <installFile>${basedir}/src/dist/izpack/izpack_fudaa_mascaret.xml</installFile>
+ <baseDir>${basedir}/src/dist/</baseDir>
+ <mkdirs>true</mkdirs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>izpack</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
+ <id>izpack</id> this is used for inheritance merges
+ <phase>package</phase> bind to the packaging phase
<goals>
<goal>run</goal>
</goals>
@@ -86,7 +111,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
</build>
</profile>
Added: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml (rev 0)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml 2014-09-16 23:33:49 UTC (rev 8845)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<langpack>
+ <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret ne peut être installé que sur un machine 64 bits"/>
+ <str id="data.validation.error.title" txt="Installation impossible"/>
+</langpack>
\ No newline at end of file
Added: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml (rev 0)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml 2014-09-16 23:33:49 UTC (rev 8845)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<langpack>
+ <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret requires a 64 bits OS"/>
+ <str id="data.validation.error.title" txt="Installation can't be done"/>
+</langpack>
\ No newline at end of file
Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml 2014-09-16 20:27:17 UTC (rev 8844)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml 2014-09-16 23:33:49 UTC (rev 8845)
@@ -8,7 +8,11 @@
- call "compile ../sample/install.xml -b ../sample"
-->
-<installation version="1.0">
+<izpack:installation version="5.0"
+ xmlns:izpack="http://izpack.org/schema/installation"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
+
<!--
The info section.
The meaning of the tags should be natural ...
@@ -17,9 +21,11 @@
<info>
<appname>Fudaa-Mascaret</appname>
<!--@project.version@ sera remplacé par version utilisé dans le pom-->
- <appversion>@project.version@</appversion>
+ <!--<appversion>@project.version@</appversion>-->
+ <appversion>@{info.appversion}</appversion>
<!--@timestamp@ sera remplacé par la date du jour-->
- <variable name="released-on" value="@timestamp@" />
+ <!--<variable name="released-on" value="@timestamp@" />-->
+ <variable name="released-on" value="@{timestamp}" />
<authors>
<author name="EDF Recherche et Developpement" email=""/>
<author name="CEREMA" email="" />
@@ -27,34 +33,54 @@
<!-- Necessaire pour pouvoir acceder au registre et au répertoire program -->
<run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7"/>
<url>http://www.openmascaret.org</url>
+
</info>
+
+ <dynamicvariables>
+ <variable name="osArch" value="${SYSTEM[os.arch]}" checkonce="true"/>
+</dynamicvariables>
<variables>
<!-- Clé de registre pour les associations de fichiers -->
<variable name="regkey" value="Fudaa.Mascaret" />
+ <!--<variable name="osArch" value="x64" />-->
</variables>
+
+
+
+ <conditions>
+ <condition type="contains" id="conditionvalidator.isX64">
+ <variable>osArch</variable>
+ <value>64</value>
+ </condition>
+ </conditions>
+
- <!-- Pour les raccourcis -->
- <native type="izpack" name="ShellLink.dll">
- <os arch="i386" family="windows" />
- </native>
- <native type="izpack" name="ShellLink_x64.dll">
- <os arch="x64" family="windows" />
- </native>
+ <natives>
+ <!-- Pour les raccourcis -->
+ <native type="izpack" name="ShellLink.dll">
+ <os arch="i386" family="windows" />
+ </native>
+ <native type="izpack" name="ShellLink_x64.dll">
+ <os arch="x64" family="windows" />
+ </native>
+ <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+ <os family="windows" />
+ </native>
+ <native type="3rdparty" name="COIOSHelper_x64.dll" stage="both">
+ <os arch="x64" family="windows" />
+ </native>
+ </natives>
<!-- Enregistrement des clés de registre -->
<listeners>
- <listener installer="RegistryInstallerListener"
- uninstaller="RegistryUninstallerListener" >
+ <listener classname="RegistryInstallerListener" stage="install">
<os family="windows" />
</listener>
+ <listener classname="RegistryUninstallerListener" stage="uninstall">
+ <os family="windows" />
+ </listener>
</listeners>
- <native type="3rdparty" name="COIOSHelper.dll" stage="both">
- <os family="windows" />
- </native>
- <native type="3rdparty" name="COIOSHelper_x64.dll" stage="both">
- <os arch="x64" family="windows" />
- </native>
<!--
The gui preferences indication.
@@ -86,6 +112,8 @@
<res src="Readme.txt" id="InfoPanel.info_eng" />
<res src="fudaamascaret.jpg" id="Installer.image" />
<res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml" />
+ <res src="izpack/customLangPack_eng.xml" id="CustomLangPack.xml_eng"/>
+ <res src="izpack/customLangPack.xml" id="CustomLangPack.xml" />
</resources>
<!--
@@ -94,8 +122,11 @@
-->
<panels>
- <panel classname="CheckedHelloPanel" />
- <panel classname="InfoPanel" />
+ <panel classname="InfoPanel">
+ <validator classname="com.izforge.izpack.installer.validator.ConditionValidator"/>
+ </panel>
+ <panel classname="CheckedHelloPanel">
+ </panel>
<panel classname="LicencePanel" />
<panel classname="TargetPanel" />
<panel classname="PacksPanel" />
@@ -112,25 +143,13 @@
<pack name="Core" required="yes">
<description>L'application de base integrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
<file src="../../target/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
-
- <!-- file src="../../aide/src/mascaret" excludes="**/.svn/**" targetdir="$INSTALL_PATH/aide/src" / -->
- <!--aide non a jour donc enlevée-->
- <!--<fileset dir="../../aide/src/mascaret" targetdir="$INSTALL_PATH/aide/src/mascaret">-->
- <!-- <include name="**/*.html"/>
- <include name="**/*.htm"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>-->
-
<fileset os="windows" dir="icons" targetdir="$INSTALL_PATH/icons">
<include name="*.ico"/>
</fileset>
<!--un dossier fudaa doit exister au meme niveau que le dossier "fudaa-mascaret"-->
<fileset os="windows" dir="../../../../fudaa/serveurs" targetdir="$INSTALL_PATH/serveurs">
- <exclude name="mascaret/*/mascaret" />
+ <exclude name="mascaret/*/mascaret" />
</fileset>
<!-- Lancement de secours si les raccourcis ne fonctionnent pas -->
<file os="windows" src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
@@ -144,7 +163,7 @@
</fileset>
<!--un dossier fudaa doit exister au meme niveau que le dossier "fudaa-mascaret"-->
<fileset os="unix" dir="../../../../fudaa/serveurs" targetdir="$INSTALL_PATH/serveurs">
- <exclude name="mascaret/*/mascaret.exe" />
+ <exclude name="mascaret/*/mascaret.exe" />
</fileset>
<!-- Lancement de secours si les raccourcis ne fonctionnent pas -->
<file os="unix" src="fudaa-mascaret.sh" targetdir="$INSTALL_PATH" />
@@ -172,21 +191,10 @@
<pack name="Docs" required="no">
<description>Le guide de prise en main de Fudaa-Mascaret</description>
- <!-- file src="doc" excludes=".svn" targetdir="$INSTALL_PATH" / --> <!-- Reccursive adding -->
<fileset dir="doc" targetdir="$INSTALL_PATH/doc">
<include name="**/*.pdf"/>
</fileset>
</pack>
- <!-- <pack name="Sources" required="no">
- <description>Le code source du projet Fudaa</description>
- <fileset dir="../.." targetdir="$INSTALL_PATH/src">
- <include name="ctulu/src/**/*.*"/>
- <include name="dodico/idl/**/*.*" />
- <include name="dodico/src/**/*.*" />
- <include name="ebli/src/**/*.*" />
- <include name="fudaa/src/**/*.*" />
- </fileset>
- </pack>-->
</packs>
-</installation>
+</izpack:installation>
\ No newline at end of file
Deleted: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/standalone-compiler.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 20:27:27
|
Revision: 8844
http://sourceforge.net/p/fudaa/svn/8844
Author: deniger
Date: 2014-09-16 20:27:17 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/pom/soft-pom/pom.xml
trunk/pom/super-pom/pom.xml
Modified: trunk/pom/soft-pom/pom.xml
===================================================================
--- trunk/pom/soft-pom/pom.xml 2014-09-16 20:26:59 UTC (rev 8843)
+++ trunk/pom/soft-pom/pom.xml 2014-09-16 20:27:17 UTC (rev 8844)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
Modified: trunk/pom/super-pom/pom.xml
===================================================================
--- trunk/pom/super-pom/pom.xml 2014-09-16 20:26:59 UTC (rev 8843)
+++ trunk/pom/super-pom/pom.xml 2014-09-16 20:27:17 UTC (rev 8844)
@@ -5,7 +5,7 @@
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
<packaging>pom</packaging>
- <version>1.5</version>
+ <version>1.6</version>
<name>Super Pom</name>
<url>http://fudaa.fr</url>
<properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 20:27:07
|
Revision: 8843
http://sourceforge.net/p/fudaa/svn/8843
Author: deniger
Date: 2014-09-16 20:26:59 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/pom/business-pom/pom.xml
Modified: trunk/pom/business-pom/pom.xml
===================================================================
--- trunk/pom/business-pom/pom.xml 2014-09-16 20:26:37 UTC (rev 8842)
+++ trunk/pom/business-pom/pom.xml 2014-09-16 20:26:59 UTC (rev 8843)
@@ -8,7 +8,7 @@
-->
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<properties>
<businessGroupId>org.fudaa.business</businessGroupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 20:26:40
|
Revision: 8842
http://sourceforge.net/p/fudaa/svn/8842
Author: deniger
Date: 2014-09-16 20:26:37 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/business/fudaa-common-corba/pom.xml
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2014-09-16 20:26:26 UTC (rev 8841)
+++ trunk/business/fudaa-common-corba/pom.xml 2014-09-16 20:26:37 UTC (rev 8842)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <dodico-corba.version>1.2</dodico-corba.version>
+ <dodico-corba.version>1.3-SNAPSHOT</dodico-corba.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>fudaa-common-corba</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 20:26:34
|
Revision: 8841
http://sourceforge.net/p/fudaa/svn/8841
Author: deniger
Date: 2014-09-16 20:26:26 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2014-09-16 19:54:36 UTC (rev 8840)
+++ trunk/business/dodico-corba/pom.xml 2014-09-16 20:26:26 UTC (rev 8841)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.4</fudaa-framework.version>
+ <fudaa-framework.version>1.6-SNAPSHOT</fudaa-framework.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-09-16 19:54:43
|
Revision: 8840
http://sourceforge.net/p/fudaa/svn/8840
Author: deniger
Date: 2014-09-16 19:54:36 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
shortucts
Modified Paths:
--------------
trunk/framework/pom.xml
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2014-09-16 09:18:17 UTC (rev 8839)
+++ trunk/framework/pom.xml 2014-09-16 19:54:36 UTC (rev 8840)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 22:01:41
|
Revision: 8803
http://sourceforge.net/p/fudaa/svn/8803
Author: deniger
Date: 2014-07-09 22:01:28 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
shortucts
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-07-09 21:51:46 UTC (rev 8802)
+++ trunk/soft/fudaa-crue/pom.xml 2014-07-09 22:01:28 UTC (rev 8803)
@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaCompiler>1.7</javaCompiler>
<targetJdk>1.7</targetJdk>
- <fudaa-sig.version>1.5-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.5</fudaa-sig.version>
<netbeans.run.params.ide/>
<netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
<!--<netbeans.version>RELEASE731</netbeans.version>-->
@@ -343,6 +343,7 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:51:48
|
Revision: 8802
http://sourceforge.net/p/fudaa/svn/8802
Author: deniger
Date: 2014-07-09 21:51:46 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:51:34 UTC (rev 8801)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:51:46 UTC (rev 8802)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
@@ -59,8 +59,8 @@
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</developerConnection>
+ <url>https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</url>
</scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:51:42
|
Revision: 8801
http://sourceforge.net/p/fudaa/svn/8801
Author: deniger
Date: 2014-07-09 21:51:34 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] copy for tag fudaa-sig-1.5
Added Paths:
-----------
tags/business/fudaa-sig-1.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:51:24
|
Revision: 8800
http://sourceforge.net/p/fudaa/svn/8800
Author: deniger
Date: 2014-07-09 21:51:20 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-sig-1.5
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:50:26 UTC (rev 8799)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:51:20 UTC (rev 8800)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
@@ -59,8 +59,8 @@
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</developerConnection>
+ <url>https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</url>
</scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:50:34
|
Revision: 8799
http://sourceforge.net/p/fudaa/svn/8799
Author: deniger
Date: 2014-07-09 21:50:26 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
shortucts
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:47:41 UTC (rev 8798)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:50:26 UTC (rev 8799)
@@ -47,41 +47,7 @@
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.3,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -93,8 +59,8 @@
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</developerConnection>
- <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</developerConnection>
+ <url>https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</url>
</scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:47:43
|
Revision: 8798
http://sourceforge.net/p/fudaa/svn/8798
Author: deniger
Date: 2014-07-09 21:47:41 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] rollback the release of fudaa-sig-1.5
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:42:57 UTC (rev 8797)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:47:41 UTC (rev 8798)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5</version>
+ <version>1.5-SNAPSHOT</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:42:59
|
Revision: 8797
http://sourceforge.net/p/fudaa/svn/8797
Author: deniger
Date: 2014-07-09 21:42:57 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-sig-1.5
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:42:20 UTC (rev 8796)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:42:57 UTC (rev 8797)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:42:23
|
Revision: 8796
http://sourceforge.net/p/fudaa/svn/8796
Author: deniger
Date: 2014-07-09 21:42:20 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
shortucts
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:39:54 UTC (rev 8795)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:42:20 UTC (rev 8796)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5</version>
+ <version>1.5-SNAPSHOT</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-07-09 21:40:02
|
Revision: 8795
http://sourceforge.net/p/fudaa/svn/8795
Author: deniger
Date: 2014-07-09 21:39:54 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-sig-1.5
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-07-09 21:35:55 UTC (rev 8794)
+++ trunk/business/fudaa-sig/pom.xml 2014-07-09 21:39:54 UTC (rev 8795)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
@@ -91,4 +91,10 @@
</extensions>
</build>
+
+ <scm>
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</developerConnection>
+ <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.5</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
