Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-17 13:20:33
|
Revision: 5378
http://fudaa.svn.sourceforge.net/fudaa/?rev=5378&view=rev
Author: deniger
Date: 2009-10-17 13:20:23 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.0
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-17 13:16:38 UTC (rev 5377)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-17 13:20:23 UTC (rev 5378)
@@ -1,37 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <name>Core h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-gis</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <name>Core h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-17 13:16:38 UTC (rev 5377)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-17 13:20:23 UTC (rev 5378)
@@ -1,30 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <name>I/O pour h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>h2d-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-io</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <name>I/O pour h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-17 13:16:38 UTC (rev 5377)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-17 13:20:23 UTC (rev 5378)
@@ -1,46 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- 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-ef.version>1.0</fudaa-ef.version>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>0.4</version>
- </parent>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Fudaa Hydraulique 2d</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>${fudaa-ef.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-ef.version>1.0</fudaa-ef.version>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>0.4</version>
+ </parent>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.0</version>
+ <name>Fudaa Hydraulique 2d</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>${fudaa-ef.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.0</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 13:21:10
|
Revision: 5380
http://fudaa.svn.sourceforge.net/fudaa/?rev=5380&view=rev
Author: deniger
Date: 2009-10-17 13:21:02 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-17 13:20:43 UTC (rev 5379)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-17 13:21:02 UTC (rev 5380)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-17 13:20:43 UTC (rev 5379)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-17 13:21:02 UTC (rev 5380)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-17 13:20:43 UTC (rev 5379)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-17 13:21:02 UTC (rev 5380)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -41,10 +41,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:59:34
|
Revision: 5394
http://fudaa.svn.sourceforge.net/fudaa/?rev=5394&view=rev
Author: deniger
Date: 2009-10-18 18:59:28 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-18 18:59:28 UTC (rev 5394)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-18 18:59:28 UTC (rev 5394)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-18 18:59:28 UTC (rev 5394)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 19:42:50
|
Revision: 5398
http://fudaa.svn.sourceforge.net/fudaa/?rev=5398&view=rev
Author: deniger
Date: 2009-10-18 19:06:51 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-18 19:06:35 UTC (rev 5397)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-18 19:06:51 UTC (rev 5398)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-18 19:06:35 UTC (rev 5397)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-18 19:06:51 UTC (rev 5398)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-18 19:06:35 UTC (rev 5397)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-18 19:06:51 UTC (rev 5398)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -41,10 +41,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 19:42:59
|
Revision: 5396
http://fudaa.svn.sourceforge.net/fudaa/?rev=5396&view=rev
Author: deniger
Date: 2009-10-18 19:06:13 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.0
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-18 18:59:46 UTC (rev 5395)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-18 19:06:13 UTC (rev 5396)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-18 18:59:46 UTC (rev 5395)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-18 19:06:13 UTC (rev 5396)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-18 18:59:46 UTC (rev 5395)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-18 19:06:13 UTC (rev 5396)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -41,4 +41,10 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.0</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-18 21:36:18
|
Revision: 5985
http://fudaa.svn.sourceforge.net/fudaa/?rev=5985&view=rev
Author: deniger
Date: 2010-10-18 21:36:11 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIReader.java
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java 2010-10-18 00:18:17 UTC (rev 5984)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java 2010-10-18 21:36:11 UTC (rev 5985)
@@ -1,8 +1,12 @@
/*
* @creation 9 juin 2004
+ *
* @modification $Date: 2007-04-30 14:21:34 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.rubar;
@@ -305,7 +309,7 @@
// ecriture des indices errones dans le fichier de log
if (timeNotDefined.size() > 0) {
final String s = DodicoLib.getS("Des conditions limites ont \xE9t\xE9 cr\xE9\xE9es par d\xE9faut");
- _an.addError(s + CtuluLibString.LINE_SEP + DodicoLib.getS("Les indices sont dans le fichier de log"), -1);
+ _an.addWarn(s + CtuluLibString.LINE_SEP + DodicoLib.getS("Les indices sont dans le fichier de log"), -1);
CtuluLibMessage.info(s);
CtuluLibMessage.info(CtuluLibString.arrayToString(timeNotDefined.toNativeArray()));
_cliChanged[0] = true;
@@ -378,9 +382,7 @@
* @return les aretes entrantes dans l'ordre utilise par le fichier dat.
*/
protected int[] getAreteEntrante() {
- if ((externeAretes_ == null) || (externeAretes_.length == 0)) {
- return new int[0];
- }
+ if ((externeAretes_ == null) || (externeAretes_.length == 0)) { return new int[0]; }
final TIntArrayList l = new TIntArrayList(externeAretes_.length);
for (int i = 0; i < externeAretes_.length; i++) {
if (externeAretes_[i].isExternAndLiquidAndTransient(type_)) {
@@ -445,9 +447,7 @@
}
private void createDefaultCurves() {
- if (defaultEvolForConcentration_ != null) {
- return;
- }
+ if (defaultEvolForConcentration_ != null) { return; }
defaultEvolForConcentration_ = H2dRubarEvolution.createH2dRubarEvolution(H2dVariableTransType.CONCENTRATION,
new EvolutionReguliere(), this);
defaultEvolForConcentration_.setNom(H2dResource.getS("D\xE9faut"));
@@ -511,9 +511,7 @@
}
public void iterateOnTarageCurves(final H2dEvolutionUseCounter _m) {
- if (tarages_ == null) {
- return;
- }
+ if (tarages_ == null) { return; }
for (int i = 0; i < getNbBcArete(); i++) {
final int global = getGlobalIdx(i);
final EvolutionReguliereInterface evol = tarages_.getEvol(global);
@@ -648,9 +646,7 @@
public H2dRubarTimeConditionInterface[] getCliInOrder() {
H2dRubarTimeConditionInterface[] r = null;
final int[] idx = getAreteEntrante();
- if (idx == null) {
- return null;
- }
+ if (idx == null) { return null; }
r = new H2dRubarTimeConditionInterface[idx.length];
for (int i = 0; i < idx.length; i++) {
final int globalIdx = idx[i];
@@ -673,15 +669,11 @@
public boolean hasDataForCli() {
final int[] idx = getAreteEntrante();
- if (idx == null) {
- return false;
- }
+ if (idx == null) { return false; }
for (int i = 0; i < idx.length; i++) {
final int globalIdx = idx[i];
final H2dRubarBoundaryType type = g_.getRubarArete(globalIdx).getType();
- if (!H2dRubarBcTypeList.TARAGE.equals(type) && !H2dRubarBcTypeList.CRITIQUE.equals(type)) {
- return true;
- }
+ if (!H2dRubarBcTypeList.TARAGE.equals(type) && !H2dRubarBcTypeList.CRITIQUE.equals(type)) { return true; }
}
return false;
}
@@ -733,25 +725,15 @@
}
protected boolean verifyTimeData(final int[] _areteIdx, final H2dRubarBoundaryType _t, final H2dRubarTimeCondition _s) {
- if (_t.isTypeDebitGlobal()) {
- return verifyGroupDebit(_t, _s);
- }
+ if (_t.isTypeDebitGlobal()) { return verifyGroupDebit(_t, _s); }
final List l = getVariableRequired(_t);
- if ((l == null) || (l.size() == 0)) {
- return true;
- }
+ if ((l == null) || (l.size() == 0)) { return true; }
final List varNotSet = _s.isVariableRequiredSet(l);
- if (varNotSet == null) {
- return true;
- }
+ if (varNotSet == null) { return true; }
for (int i = _areteIdx.length - 1; i >= 0; i--) {
final H2dRubarTimeCondition c = (H2dRubarTimeCondition) timeCl_.get(_areteIdx[i]);
- if (c == null) {
- return false;
- }
- if (!c.isVariableSet(varNotSet)) {
- return false;
- }
+ if (c == null) { return false; }
+ if (!c.isVariableSet(varNotSet)) { return false; }
}
return true;
@@ -785,9 +767,8 @@
public CtuluPermanentList getAllTimeVar() {
if (timeVars_ == null) {
if (type_ == H2dRubarProjetType.COURANTOLOGIE_2D) {
- timeVars_ = new CtuluPermanentList(
- CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL,
- H2dVariableType.COTE_EAU }));
+ timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL,
+ H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.COTE_EAU }));
} else {
timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL,
H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.COTE_EAU, H2dVariableTransType.CONCENTRATION }));
@@ -816,9 +797,7 @@
* @return les valeurs communes a ces index
*/
public H2dRubarTimeConditionCommon getCommonTimeCondition(final int[] _ar) {
- if ((_ar == null) || (_ar.length == 0)) {
- return H2dRubarTimeConditionCommon.getEmptyCommon();
- }
+ if ((_ar == null) || (_ar.length == 0)) { return H2dRubarTimeConditionCommon.getEmptyCommon(); }
H2dRubarArete a = g_.getRubarArete(_ar[0]);
H2dRubarTimeConditionCommon r0 = null;
if (a.getType().isTypeDebitGlobal()) {
@@ -837,9 +816,7 @@
} else {
r0.keepSameEvolution((H2dRubarTimeCondition) timeCl_.get(_ar[i]));
}
- if (r0.isNothingInCommons()) {
- return r0;
- }
+ if (r0.isNothingInCommons()) { return r0; }
}
return r0;
}
@@ -893,9 +870,7 @@
*/
public List getUsedBoundaryType() {
final Set r = new HashSet(15);
- if (externeAretes_ == null) {
- return Collections.EMPTY_LIST;
- }
+ if (externeAretes_ == null) { return Collections.EMPTY_LIST; }
for (int i = externeAretes_.length - 1; i >= 0; i--) {
r.add(externeAretes_[i].getType());
}
@@ -909,9 +884,7 @@
* @return la list des variables correspondantes
*/
public List getVariableAllowed(final H2dRubarBoundaryType _t) {
- if (_t == null) {
- return null;
- }
+ if (_t == null) { return null; }
return _t.getAllowedVariable(type_);
}
@@ -943,18 +916,12 @@
* @return true si le type de bord est utilise
*/
public boolean isUsedBoundaryType(final H2dRubarBoundaryType _t) {
- if (externeAretes_ == null || _t == null) {
- return false;
- }
- if (_t.isSolide()) {
- return externeAretes_.length != timeCl_.size();
- }
+ if (externeAretes_ == null || _t == null) { return false; }
+ if (_t.isSolide()) { return externeAretes_.length != timeCl_.size(); }
final TIntObjectIterator it = timeCl_.iterator();
for (int i = timeCl_.size(); i-- > 0;) {
it.advance();
- if (_t == g_.getRubarArete(it.key()).getType()) {
- return true;
- }
+ if (_t == g_.getRubarArete(it.key()).getType()) { return true; }
}
return false;
}
@@ -1038,9 +1005,7 @@
public CtuluCommand setDefined(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _qn,
final H2dRubarEvolution _qt, final H2dRubarEvolution _h) {
final H2dRubarEvolution h = _h == H2dRubarParameters.NON_TORENTIEL ? null : _h;
- if (isDefined(_t)) {
- return null;
- }
+ if (isDefined(_t)) { return null; }
if (flowrateGroups_ == null) {
flowrateGroups_ = new TreeMap();
}
@@ -1074,15 +1039,11 @@
*/
public CtuluCommand setEvolution(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _evolInit,
final H2dVariableType _type) {
- if (!isDefined(_t)) {
- return null;
- }
+ if (!isDefined(_t)) { return null; }
final H2dRubarEvolution evol = _evolInit == H2dRubarParameters.NON_TORENTIEL ? null : _evolInit;
final H2dRubarTimeCondition r = getGroupTimeCondition(_t);
final H2dRubarEvolution old = r.getEvol(_type);
- if (old == evol) {
- return null;
- }
+ if (old == evol) { return null; }
final CtuluCommandCompositeInverse cmd = new CtuluCommandCompositeInverse();
r.setEvolution(_type, evol, cmd);
fireFlowrateGroupChanged(_t);
@@ -1111,9 +1072,7 @@
* @return la commande si modif
*/
public CtuluCommand setUndefined(final H2dRubarBoundaryFlowrateGroupType _t) {
- if (!isDefined(_t) || isUsedBoundaryType(_t)) {
- return null;
- }
+ if (!isDefined(_t) || isUsedBoundaryType(_t)) { return null; }
final H2dRubarTimeCondition timeMem = (H2dRubarTimeCondition) flowrateGroups_.remove(_t);
fireFlowrateGroupChanged(_t);
return new CtuluCommand() {
@@ -1131,9 +1090,7 @@
}
public static void groupCommonsCurves(final TIntObjectHashMap _idxCl) {
- if (_idxCl == null) {
- return;
- }
+ if (_idxCl == null) { return; }
final Object[] o = _idxCl.getValues();
if (!CtuluLibArray.isEmpty(o)) {
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2010-10-18 00:18:17 UTC (rev 5984)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2010-10-18 21:36:11 UTC (rev 5985)
@@ -1,8 +1,12 @@
/*
* @creation 3 janv. 2005
+ *
* @modification $Date: 2007-04-30 14:21:34 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.rubar;
@@ -53,18 +57,14 @@
}
public H2dRubarOuvrageElementaireInterface[] getElementaireOuvrages() {
- if (ouvIntern_ == null || ouvIntern_.getSize() == 0) {
- return null;
- }
+ if (ouvIntern_ == null || ouvIntern_.getSize() == 0) { return null; }
final H2dRubarOuvrageElementaireInterface[] r = new H2dRubarOuvrageElementaireInterface[ouvIntern_.getSize()];
ouvIntern_.toArray(r);
return r;
}
public H2dRubarOuvrageElementaireInterface[] getCopyOfElementaireOuvrages() {
- if (ouvIntern_ == null || ouvIntern_.getSize() == 0) {
- return null;
- }
+ if (ouvIntern_ == null || ouvIntern_.getSize() == 0) { return null; }
final H2dRubarOuvrageElementaireInterface[] r = new H2dRubarOuvrageElementaireInterface[ouvIntern_.getSize()];
for (int i = r.length - 1; i >= 0; i--) {
r[i] = getOuvrageElementaire(i).getCopyWithoutEvt();
@@ -81,9 +81,7 @@
}
public double getXa2() {
- if (isElt2Set()) {
- return mng_.getGrid().getRubarGrid().getXCentreArete(arete2_);
- }
+ if (isElt2Set()) { return mng_.getGrid().getRubarGrid().getXCentreArete(arete2_); }
return mng_.getGrid().getGrid().getMaxX() + 100;
}
@@ -92,9 +90,7 @@
}
public double getXe2() {
- if (isElt2Set()) {
- return mng_.getGrid().getGrid().getMoyCentreXElement(elt2_);
- }
+ if (isElt2Set()) { return mng_.getGrid().getGrid().getMoyCentreXElement(elt2_); }
return mng_.getGrid().getGrid().getMaxX() + 100;
}
@@ -109,9 +105,7 @@
}
public double getYa2() {
- if (isElt2Set()) {
- return mng_.getGrid().getRubarGrid().getYCentreArete(arete2_);
- }
+ if (isElt2Set()) { return mng_.getGrid().getRubarGrid().getYCentreArete(arete2_); }
return mng_.getGrid().getGrid().getMaxY() + 100;
}
@@ -120,9 +114,7 @@
}
public double getYe2() {
- if (isElt2Set()) {
- return mng_.getGrid().getGrid().getMoyCentreYElement(elt2_);
- }
+ if (isElt2Set()) { return mng_.getGrid().getGrid().getMoyCentreYElement(elt2_); }
return mng_.getGrid().getGrid().getMaxY() + 100;
}
@@ -216,7 +208,8 @@
if (r.elt1_ < 0) {
if (_analyze != null) {
- _analyze.addError(H2dResource.getS("L'\xE9l\xE9ment {0} ne peut pas \xEAtre retrouv\xE9"), _i);
+ _analyze.addError(H2dResource.getS("L'\xE9l\xE9ment de l'ouvrage {0} ne peut pas \xEAtre retrouv\xE9", Integer
+ .toString(_i + 1)), _i);
}
return null;
}
@@ -304,9 +297,7 @@
* @return true si les elements 1 et 2 sont adjacents
*/
public static boolean isAdjacent(final int _elt1, final int _elt2, final H2dRubarGridAreteSource _grid) {
- if (_elt1 == _elt2) {
- return true;
- }
+ if (_elt1 == _elt2) { return true; }
final int[] idx = _grid.elementsVoisinsParElement()[_elt1];
return CtuluLibArray.findInt(idx, _elt2) >= 0;
}
@@ -337,9 +328,7 @@
if (_elt2 >= 0) {
set.add(_elt2);
}
- if (set.size() == 1) {
- return true;
- }
+ if (set.size() == 1) { return true; }
final int[] sel = set.toArray();
Arrays.sort(sel);
return isSelectionCorrect(sel, _grid);
@@ -348,9 +337,7 @@
protected static void parcourt(final int _i, final int[] _selectedIdx, final boolean[] _done,
final boolean[] _traverse, final H2dRubarGridAreteSource _grid) {
final int[] adjacent = _grid.elementsVoisinsParElement()[_selectedIdx[_i]];
- if (_done[_i]) {
- return;
- }
+ if (_done[_i]) { return; }
_done[_i] = true;
for (int i = adjacent.length - 1; i >= 0; i--) {
final int idxInSelected = Arrays.binarySearch(_selectedIdx, adjacent[i]);
@@ -368,18 +355,12 @@
* @return true si la selection est correcte
*/
public static boolean isSelectionCorrect(final int[] _selectedIdx, final H2dRubarGridAreteSource _grid) {
- if (_selectedIdx == null || _selectedIdx.length == 0) {
- return false;
- }
- if (_selectedIdx.length == 1) {
- return true;
- }
+ if (_selectedIdx == null || _selectedIdx.length == 0) { return false; }
+ if (_selectedIdx.length == 1) { return true; }
final boolean[] traverse = new boolean[_selectedIdx.length];
parcourt(0, _selectedIdx, new boolean[_selectedIdx.length], traverse, _grid);
for (int i = traverse.length - 1; i >= 0; i--) {
- if (!traverse[i]) {
- return false;
- }
+ if (!traverse[i]) { return false; }
}
return true;
}
@@ -394,14 +375,10 @@
* @return true si l'element 1 est adjacent oua au moins un element du tableau _elt2
*/
public static boolean isAdjacent(final int _elt1, final int[] _tabElt2, final H2dRubarGridAreteSource _grid) {
- if (_tabElt2 == null || _tabElt2.length == 0) {
- return true;
- }
+ if (_tabElt2 == null || _tabElt2.length == 0) { return true; }
final int[] idx = _grid.elementsVoisinsParElement()[_elt1];
for (int i = _tabElt2.length - 1; i >= 0; i--) {
- if ((_elt1 != _tabElt2[i]) && (CtuluLibArray.findInt(idx, _tabElt2[i]) >= 0)) {
- return true;
- }
+ if ((_elt1 != _tabElt2[i]) && (CtuluLibArray.findInt(idx, _tabElt2[i]) >= 0)) { return true; }
}
return false;
}
@@ -416,9 +393,7 @@
*/
public static int[][] testElementIntern(final int _i1, final int _i2, final int[] _initialElt,
final H2dRubarGridAreteSource _src) {
- if (_initialElt == null) {
- return null;
- }
+ if (_initialElt == null) { return null; }
final TIntHashSet r = new TIntHashSet(_initialElt.length);
final TIntHashSet falseIdx = new TIntHashSet(_initialElt.length);
for (int i = _initialElt.length - 1; i >= 0; i--) {
@@ -496,9 +471,7 @@
}
// max 5.
- if (_elem.length > 5) {
- return false;
- }
+ if (_elem.length > 5) { return false; }
for (int i = _elem.length - 1; i >= 0; i--) {
_elem[i].ouvrageParent_ = this;
}
@@ -529,13 +502,9 @@
*/
public boolean setReference(final H2dRubarOuvrageRef _ref, final CtuluCommandContainer _cmd) {
// nouvelle ref null ou identique a l'ancienne : on ne fait rien
- if (_ref == null || _ref == rubarRef_) {
- return false;
- }
+ if (_ref == null || _ref == rubarRef_) { return false; }
// pour une ref de -2 l'element 2 doit etre initialise
- if (_ref.getRubarCode() == -2 && !isElt2Set()) {
- return false;
- }
+ if (_ref.getRubarCode() == -2 && !isElt2Set()) { return false; }
final H2dRubarOuvrageRef old = rubarRef_;
if (_cmd != null) {
_cmd.addCmd(new CtuluCommand() {
Modified: trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
===================================================================
--- trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2010-10-18 00:18:17 UTC (rev 5984)
+++ trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2010-10-18 21:36:11 UTC (rev 5985)
@@ -346,6 +346,8 @@
Apport d\xE9bit=Flowrate inflow
Transfert d\xE9bit=Flowrate transfer
L'\xE9l\xE9ment {0} ne peut pas \xEAtre retrouv\xE9=The element {0} can't be found
+L'\xE9l\xE9ment de l'ouvrage {0} ne peut pas \xEAtre retrouv\xE9=The element of the structure {0} can't be found
+Erreur dans la lecture du fichier cli=Error occured while opening cli file
Les \xE9l\xE9ments ne sont pas adjacents=The elements are not adjacent
L'ar\xEAte {0} est mal d\xE9finie=The edge {0} is is undefined
Cote de la cr\xEAte de la digue=Elevation of the top of the dike
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIReader.java 2010-10-18 00:18:17 UTC (rev 5984)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIReader.java 2010-10-18 21:36:11 UTC (rev 5985)
@@ -92,7 +92,7 @@
return null;
}
if (source[source.length - 1] == null) {
- analyze_.addFatalError(H2dResource.getS("Erreur dans la lecture"));
+ analyze_.addError(H2dResource.getS("Erreur dans la lecture du fichier cli"));
}
// verif pas de temps
if (source.length > 0) {
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2010-10-18 00:18:17 UTC (rev 5984)
+++ trunk/business/dodico-h2d/pom.xml 2010-10-18 21:36:11 UTC (rev 5985)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.5</version>
+ <version>0.7</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...> - 2010-10-20 20:51:05
|
Revision: 5989
http://fudaa.svn.sourceforge.net/fudaa/?rev=5989&view=rev
Author: deniger
Date: 2010-10-20 20:51:00 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Removed Paths:
-------------
trunk/business/dodico-h2d/core/.settings/
trunk/business/dodico-h2d/io/.settings/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-11-12 13:58:56
|
Revision: 6036
http://fudaa.svn.sourceforge.net/fudaa/?rev=6036&view=rev
Author: deniger
Date: 2010-11-12 13:58:48 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Property Changed:
----------------
trunk/business/dodico-h2d/core/
trunk/business/dodico-h2d/io/
Property changes on: trunk/business/dodico-h2d/core
___________________________________________________________________
Modified: svn:ignore
- target
.classpath
.project
+ target
.classpath
.project
.settings
Property changes on: trunk/business/dodico-h2d/io
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-03-10 11:34:30
|
Revision: 6153
http://fudaa.svn.sourceforge.net/fudaa/?rev=6153&view=rev
Author: bmarchan
Date: 2011-03-10 11:34:24 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.1
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2011-03-10 11:18:12 UTC (rev 6152)
+++ trunk/business/dodico-h2d/core/pom.xml 2011-03-10 11:34:24 UTC (rev 6153)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2011-03-10 11:18:12 UTC (rev 6152)
+++ trunk/business/dodico-h2d/io/pom.xml 2011-03-10 11:34:24 UTC (rev 6153)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2011-03-10 11:18:12 UTC (rev 6152)
+++ trunk/business/dodico-h2d/pom.xml 2011-03-10 11:34:24 UTC (rev 6153)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.1-SNAPSHOT</fudaa-ef.version>
+ <fudaa-ef.version>1.1</fudaa-ef.version>
</properties>
<parent>
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -41,4 +41,10 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.1</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.1</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.1</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-03-10 11:34:53
|
Revision: 6155
http://fudaa.svn.sourceforge.net/fudaa/?rev=6155&view=rev
Author: bmarchan
Date: 2011-03-10 11:34:47 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2011-03-10 11:34:39 UTC (rev 6154)
+++ trunk/business/dodico-h2d/core/pom.xml 2011-03-10 11:34:47 UTC (rev 6155)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2011-03-10 11:34:39 UTC (rev 6154)
+++ trunk/business/dodico-h2d/io/pom.xml 2011-03-10 11:34:47 UTC (rev 6155)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2011-03-10 11:34:39 UTC (rev 6154)
+++ trunk/business/dodico-h2d/pom.xml 2011-03-10 11:34:47 UTC (rev 6155)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -41,10 +41,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.1</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.1</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.1</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-10-31 21:43:18
|
Revision: 6592
http://fudaa.svn.sourceforge.net/fudaa/?rev=6592&view=rev
Author: deniger
Date: 2011-10-31 21:43:12 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
maj des pom
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2011-10-31 17:16:33 UTC (rev 6591)
+++ trunk/business/dodico-h2d/core/pom.xml 2011-10-31 21:43:12 UTC (rev 6592)
@@ -6,7 +6,6 @@
<artifactId>dodico-h2d</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
<dependencies>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2011-10-31 17:16:33 UTC (rev 6591)
+++ trunk/business/dodico-h2d/io/pom.xml 2011-10-31 21:43:12 UTC (rev 6592)
@@ -6,7 +6,6 @@
<artifactId>dodico-h2d</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
<dependencies>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2011-10-31 17:16:33 UTC (rev 6591)
+++ trunk/business/dodico-h2d/pom.xml 2011-10-31 21:43:12 UTC (rev 6592)
@@ -4,6 +4,9 @@
<properties>
<fudaa-ef.version>1.2-SNAPSHOT</fudaa-ef.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
</properties>
<parent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-11-02 23:31:04
|
Revision: 6606
http://fudaa.svn.sourceforge.net/fudaa/?rev=6606&view=rev
Author: deniger
Date: 2011-11-02 23:30:57 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENResult.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENWriter.java
trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/rubar/io/TestRubarVENFileFormat.java
Added Paths:
-----------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentMng.java
Added: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentInterface.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentInterface.java (rev 0)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentInterface.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -0,0 +1,47 @@
+/*
+ * @creation 14 d\xE9c. 2004
+ * @modification $Date: 2006-04-19 13:19:39 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.h2d.rubar;
+
+import org.fudaa.dodico.mesure.EvolutionReguliere;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: H2dRubarAppInterface.java,v 1.4 2006-04-19 13:19:39 deniger Exp $
+ */
+public interface H2dRubarVentInterface {
+
+ /**
+ * @return le nombre d'element d\xE9fini par cette resultat
+ */
+ int getNbElt();
+
+ /**
+ * @return le nombre d'element d\xE9fini par cette resultat
+ */
+ int getNbEvol();
+
+ /**
+ * @param idx l'indice [0;getNbEvol()[
+ * @return l'evolution correspondante.
+ */
+ EvolutionReguliere getEvolutionAlongX(int idx);
+ EvolutionReguliere getEvolutionAlongY(int idx);
+
+ /**
+ * @param idxElt l'indice [0;getNbElt()[
+ * @return l'evol correspondante
+ */
+ EvolutionReguliere getEvolAlongXForElt(int idxElt);
+ EvolutionReguliere getEvolAlongYForElt(int idxElt);
+
+ /**
+ * @param eltIdx l'element demande
+ * @return l'indice de la courbe correspondante
+ */
+ int getEvolIdx(int eltIdx);
+}
\ No newline at end of file
Added: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentListener.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentListener.java (rev 0)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentListener.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -0,0 +1,41 @@
+/*
+ * @creation 14 d\xE9c. 2004
+ * @modification $Date: 2006-04-19 13:19:39 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.h2d.rubar;
+
+import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: H2dRubarApportListener.java,v 1.4 2006-04-19 13:19:39 deniger Exp $
+ */
+public interface H2dRubarVentListener {
+
+ /**
+ * Envoye lorsque le contenu a ete modifie.
+ *
+ * @param _mng le manager d'apport
+ * @param _dest l'evolution modifiee
+ */
+ void ventEvolutionContentChanged(H2dRubarVentMng _mng, EvolutionReguliereInterface _dest);
+
+ /**
+ * Envoye lorsque les affectations d'evolution sur les element ont ete modifiees.
+ *
+ * @param _mng le manager d'apport
+ */
+ void ventChanged(H2dRubarVentMng _mng);
+
+ /**
+ * Utilise lorsqu'une evolution devient ou n'est plus utilisee.
+ *
+ * @param _mng le manager d'apport
+ * @param _dest l'evolution qui n'est plus ou devient utilise
+ */
+ void ventEvolutionUsedChanged(H2dRubarVentMng _mng, EvolutionReguliereInterface _dest);
+
+}
Added: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentMng.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentMng.java (rev 0)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVentMng.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -0,0 +1,452 @@
+/*
+ * @creation 14 d\xE9c. 2004
+ *
+ * @modification $Date: 2007-05-22 13:11:25 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.h2d.rubar;
+
+import gnu.trove.TDoubleHashSet;
+import gnu.trove.TIntObjectHashMap;
+import gnu.trove.TObjectIntHashMap;
+import gnu.trove.TObjectIntIterator;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluNumberFormater;
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.collection.CtuluArrayObject;
+import org.fudaa.ctulu.fileformat.FortranLib;
+
+import org.fudaa.dodico.h2d.H2dEvolutionUseCounter;
+import org.fudaa.dodico.h2d.resource.H2dResource;
+import org.fudaa.dodico.h2d.type.H2dVariableTransType;
+import org.fudaa.dodico.mesure.EvolutionListener;
+import org.fudaa.dodico.mesure.EvolutionReguliere;
+import org.fudaa.dodico.mesure.EvolutionReguliereAbstract;
+import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: H2dRubarApportSpatialMng.java,v 1.14 2007-05-22 13:11:25 deniger Exp $
+ */
+public class H2dRubarVentMng implements EvolutionListener {
+
+ private class ApportModelObject extends CtuluArrayObject {
+
+ /**
+ * @param _nb
+ */
+ public ApportModelObject(final int _nb) {
+ super(_nb);
+ }
+
+ protected boolean internalSet(final int _i, final Object _newV) {
+ if (super.list_[_i] != _newV) {
+ if (super.list_[_i] != null) {
+ final H2dRubarEvolution e = (H2dRubarEvolution) super.list_[_i];
+ e.setUnUsed(false);
+ if (e.getUsed() == 0) {
+ updateUsedCourbe(e);
+ }
+ }
+ if (_newV != null) {
+ final H2dRubarEvolution e = (H2dRubarEvolution) _newV;
+ e.setListener(H2dRubarVentMng.this);
+ e.setUsed(false);
+ if (e.getUsed() == 1) {
+ updateUsedCourbe(e);
+ }
+ }
+ return super.internalSet(_i, _newV);
+ }
+ return false;
+ }
+
+ protected void fireObjectChanged(int _indexGeom, Object _newValue) {
+ appEvolChanged();
+ }
+ }
+
+ final static CtuluNumberFormater APP_TIME_FORMAT = FortranLib.getFormater(15, 4, true);
+
+ CtuluArrayObject eltXIdx_;
+ CtuluArrayObject eltYIdx_;
+
+ Set listener_;
+ int nbElt_;
+
+ /**
+ * @return le nombre d'element
+ */
+ public final int getNbElt() {
+ return nbElt_;
+ }
+
+ /**
+ * @param _app l
+ */
+ public H2dRubarVentMng(final H2dRubarVentInterface _app) {
+ nbElt_ = _app.getNbElt();
+ createModel();
+ final TIntObjectHashMap intEvolX = new TIntObjectHashMap();
+ final TIntObjectHashMap intEvolY = new TIntObjectHashMap();
+ int idx = 1;
+ for (int i = nbElt_ - 1; i >= 0; i--) {
+ // l'evolution est deja enregistree: on la reprend
+ int evolIdx = _app.getEvolIdx(i);
+ if (intEvolX.contains(evolIdx)) {
+ eltXIdx_.set(i, intEvolX.get(evolIdx));
+ eltYIdx_.set(i, intEvolY.get(evolIdx));
+ } else {
+ EvolutionReguliere evolX = _app.getEvolAlongXForElt(i);
+ EvolutionReguliere evolY = _app.getEvolAlongYForElt(i);
+ // l'evolution est vide, on met une valeur nulle
+ if (!isEvolEmpty(evolX) || !isEvolEmpty(evolY)) {
+ // a continer
+ final H2dRubarEvolution finalEvolX = H2dRubarEvolution.createH2dRubarEvolution(H2dVariableTransType.VENT_X,
+ evolX, this);
+ final H2dRubarEvolution finalEvolY = H2dRubarEvolution.createH2dRubarEvolution(H2dVariableTransType.VENT_Y,
+ evolY, this);
+ finalEvolX.setNom(H2dResource.getS("Vent X") + CtuluLibString.ESPACE + (idx));
+ finalEvolY.setNom(H2dResource.getS("Vent Y") + CtuluLibString.ESPACE + (idx++));
+ eltXIdx_.set(i, finalEvolX);
+ eltYIdx_.set(i, finalEvolY);
+ intEvolX.put(evolIdx, finalEvolX);
+ intEvolY.put(evolIdx, finalEvolY);
+ }
+ }
+ }
+ }
+
+ /**
+ * @return l'interface a utiliser pour sauvegarder les chroniques d'apport
+ */
+ public H2dRubarVentInterface getSavedInterface() {
+ return new SaveAdapter();
+ }
+
+ private class SaveAdapter implements H2dRubarVentInterface {
+
+ int[] idx_;
+ EvolutionReguliere[] evolsX_;
+ EvolutionReguliere[] evolsY_;
+
+ protected SaveAdapter() {
+ final int nbElt = eltXIdx_.getSize();
+ idx_ = new int[nbElt];
+ int tmp = 0;
+ final Map<H2dRubarEvolution, TObjectIntHashMap<H2dRubarEvolution>> evolXevolYIndice = new HashMap<H2dRubarEvolution, TObjectIntHashMap<H2dRubarEvolution>>();
+ for (int i = 0; i < nbElt; i++) {
+ H2dRubarEvolution ex = H2dRubarVentMng.this.getEvolutionAlongX(i);
+ H2dRubarEvolution ey = H2dRubarVentMng.this.getEvolutionAlongY(i);
+ // si null on met l'evolution vide
+ if (ex == null) {
+ ex = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ if (ey == null) {
+ ey = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ boolean found = false;
+ if (evolXevolYIndice.containsKey(ex)) {
+ TObjectIntHashMap<H2dRubarEvolution> evoly = evolXevolYIndice.get(ex);
+ if (evoly != null && evoly.contains(ey)) {
+ found = true;
+ idx_[i] = evoly.get(ey);
+ }
+ if (!found) {
+ TObjectIntHashMap<H2dRubarEvolution> IdByevolY = evolXevolYIndice.get(ex);
+ if (IdByevolY == null) {
+ IdByevolY = new TObjectIntHashMap<H2dRubarEvolution>();
+ evolXevolYIndice.put(ex, IdByevolY);
+ }
+ IdByevolY.put(ey, tmp);
+ idx_[i] = tmp++;
+ }
+ }
+ }
+ evolsX_ = new EvolutionReguliere[tmp];
+ evolsY_ = new EvolutionReguliere[tmp];
+ for (Entry<H2dRubarEvolution, TObjectIntHashMap<H2dRubarEvolution>> entry : evolXevolYIndice.entrySet()) {
+ final TObjectIntIterator<H2dRubarEvolution> it = entry.getValue().iterator();
+ for (int i = tmp; i-- > 0;) {
+ it.advance();
+ EvolutionReguliere ex = entry.getKey();
+ EvolutionReguliere ey = it.key();
+ TDoubleHashSet commonX = new TDoubleHashSet();
+ if (!ex.isEvolutionWithSameX(ey, commonX)) {
+ final double[] common = commonX.toArray();
+ Arrays.sort(common);
+ ex = ex.createEvolutionFromInterpolation(common);
+ ey = ey.createEvolutionFromInterpolation(common);
+
+ }
+ evolsX_[it.value()] = ex;
+ evolsY_[it.value()] = ey;
+ }
+
+ }
+
+ }
+
+ @Override
+ public EvolutionReguliere getEvolAlongXForElt(int idxElt) {
+ return evolsX_[idx_[idxElt]];
+ }
+
+ @Override
+ public EvolutionReguliere getEvolAlongYForElt(int idxElt) {
+ return evolsY_[idx_[idxElt]];
+ }
+
+ @Override
+ public EvolutionReguliere getEvolutionAlongX(int idx) {
+ return evolsX_[idx];
+ }
+
+ @Override
+ public EvolutionReguliere getEvolutionAlongY(int idx) {
+ return evolsY_[idx];
+ }
+
+ public int getEvolIdx(final int _eltIdx) {
+ return idx_[_eltIdx];
+ }
+
+ public int getNbElt() {
+ return idx_.length;
+ }
+
+ public int getNbEvol() {
+ return evolsX_.length;
+ }
+ }
+
+ public void fillWithTransientCurves(final H2dEvolutionUseCounter _r) {
+ if (eltYIdx_ != null) {
+ for (int i = eltYIdx_.getSize() - 1; i >= 0; i--) {
+ final H2dRubarEvolution ex = (H2dRubarEvolution) eltXIdx_.getObjectValueAt(i);
+ if (ex != null) {
+ _r.add(ex, H2dVariableTransType.VENT_X, i);
+ }
+ final H2dRubarEvolution ey = (H2dRubarEvolution) eltYIdx_.getObjectValueAt(i);
+ if (ey != null) {
+ _r.add(ey, H2dVariableTransType.VENT_Y, i);
+ }
+ }
+ }
+ }
+
+ Set<H2dRubarEvolution> evolutionsUsed_;
+
+ protected void updateUsedCourbe(final H2dRubarEvolution _e) {
+ if (_e.isUsed() && !evolutionsUsed_.contains(_e)) {
+ evolutionsUsed_.add(_e);
+ appEvolIsUsedChanged(_e);
+ } else if ((!_e.isUsed()) && evolutionsUsed_.contains(_e)) {
+ evolutionsUsed_.remove(_e);
+ appEvolIsUsedChanged(_e);
+ }
+
+ }
+
+ /**
+ * @return tableau des courbes utilisees.
+ */
+ public EvolutionReguliereAbstract[] getUsedCourbes() {
+ if (eltXIdx_ != null) {
+ final EvolutionReguliereAbstract[] rf = new EvolutionReguliereAbstract[evolutionsUsed_.size()];
+ evolutionsUsed_.toArray(rf);
+ return rf;
+ }
+ return null;
+
+ }
+
+ /**
+ * @param _evol l'evolution a tester
+ * @return true si evolution vide
+ */
+ protected static boolean isEvolEmpty(final EvolutionReguliereInterface _evol) {
+ if (_evol == null || _evol.getNbValues() == 0) {
+ return true;
+ }
+ if (_evol.getNbValues() == 1) {
+ return (_evol.getX(0) == 0) && (_evol.getY(0) == 0);
+ }
+ return false;
+
+ }
+
+ public H2dRubarVentMng(final int _nbElt) {
+ nbElt_ = _nbElt;
+ }
+
+ protected final void createModel() {
+ if (eltXIdx_ == null) {
+ eltXIdx_ = new ApportModelObject(nbElt_);
+ eltYIdx_ = new ApportModelObject(nbElt_);
+ evolutionsUsed_ = new HashSet();
+ }
+ }
+
+ /**
+ * @param _l le listener a ajouter
+ */
+ public void addAppListener(final H2dRubarApportListener _l) {
+ if (listener_ == null) {
+ listener_ = new HashSet(3);
+ }
+ listener_.add(_l);
+ }
+
+ public void clear(final CtuluCommandContainer _cmd) {
+ if (eltXIdx_ != null) {
+ final int[] idx = new int[nbElt_];
+ for (int i = nbElt_ - 1; i >= 0; i--) {
+ idx[i] = i;
+ }
+ eltXIdx_.set(idx, null, _cmd);
+ eltYIdx_.set(idx, null, _cmd);
+ }
+ }
+
+ /**
+ * @param _l le listener a tester
+ * @return true si est contenu
+ */
+ public boolean containsAppListener(final H2dRubarApportListener _l) {
+ return (listener_ != null) && listener_.contains(_l);
+ }
+
+ public void evolutionChanged(final EvolutionReguliereInterface _e) {
+ if (listener_ != null) {
+ for (final Iterator it = listener_.iterator(); it.hasNext();) {
+ ((H2dRubarVentListener) it.next()).ventEvolutionContentChanged(this, _e);
+ }
+ }
+ }
+
+ public void evolutionUsedChanged(final EvolutionReguliereInterface _e, final int _old, final int _new,
+ final boolean _isAdjusting) {
+ }
+
+ protected void appEvolChanged() {
+ if (listener_ != null) {
+ for (final Iterator it = listener_.iterator(); it.hasNext();) {
+ ((H2dRubarVentListener) it.next()).ventChanged(this);
+ }
+ }
+ }
+
+ protected void appEvolIsUsedChanged(final EvolutionReguliereInterface _e) {
+ if (listener_ != null) {
+ for (final Iterator it = listener_.iterator(); it.hasNext();) {
+ ((H2dRubarVentListener) it.next()).ventEvolutionUsedChanged(this, _e);
+ }
+ }
+ }
+
+ public H2dRubarEvolution getCommonEvolAlongX(final int[] _idx) {
+ if (_idx == null || _idx.length == 0) {
+ return null;
+ }
+ H2dRubarEvolution r = getEvolutionAlongX(_idx[0]);
+ if (r == null) {
+ r = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ for (int i = _idx.length - 1; i > 0; i--) {
+ H2dRubarEvolution test = getEvolutionAlongX(_idx[i]);
+ if (test == null) {
+ test = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ if (test != r) {
+ return null;
+ }
+ }
+ return r;
+ }
+
+ public H2dRubarEvolution getCommonEvolAlongY(final int[] _idx) {
+ if (_idx == null || _idx.length == 0) {
+ return null;
+ }
+ H2dRubarEvolution r = getEvolutionAlongY(_idx[0]);
+ if (r == null) {
+ r = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ for (int i = _idx.length - 1; i > 0; i--) {
+ H2dRubarEvolution test = getEvolutionAlongY(_idx[i]);
+ if (test == null) {
+ test = H2dRubarApportSpatialMng.EMPTY_EVOL;
+ }
+ if (test != r) {
+ return null;
+ }
+ }
+ return r;
+ }
+
+ /**
+ * @param _i l'indice de l'element
+ * @return l'evolution correspondante
+ */
+ public H2dRubarEvolution getEvolutionAlongX(final int _i) {
+ return eltXIdx_ == null ? null : (H2dRubarEvolution) eltXIdx_.getValueAt(_i);
+ }
+
+ public H2dRubarEvolution getEvolutionAlongY(final int _i) {
+ return eltYIdx_ == null ? null : (H2dRubarEvolution) eltYIdx_.getValueAt(_i);
+ }
+
+ /**
+ * @return true si des evolution sont d\xE9finies
+ */
+ public boolean isSet() {
+ return evolutionsUsed_ != null && evolutionsUsed_.size() > 0;
+ }
+
+ /**
+ * @param _l le listener a enlever
+ */
+ public void removeAppListener(final H2dRubarApportListener _l) {
+ if (listener_ != null) {
+ listener_.remove(_l);
+ }
+ }
+
+ /**
+ * @param _idx les indices a modifier
+ * @param _e l'\xE9volution
+ * @param _cmd le receveur de commande
+ */
+ public void setX(final int[] _idx, final H2dRubarEvolution _ex, final H2dRubarEvolution _ey,
+ final CtuluCommandContainer _cmd) {
+ H2dRubarEvolution ex = _ex;
+ H2dRubarEvolution ey = _ey;
+ if (ex == H2dRubarApportSpatialMng.EMPTY_EVOL || isEvolEmpty(ex)) {
+ ex = null;
+ }
+ if (ey == H2dRubarApportSpatialMng.EMPTY_EVOL || isEvolEmpty(ey)) {
+ ey = null;
+ }
+ if (eltXIdx_ == null) {
+ createModel();
+ }
+ eltXIdx_.set(_idx, ex, _cmd);
+ eltYIdx_.set(_idx, ey, _cmd);
+ }
+}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
===================================================================
--- trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2011-11-02 22:58:57 UTC (rev 6605)
+++ trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2011-11-02 23:30:57 UTC (rev 6606)
@@ -336,6 +336,9 @@
Chronique d'apport=Storm water
Les chroniques d'apport=Storms water
Apport=Storm
+Vent=Wind
+Vent Y=Wind Y
+Vent X=Wind X
Vitesse de frottement=Friction velocity
Le nombre d'\xE9lements n'est pas pr\xE9cis\xE9=The number of elements is not set
Limnigrammes=Hydrographs
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENResult.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENResult.java 2011-11-02 22:58:57 UTC (rev 6605)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENResult.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -1,13 +1,12 @@
package org.fudaa.dodico.rubar.io;
+import org.fudaa.dodico.h2d.rubar.H2dRubarVentInterface;
import org.fudaa.dodico.mesure.EvolutionReguliere;
/**
- *
* @author CANEL Christophe (Genesis)
- *
*/
-public class RubarVENResult {
+public class RubarVENResult implements H2dRubarVentInterface {
EvolutionReguliere[] evolsX;
EvolutionReguliere[] evolsY;
int[] eltEvolIdx;
@@ -26,6 +25,11 @@
return evolsX == null ? 0 : evolsX.length;
}
+ public int getNbEvol() {
+ return getNbEvolX();
+
+ }
+
/**
* @return le nombre d'\xE9volution Y.
*/
@@ -33,19 +37,13 @@
return evolsY == null ? 0 : evolsY.length;
}
- /**
- * @param index l'index
- * @return l'\xE9volution X.
- */
- public EvolutionReguliere getEvolX(int index) {
+ @Override
+ public EvolutionReguliere getEvolutionAlongX(int index) {
return evolsX[index];
}
- /**
- * @param index l'index
- * @return l'\xE9volution Y.
- */
- public EvolutionReguliere getEvolY(int index) {
+ @Override
+ public EvolutionReguliere getEvolutionAlongY(int index) {
return evolsY[index];
}
@@ -57,11 +55,13 @@
return eltEvolIdx[eltIdx];
}
- public EvolutionReguliere getEvolXForElt(final int idxElt) {
- return getEvolX(getEvolIdx(idxElt));
+ @Override
+ public EvolutionReguliere getEvolAlongXForElt(int eltIdx) {
+ return getEvolutionAlongX(getEvolIdx(eltIdx));
}
- public EvolutionReguliere getEvolYForElt(final int idxElt) {
- return getEvolY(getEvolIdx(idxElt));
+ @Override
+ public EvolutionReguliere getEvolAlongYForElt(int idxElt) {
+ return getEvolutionAlongY(getEvolIdx(idxElt));
}
}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENWriter.java 2011-11-02 22:58:57 UTC (rev 6605)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarVENWriter.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -9,6 +9,7 @@
import org.fudaa.dodico.fortran.FileOpWriterCharSimpleAbstract;
import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.h2d.resource.H2dResource;
+import org.fudaa.dodico.h2d.rubar.H2dRubarVentInterface;
import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
/**
@@ -18,7 +19,7 @@
*/
public class RubarVENWriter extends FileOpWriterCharSimpleAbstract {
- private void writeVENResult(final RubarVENResult result) {
+ private void writeVENResult(final H2dRubarVentInterface result) {
try {
final FortranWriter w = new FortranWriter(out_);
w.setSpaceBefore(true);
@@ -37,7 +38,7 @@
}
w.writeFields(fmt);
final int[] fmti = new int[] { 8 };
- final int nbEvol = result.getNbEvolX();
+ final int nbEvol = result.getNbEvol();
final int maxAutorise = 20;
final int maxTimeStep=1000;
if (nbEvol > maxAutorise) {
@@ -51,8 +52,8 @@
final CtuluNumberFormatI numbFmt = FortranLib.getFortranFormat(15, 4);
fmt = new int[] { 15, 15, 15 };
for (int i = 0; i < nbEvol; i++) {
- final EvolutionReguliereInterface evolX = result.getEvolX(i);
- final EvolutionReguliereInterface evolY = result.getEvolY(i);
+ final EvolutionReguliereInterface evolX = result.getEvolutionAlongX(i);
+ final EvolutionReguliereInterface evolY = result.getEvolutionAlongY(i);
final int nbVal = evolX.getNbValues();
if(nbVal>maxTimeStep&&!errDone){
errDone=true;
Modified: trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/rubar/io/TestRubarVENFileFormat.java
===================================================================
--- trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/rubar/io/TestRubarVENFileFormat.java 2011-11-02 22:58:57 UTC (rev 6605)
+++ trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/rubar/io/TestRubarVENFileFormat.java 2011-11-02 23:30:57 UTC (rev 6606)
@@ -51,12 +51,12 @@
assertEquals(3, result.getNbEvolX());
assertEquals(3, result.getNbEvolY());
- assertEquals(new double[]{1.0, 1.0}, result.getEvolX(0));
- assertEquals(new double[]{1.0, 0.0}, result.getEvolY(0));
- assertEquals(new double[]{2.0}, result.getEvolX(1));
- assertEquals(new double[]{1.5}, result.getEvolY(1));
- assertEquals(new double[]{1.0, 3.0, 2.0}, result.getEvolX(2));
- assertEquals(new double[]{1.0, 2.0, 3.0}, result.getEvolY(2));
+ assertEquals(new double[]{1.0, 1.0}, result.getEvolutionAlongX(0));
+ assertEquals(new double[]{1.0, 0.0}, result.getEvolutionAlongY(0));
+ assertEquals(new double[]{2.0}, result.getEvolutionAlongX(1));
+ assertEquals(new double[]{1.5}, result.getEvolutionAlongY(1));
+ assertEquals(new double[]{1.0, 3.0, 2.0}, result.getEvolutionAlongX(2));
+ assertEquals(new double[]{1.0, 2.0, 3.0}, result.getEvolutionAlongY(2));
}
private void assertEquals(double[] value, EvolutionReguliere evo)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-04 22:27:42
|
Revision: 6788
http://fudaa.svn.sourceforge.net/fudaa/?rev=6788&view=rev
Author: deniger
Date: 2011-12-04 22:27:35 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
Added Paths:
-----------
trunk/business/dodico-h2d/io/src/test/resources/org/fudaa/dodico/rubar/io/lmfa05.cn
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java 2011-12-04 22:25:16 UTC (rev 6787)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java 2011-12-04 22:27:35 UTC (rev 6788)
@@ -141,9 +141,8 @@
* @param _areteIdxGlobalTarage idxArete->Loi de tarage
* @param _l le listener du projet
*/
- protected boolean create(final H2dRubarProjetType _type, final H2dRubarGridAreteSource _s,
- final H2dRubarTimeConditionInterface[] _liquidIdxTimeCl, final TIntObjectHashMap _areteIdxGlobalTarage,
- final ProgressionInterface _in, final CtuluAnalyze _an, final boolean[] _cliChanged) {
+ protected boolean create(final H2dRubarProjetType _type, final H2dRubarGridAreteSource _s, final H2dRubarTimeConditionInterface[] _liquidIdxTimeCl,
+ final TIntObjectHashMap _areteIdxGlobalTarage, final ProgressionInterface _in, final CtuluAnalyze _an, final boolean[] _cliChanged) {
type_ = (_type == null ? H2dRubarProjetType.COURANTOLOGIE_2D : _type);
// initialisation des champs deja crees
// maillage
@@ -237,20 +236,31 @@
}
final int[] idxGlobalFromIdxAreteLimiteEntrante = _s.getIdxAreteLimiteEntrante();
nb = idxGlobalFromIdxAreteLimiteEntrante == null ? 0 : idxGlobalFromIdxAreteLimiteEntrante.length;
+ //TODO a modifier ici.
+ //Des aretes externes sont mal d\xE9finies: il faut mettre un message de warn au lieu de fatal error:
+ //Des conditions limites liquides sont mal d\xE9finies (fichier dat), des valeur par d\xE9faut ont \xE9t\xE9 charg\xE9es.
+ //pas faire de return false.
+ //mettre _liquidIdxTimeCl \xE0 null
+ boolean messageConLimDone=false;
if (nb != externeTrans.size()) {
if (isAllLibre && nb == 0) {
FuLog.warning(" free edges only");
} else {
_an.addFatalError(H2dResource.getS("Des conditions limites liquides sont mal d\xE9finies (fichier dat)"));
FuLog.all("aretes calcule\n" + CtuluLibString.arrayToString(externeTrans.toNativeArray()) + "\naretes lu"
- + CtuluLibString.arrayToString(idxGlobalFromIdxAreteLimiteEntrante) + "\nnb lus= " + nb + " nb attendu "
- + externeTrans.size());
+ + CtuluLibString.arrayToString(idxGlobalFromIdxAreteLimiteEntrante) + "\nnb lus= " + nb + " nb attendu " + externeTrans.size());
+ messageConLimDone=true;
return false;
}
}
+ //TODO idem ici:
+ //mettre un message et *la traduction* comme quoi on charge des valeurs par d\xE9faut:
+ //Des conditions limites liquides sont mal d\xE9finies (fichier dat), des valeur par d\xE9faut ont \xE9t\xE9 charg\xE9es.
+ //mettre _liquidIdxTimeCl \xE0 null
+ //pas faire return false mais mettre _liquidIdxTimeCl ce qui obligera de charge des conditions limites par defaut.
if (nb > 0) {
externeTrans.sort();
- if (!Arrays.equals(externeTrans.toNativeArray(), CtuluLibArray.copy(idxGlobalFromIdxAreteLimiteEntrante))) {
+ if (!messageConLimDone && !Arrays.equals(externeTrans.toNativeArray(), CtuluLibArray.copy(idxGlobalFromIdxAreteLimiteEntrante))) {
_an.addFatalError(H2dResource.getS("Des conditions limites liquides sont mal d\xE9finies (fichier dat)"));
return false;
}
@@ -263,15 +273,14 @@
as = g.getRubarArete(idx);
final List list = getVariableAllowed(as.getType());
if ((list != null) && (list.size() > 0)) {
- H2dRubarTimeCondition timeS = _liquidIdxTimeCl == null ? null : (H2dRubarTimeCondition.create(
- _liquidIdxTimeCl[i], this));
+ H2dRubarTimeCondition timeS = _liquidIdxTimeCl == null ? null : (H2dRubarTimeCondition.create(_liquidIdxTimeCl[i], this));
// on cree des cl par defaut
if (timeS == null) {
timeNotDefined.add(idx);
timeS = new H2dRubarTimeCondition(null, null, null, null, null);
timeS.verify(list, null, idx, H2dRubarBcMng.this);
}
- // on verifie que toutes les courbes soient correctes
+ // on verifie que toutes les courbes sont correctes
else {
timeS.verify(list, _an, idx, this);
}
@@ -334,8 +343,7 @@
private CtuluPermanentList timeVars_;
- protected void setProjectDispatcher(final H2dRubarProjectDispatcherListener _old,
- final H2dRubarProjectDispatcherListener _new) {
+ protected void setProjectDispatcher(final H2dRubarProjectDispatcherListener _old, final H2dRubarProjectDispatcherListener _new) {
if (_old != null) {
removeListener(_old);
removeEvolutionListener(_old);
@@ -382,7 +390,9 @@
* @return les aretes entrantes dans l'ordre utilise par le fichier dat.
*/
protected int[] getAreteEntrante() {
- if ((externeAretes_ == null) || (externeAretes_.length == 0)) { return new int[0]; }
+ if ((externeAretes_ == null) || (externeAretes_.length == 0)) {
+ return new int[0];
+ }
final TIntArrayList l = new TIntArrayList(externeAretes_.length);
for (int i = 0; i < externeAretes_.length; i++) {
if (externeAretes_[i].isExternAndLiquidAndTransient(type_)) {
@@ -407,8 +417,7 @@
* @param _elementsVoisinsParArete
* @param _elementsVoisinsParElement
*/
- public GridSrcAdapter(final int _nbDecimal, final int[][] _elementsVoisinsParElement,
- final int[][] _elementsVoisinsParArete) {
+ public GridSrcAdapter(final int _nbDecimal, final int[][] _elementsVoisinsParElement, final int[][] _elementsVoisinsParArete) {
super(g_, null);
nbDecimal_ = _nbDecimal;
// System.err.println("nb Decimal= "+nbDecimal_);
@@ -447,9 +456,10 @@
}
private void createDefaultCurves() {
- if (defaultEvolForConcentration_ != null) { return; }
- defaultEvolForConcentration_ = H2dRubarEvolution.createH2dRubarEvolution(H2dVariableTransType.CONCENTRATION,
- new EvolutionReguliere(), this);
+ if (defaultEvolForConcentration_ != null) {
+ return;
+ }
+ defaultEvolForConcentration_ = H2dRubarEvolution.createH2dRubarEvolution(H2dVariableTransType.CONCENTRATION, new EvolutionReguliere(), this);
defaultEvolForConcentration_.setNom(H2dResource.getS("D\xE9faut"));
}
@@ -511,7 +521,9 @@
}
public void iterateOnTarageCurves(final H2dEvolutionUseCounter _m) {
- if (tarages_ == null) { return; }
+ if (tarages_ == null) {
+ return;
+ }
for (int i = 0; i < getNbBcArete(); i++) {
final int global = getGlobalIdx(i);
final EvolutionReguliereInterface evol = tarages_.getEvol(global);
@@ -646,7 +658,9 @@
public H2dRubarTimeConditionInterface[] getCliInOrder() {
H2dRubarTimeConditionInterface[] r = null;
final int[] idx = getAreteEntrante();
- if (idx == null) { return null; }
+ if (idx == null) {
+ return null;
+ }
r = new H2dRubarTimeConditionInterface[idx.length];
for (int i = 0; i < idx.length; i++) {
final int globalIdx = idx[i];
@@ -669,11 +683,15 @@
public boolean hasDataForCli() {
final int[] idx = getAreteEntrante();
- if (idx == null) { return false; }
+ if (idx == null) {
+ return false;
+ }
for (int i = 0; i < idx.length; i++) {
final int globalIdx = idx[i];
final H2dRubarBoundaryType type = g_.getRubarArete(globalIdx).getType();
- if (!H2dRubarBcTypeList.TARAGE.equals(type) && !H2dRubarBcTypeList.CRITIQUE.equals(type)) { return true; }
+ if (!H2dRubarBcTypeList.TARAGE.equals(type) && !H2dRubarBcTypeList.CRITIQUE.equals(type)) {
+ return true;
+ }
}
return false;
}
@@ -687,8 +705,8 @@
* @param _mem
* @return true si modif
*/
- protected boolean updateTimeValues(final int _idxGlobal, final List _v, final H2dRubarTimeCondition _timeSource,
- final AreteMemento _mem, final H2dRubarBoundaryType _newType) {
+ protected boolean updateTimeValues(final int _idxGlobal, final List _v, final H2dRubarTimeCondition _timeSource, final AreteMemento _mem,
+ final H2dRubarBoundaryType _newType) {
H2dRubarTimeCondition mem = null;
H2dRubarTimeCondition toModify = (H2dRubarTimeCondition) timeCl_.get(_idxGlobal);
if ((toModify != null) && (_mem != null)) {
@@ -725,15 +743,25 @@
}
protected boolean verifyTimeData(final int[] _areteIdx, final H2dRubarBoundaryType _t, final H2dRubarTimeCondition _s) {
- if (_t.isTypeDebitGlobal()) { return verifyGroupDebit(_t, _s); }
+ if (_t.isTypeDebitGlobal()) {
+ return verifyGroupDebit(_t, _s);
+ }
final List l = getVariableRequired(_t);
- if ((l == null) || (l.size() == 0)) { return true; }
+ if ((l == null) || (l.size() == 0)) {
+ return true;
+ }
final List varNotSet = _s.isVariableRequiredSet(l);
- if (varNotSet == null) { return true; }
+ if (varNotSet == null) {
+ return true;
+ }
for (int i = _areteIdx.length - 1; i >= 0; i--) {
final H2dRubarTimeCondition c = (H2dRubarTimeCondition) timeCl_.get(_areteIdx[i]);
- if (c == null) { return false; }
- if (!c.isVariableSet(varNotSet)) { return false; }
+ if (c == null) {
+ return false;
+ }
+ if (!c.isVariableSet(varNotSet)) {
+ return false;
+ }
}
return true;
@@ -767,11 +795,11 @@
public CtuluPermanentList getAllTimeVar() {
if (timeVars_ == null) {
if (type_ == H2dRubarProjetType.COURANTOLOGIE_2D) {
- timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL,
- H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.COTE_EAU }));
+ timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL,
+ H2dVariableType.COTE_EAU }));
} else {
- timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL,
- H2dVariableType.DEBIT_TANGENTIEL, H2dVariableType.COTE_EAU, H2dVariableTransType.CONCENTRATION }));
+ timeVars_ = new CtuluPermanentList(CtuluLibArray.sort(new Object[] { H2dVariableType.DEBIT_NORMAL, H2dVariableType.DEBIT_TANGENTIEL,
+ H2dVariableType.COTE_EAU, H2dVariableTransType.CONCENTRATION }));
}
}
return timeVars_;
@@ -797,7 +825,9 @@
* @return les valeurs communes a ces index
*/
public H2dRubarTimeConditionCommon getCommonTimeCondition(final int[] _ar) {
- if ((_ar == null) || (_ar.length == 0)) { return H2dRubarTimeConditionCommon.getEmptyCommon(); }
+ if ((_ar == null) || (_ar.length == 0)) {
+ return H2dRubarTimeConditionCommon.getEmptyCommon();
+ }
H2dRubarArete a = g_.getRubarArete(_ar[0]);
H2dRubarTimeConditionCommon r0 = null;
if (a.getType().isTypeDebitGlobal()) {
@@ -816,7 +846,9 @@
} else {
r0.keepSameEvolution((H2dRubarTimeCondition) timeCl_.get(_ar[i]));
}
- if (r0.isNothingInCommons()) { return r0; }
+ if (r0.isNothingInCommons()) {
+ return r0;
+ }
}
return r0;
}
@@ -870,7 +902,9 @@
*/
public List getUsedBoundaryType() {
final Set r = new HashSet(15);
- if (externeAretes_ == null) { return Collections.EMPTY_LIST; }
+ if (externeAretes_ == null) {
+ return Collections.EMPTY_LIST;
+ }
for (int i = externeAretes_.length - 1; i >= 0; i--) {
r.add(externeAretes_[i].getType());
}
@@ -884,7 +918,9 @@
* @return la list des variables correspondantes
*/
public List getVariableAllowed(final H2dRubarBoundaryType _t) {
- if (_t == null) { return null; }
+ if (_t == null) {
+ return null;
+ }
return _t.getAllowedVariable(type_);
}
@@ -916,12 +952,18 @@
* @return true si le type de bord est utilise
*/
public boolean isUsedBoundaryType(final H2dRubarBoundaryType _t) {
- if (externeAretes_ == null || _t == null) { return false; }
- if (_t.isSolide()) { return externeAretes_.length != timeCl_.size(); }
+ if (externeAretes_ == null || _t == null) {
+ return false;
+ }
+ if (_t.isSolide()) {
+ return externeAretes_.length != timeCl_.size();
+ }
final TIntObjectIterator it = timeCl_.iterator();
for (int i = timeCl_.size(); i-- > 0;) {
it.advance();
- if (_t == g_.getRubarArete(it.key()).getType()) { return true; }
+ if (_t == g_.getRubarArete(it.key()).getType()) {
+ return true;
+ }
}
return false;
}
@@ -1002,10 +1044,12 @@
* @param _h l'evo utilisee par defaut pour la hauteur d'eau
* @return la commande si modif TODO transport
*/
- public CtuluCommand setDefined(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _qn,
- final H2dRubarEvolution _qt, final H2dRubarEvolution _h) {
+ public CtuluCommand setDefined(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _qn, final H2dRubarEvolution _qt,
+ final H2dRubarEvolution _h) {
final H2dRubarEvolution h = _h == H2dRubarParameters.NON_TORENTIEL ? null : _h;
- if (isDefined(_t)) { return null; }
+ if (isDefined(_t)) {
+ return null;
+ }
if (flowrateGroups_ == null) {
flowrateGroups_ = new TreeMap();
}
@@ -1037,13 +1081,16 @@
* @param _type le type concerne qn,qt ou h
* @return la commande ou null si aucune modif
*/
- public CtuluCommand setEvolution(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _evolInit,
- final H2dVariableType _type) {
- if (!isDefined(_t)) { return null; }
+ public CtuluCommand setEvolution(final H2dRubarBoundaryFlowrateGroupType _t, final H2dRubarEvolution _evolInit, final H2dVariableType _type) {
+ if (!isDefined(_t)) {
+ return null;
+ }
final H2dRubarEvolution evol = _evolInit == H2dRubarParameters.NON_TORENTIEL ? null : _evolInit;
final H2dRubarTimeCondition r = getGroupTimeCondition(_t);
final H2dRubarEvolution old = r.getEvol(_type);
- if (old == evol) { return null; }
+ if (old == evol) {
+ return null;
+ }
final CtuluCommandCompositeInverse cmd = new CtuluCommandCompositeInverse();
r.setEvolution(_type, evol, cmd);
fireFlowrateGroupChanged(_t);
@@ -1072,7 +1119,9 @@
* @return la commande si modif
*/
public CtuluCommand setUndefined(final H2dRubarBoundaryFlowrateGroupType _t) {
- if (!isDefined(_t) || isUsedBoundaryType(_t)) { return null; }
+ if (!isDefined(_t) || isUsedBoundaryType(_t)) {
+ return null;
+ }
final H2dRubarTimeCondition timeMem = (H2dRubarTimeCondition) flowrateGroups_.remove(_t);
fireFlowrateGroupChanged(_t);
return new CtuluCommand() {
@@ -1090,7 +1139,9 @@
}
public static void groupCommonsCurves(final TIntObjectHashMap _idxCl) {
- if (_idxCl == null) { return; }
+ if (_idxCl == null) {
+ return;
+ }
final Object[] o = _idxCl.getValues();
if (!CtuluLibArray.isEmpty(o)) {
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-04 22:25:16 UTC (rev 6787)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-04 22:27:35 UTC (rev 6788)
@@ -15,7 +15,6 @@
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibString;
-
import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
import org.fudaa.dodico.h2d.resource.H2dResource;
import org.fudaa.dodico.mesure.EvolutionReguliere;
Added: trunk/business/dodico-h2d/io/src/test/resources/org/fudaa/dodico/rubar/io/lmfa05.cn
===================================================================
--- trunk/business/dodico-h2d/io/src/test/resources/org/fudaa/dodico/rubar/io/lmfa05.cn (rev 0)
+++ trunk/business/dodico-h2d/io/src/test/resources/org/fudaa/dodico/rubar/io/lmfa05.cn 2011-12-04 22:27:35 UTC (rev 6788)
@@ -0,0 +1,12 @@
+ 2.6250000000 .77000000000 5.0
+ 2.6250000000 .70000000000 5.0
+ 2.7750000000 .70000000000 5.0
+ 2.7750000000 .77000000000 5.0
+ 2.6250000000 .77000000000 5.0
+ 999.999 999.999 999.999
+ 2.8250000000 .77000000000 6.0
+ 2.8250000000 .70000000000 6.0
+ 2.9750000000 .70000000000 6.0
+ 2.9750000000 .77000000000 6.0
+ 2.8250000000 .77000000000 6.0
+ 999.999 999.999 999.999
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-13 00:57:23
|
Revision: 6833
http://fudaa.svn.sourceforge.net/fudaa/?rev=6833&view=rev
Author: deniger
Date: 2011-12-13 00:57:17 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -292,11 +292,12 @@
}
if (listener_ != null) {
for (final Iterator it = listener_.iterator(); it.hasNext();) {
- ((H2dSIListener) it.next()).siChanged(_v);
+ H2dSIListener siListener = (H2dSIListener) it.next();
+ siListener.siChanged(_v);
if (_v == H2dVariableType.COTE_EAU) {
- ((H2dSIListener) it.next()).siChanged(H2dVariableType.HAUTEUR_EAU);
+ siListener.siChanged(H2dVariableType.HAUTEUR_EAU);
} else if (_v == H2dVariableType.HAUTEUR_EAU) {
- ((H2dSIListener) it.next()).siChanged(H2dVariableType.COTE_EAU);
+ siListener.siChanged(H2dVariableType.COTE_EAU);
}
}
}
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -44,7 +44,7 @@
VAR_FORMAT.put(H2dVariableType.DEBIT_TANGENTIEL, fmt);
VAR_FORMAT.put(H2dVariableType.DEBIT, fmt);
VAR_FORMAT.put(H2dVariableType.DEBIT_NORMAL, fmt);
- fmt = FortranLib.getFormater(10, 7, true);
+ fmt = FortranLib.getFormater(10, 7, false);
VAR_FORMAT.put(H2dVariableTransType.CONCENTRATION, fmt);
fmt = FortranLib.getFormater(15, 4, true);
VAR_FORMAT.put(H2dVariableTransType.APPORT_PLUIE, fmt);
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -7,11 +7,18 @@
*/
package org.fudaa.dodico.rubar.io;
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.EfGridSource;
import org.fudaa.dodico.ef.FileFormatGridVersionAbstract;
+import org.fudaa.dodico.ef.impl.EfGridSourceDefaut;
import org.fudaa.dodico.h2d.resource.H2dResource;
/**
@@ -37,6 +44,19 @@
return instance_;
}
+ public CtuluIOOperationSynthese readGrid(final File _f, final ProgressionInterface _prog) {
+ final CtuluIOOperationSynthese s = read(_f, _prog);
+ if (s.getSource() != null) {
+ final EfGridSourceDefaut r = new EfGridSourceDefaut((EfGridInterface) s.getSource(), this);
+ s.setSource(r);
+ }
+ return s;
+ }
+
+ public CtuluIOOperationSynthese writeGrid(final File _f, final EfGridSource _m, final ProgressionInterface _prog) {
+ return write(_f, _m == null ? null : _m.getGrid(), _prog);
+ }
+
/**
* Initialise toutes les donnees.
*/
@@ -56,19 +76,16 @@
return new RubarIMAWriter();
}
- public boolean canReadGrid()
- {
- return true;
+ public boolean canReadGrid() {
+ return true;
}
-
- public boolean canWriteGrid()
- {
- return true;
+
+ public boolean canWriteGrid() {
+ return true;
}
-
- public boolean hasBoundaryConditons()
- {
- // TODO Voir si correct
- return false;
+
+ public boolean hasBoundaryConditons() {
+ // TODO Voir si correct
+ return false;
}
}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.rubar.io;
+import gnu.trove.TIntArrayList;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,7 +32,9 @@
public int compare(double x1, double y1, double x2, double y2) {
final int result = compare(x1, x2);
- if (result == 0) { return compare(y1, y2); }
+ if (result == 0) {
+ return compare(y1, y2);
+ }
return result;
}
@@ -38,7 +42,9 @@
private static int compare(double d1, double d2) {
if ((d1 > (d2 - epsilon)) && (d1 < (d2 + epsilon))) {
return 0;
- } else if (d1 < d2) { return -1; }
+ } else if (d1 < d2) {
+ return -1;
+ }
return 1;
}
@@ -162,7 +168,7 @@
final double deltaY = Math.abs(ys[0] - ys[divider]) / divider;
final int factorX = (xs[0] < xs[divider]) ? 1 : -1;
final int factorY = (ys[0] < ys[divider]) ? 1 : -1;
-
+
for (int i = 1; i < divider; i++) {
xs[i] = xs[0] + (i * factorX * deltaX);
ys[i] = ys[0] + (i * factorY * deltaY);
@@ -199,17 +205,21 @@
for (int i = 0; i < length1 - 1; i++) {
for (int j = 0; j < length2 - 1; j++) {
- EfElement element;
-
// Triangle
- if (nodes[i][j] == nodes[i + 1][j]) {
- element = new EfElement(new int[] { nodes[i][j], nodes[i][j + 1], nodes[i + 1][j + 1] });
- } else {
- element = new EfElement(new int[] { nodes[i][j], nodes[i][j + 1], nodes[i + 1][j + 1], nodes[i + 1][j] });
- }
-
+ TIntArrayList idxList = new TIntArrayList();
+ idxList.add(nodes[i][j]);
+ addIfNotPresent(idxList, nodes[i][j + 1]);
+ addIfNotPresent(idxList, nodes[i + 1][j + 1]);
+ addIfNotPresent(idxList, nodes[i + 1][j]);
+ EfElement element = new EfElement(idxList.toNativeArray());
elements.add(element);
}
}
}
+
+ private void addIfNotPresent(TIntArrayList idxList, int idx) {
+ if (!idxList.contains(idx)) {
+ idxList.add(idx);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -30,6 +30,7 @@
final List ouv = new ArrayList();
in_.setBlankZero(true);
+ in_.setJumpBlankLine(true);
try {
while (true) {
final RubarOuvrage o = new RubarOuvrage();
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -110,7 +110,7 @@
return null;
}
RubarOutEdgeResult res = (RubarOutEdgeResult) res_.get(idxA);
- if (res == null && !isReadConcentration()) {
+ if (res == null ) {
res = readEdgeResult();
final boolean conforme = res.setRef(in_.intField(7));
if (!conforme) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 02:57:54
|
Revision: 7018
http://fudaa.svn.sourceforge.net/fudaa/?rev=7018&view=rev
Author: deniger
Date: 2012-03-24 02:57:48 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-03-24 02:55:34 UTC (rev 7017)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-core</artifactId>
- <name>Core h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-gis</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </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></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>h2d-core</artifactId>
+ <name>Core h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-03-24 02:55:34 UTC (rev 7017)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-io</artifactId>
- <name>I/O pour h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.dodico</groupId>
- <artifactId>dodico-common</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </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></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>h2d-io</artifactId>
+ <name>I/O pour h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-03-24 02:55:34 UTC (rev 7017)
+++ trunk/business/dodico-h2d/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
@@ -1,47 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-ef.version>1.2</fudaa-ef.version>
- <projetEncoding>ISO-8859-15</projetEncoding>
- <!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>1.2</version>
- </parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
- <name>Fudaa Hydraulique 2d</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>${fudaa-ef.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-ef.version>1.2</fudaa-ef.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>1.2</version>
+ </parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <name>Fudaa Hydraulique 2d</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>${fudaa-ef.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 02:58:33
|
Revision: 7019
http://fudaa.svn.sourceforge.net/fudaa/?rev=7019&view=rev
Author: deniger
Date: 2012-03-24 02:58:27 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.2
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-03-24 02:57:48 UTC (rev 7018)
+++ trunk/business/dodico-h2d/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:02:06
|
Revision: 7020
http://fudaa.svn.sourceforge.net/fudaa/?rev=7020&view=rev
Author: deniger
Date: 2012-03-24 03:01:59 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-03-24 03:01:59 UTC (rev 7020)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-03-24 03:01:59 UTC (rev 7020)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-03-24 02:58:27 UTC (rev 7019)
+++ trunk/business/dodico-h2d/pom.xml 2012-03-24 03:01:59 UTC (rev 7020)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.2</fudaa-ef.version>
+ <fudaa-ef.version>1.3-SNAPSHOT</fudaa-ef.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-06-12 22:25:47
|
Revision: 7324
http://fudaa.svn.sourceforge.net/fudaa/?rev=7324&view=rev
Author: deniger
Date: 2012-06-12 22:25:40 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
[maven-release-plugin] rollback the release of dodico-h2d-1.3
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:25:40 UTC (rev 7324)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
- </parent>
- <artifactId>h2d-core</artifactId>
- <name>Core h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-gis</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>h2d-core</artifactId>
+ <name>Core h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:25:40 UTC (rev 7324)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
- </parent>
- <artifactId>h2d-io</artifactId>
- <name>I/O pour h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.dodico</groupId>
- <artifactId>dodico-common</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>h2d-io</artifactId>
+ <name>I/O pour h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
+++ trunk/business/dodico-h2d/pom.xml 2012-06-12 22:25:40 UTC (rev 7324)
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-ef.version>1.3</fudaa-ef.version>
- <projetEncoding>ISO-8859-15</projetEncoding>
- <!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>1.3</version>
- </parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
- <name>Fudaa Hydraulique 2d</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>${fudaa-ef.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.3</url>
- </scm>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-ef.version>1.3</fudaa-ef.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>1.3</version>
+ </parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <name>Fudaa Hydraulique 2d</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>${fudaa-ef.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-06-12 22:28:03
|
Revision: 7326
http://fudaa.svn.sourceforge.net/fudaa/?rev=7326&view=rev
Author: deniger
Date: 2012-06-12 22:27:57 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.3
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:27:20 UTC (rev 7325)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:27:57 UTC (rev 7326)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-core</artifactId>
- <name>Core h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-gis</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ </parent>
+ <artifactId>h2d-core</artifactId>
+ <name>Core h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:27:20 UTC (rev 7325)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:27:57 UTC (rev 7326)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-io</artifactId>
- <name>I/O pour h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.dodico</groupId>
- <artifactId>dodico-common</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ </parent>
+ <artifactId>h2d-io</artifactId>
+ <name>I/O pour h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-06-12 22:27:20 UTC (rev 7325)
+++ trunk/business/dodico-h2d/pom.xml 2012-06-12 22:27:57 UTC (rev 7326)
@@ -1,53 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-ef.version>1.3</fudaa-ef.version>
- <projetEncoding>ISO-8859-15</projetEncoding>
- <!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>1.3</version>
- </parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- <name>Fudaa Hydraulique 2d</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>${fudaa-ef.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-<!-- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
- </scm>-->
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-ef.version>1.3</fudaa-ef.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>1.3</version>
+ </parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ <name>Fudaa Hydraulique 2d</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>${fudaa-ef.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+<!-- <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
+ </scm>-->
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.3</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-06-12 22:28:28
|
Revision: 7328
http://fudaa.svn.sourceforge.net/fudaa/?rev=7328&view=rev
Author: deniger
Date: 2012-06-12 22:28:22 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:28:13 UTC (rev 7327)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:28:22 UTC (rev 7328)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:28:13 UTC (rev 7327)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:28:22 UTC (rev 7328)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-06-12 22:28:13 UTC (rev 7327)
+++ trunk/business/dodico-h2d/pom.xml 2012-06-12 22:28:22 UTC (rev 7328)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -50,10 +50,4 @@
<developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
<url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
</scm>-->
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.3</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-06-12 22:25:10
|
Revision: 7323
http://fudaa.svn.sourceforge.net/fudaa/?rev=7323&view=rev
Author: deniger
Date: 2012-06-12 22:25:04 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.3
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:19:23 UTC (rev 7322)
+++ trunk/business/dodico-h2d/core/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-core</artifactId>
- <name>Core h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-gis</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ </parent>
+ <artifactId>h2d-core</artifactId>
+ <name>Core h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:19:23 UTC (rev 7322)
+++ trunk/business/dodico-h2d/io/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- </parent>
- <artifactId>h2d-io</artifactId>
- <name>I/O pour h2d</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.dodico</groupId>
- <artifactId>dodico-common</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </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>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ </parent>
+ <artifactId>h2d-io</artifactId>
+ <name>I/O pour h2d</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </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>
+ </build>
+</project>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2012-06-12 22:19:23 UTC (rev 7322)
+++ trunk/business/dodico-h2d/pom.xml 2012-06-12 22:25:04 UTC (rev 7323)
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-ef.version>1.3</fudaa-ef.version>
- <projetEncoding>ISO-8859-15</projetEncoding>
- <!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>1.3</version>
- </parent>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>dodico-h2d</artifactId>
- <version>1.3-SNAPSHOT</version>
- <name>Fudaa Hydraulique 2d</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>${fudaa-ef.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.dodico-h2d</groupId>
- <artifactId>h2d-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
- </scm>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-ef.version>1.3</fudaa-ef.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>1.3</version>
+ </parent>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>dodico-h2d</artifactId>
+ <version>1.3</version>
+ <name>Fudaa Hydraulique 2d</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>${fudaa-ef.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.dodico-h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.3</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.3</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-08-23 06:17:03
|
Revision: 7569
http://fudaa.svn.sourceforge.net/fudaa/?rev=7569&view=rev
Author: deniger
Date: 2012-08-23 06:16:52 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIWriter.java
Modified: trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
===================================================================
--- trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2012-08-22 23:22:32 UTC (rev 7568)
+++ trunk/business/dodico-h2d/core/src/main/resources/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt 2012-08-23 06:16:52 UTC (rev 7569)
@@ -9,7 +9,7 @@
Le vent ne sont pas correct=The wind is invalid
Le nombre maximum autoris\xE9 de pas de temps par chronique est {0}=The maximum number of time steps for a storm water is {0}
Le nombre maximum autoris\xE9 de chroniques est {0}=The maximum allowed number of storm water is {0}
-Le nombre de pas de temps maximum autoris\xE9 a \xE9t\xE9 d\xE9pass\xE9 (200)=The number of timesteps used is greater than the maximum authorized (200)
+Le nombre de pas de temps maximum autoris\xE9 a \xE9t\xE9 d\xE9pass\xE9 (1000)=The number of timesteps used is greater than the maximum authorized (1000)
Ouvrage {0}=Structure {0}
Impossible de transformer le maillage en T3=The grid can't be transformed to T3
Des points de stockage sont mal positionn\xE9s. Ils ont \xE9t\xE9 replac\xE9s au centre de l'\xE9l\xE9ment englobant=The locations of hydrograph points are wrong. These points have been moved to the center of the containing mesh
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIWriter.java 2012-08-22 23:22:32 UTC (rev 7568)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIWriter.java 2012-08-23 06:16:52 UTC (rev 7569)
@@ -97,9 +97,9 @@
}
// NT
final int[] fmt = new int[] { 6 };
- // 200 est le max de pas de temps \xE0 utiliser
- if (nt > 200) {
- analyze_.addError(H2dResource.getS("Le nombre de pas de temps maximum autoris\xE9 a \xE9t\xE9 d\xE9pass\xE9 (200)."), -1);
+ // 1000 est le max de pas de temps \xE0 utiliser
+ if (nt > 1000) {
+ analyze_.addError(H2dResource.getS("Le nombre de pas de temps maximum autoris\xE9 a \xE9t\xE9 d\xE9pass\xE9 (1000)"), -1);
}
w.intField(0, nt);
w.writeFields(fmt);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-30 15:26:52
|
Revision: 7830
http://fudaa.svn.sourceforge.net/fudaa/?rev=7830&view=rev
Author: deniger
Date: 2012-10-30 15:26:43 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
am?\195?\169lioration support format serafin dans Fudaa
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java
trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -23,7 +23,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluCommand;
@@ -39,7 +38,6 @@
import org.fudaa.dodico.mesure.EvolutionReguliereAbstract;
import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
-import com.jhlabs.math.BlackFunction;
import com.memoire.fu.FuLog;
/**
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -371,7 +371,16 @@
public boolean isNodalPropertiesModifiable() {
return getNodalProperties() != null && !getNodalProperties().isEmpty();
}
+
+ boolean xyDoublePrecision;
+ public boolean isXyDoublePrecision() {
+ return xyDoublePrecision;
+ }
+
+
+
+
/**
* Mise a jour une seule fois.
*
Modified: trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
===================================================================
--- trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -189,13 +189,17 @@
final int nbTimeStep = initTimeStep + 100;
SerafinInterface newInter = new SerafinInterface() {
-
@Override
public boolean isVolumique() {
return r.isVolumique();
}
@Override
+ public boolean isXYdoublePrecision() {
+ return r.isXYdoublePrecision();
+ }
+
+ @Override
public boolean isElement(int _idx) {
return r.isElement(_idx);
}
@@ -222,7 +226,9 @@
@Override
public double getValue(int _numVariable, int _pasTemps, int _ptIdx) throws IOException {
- if (_pasTemps < initTimeStep) { return r.getValue(_numVariable, _pasTemps, _ptIdx); }
+ if (_pasTemps < initTimeStep) {
+ return r.getValue(_numVariable, _pasTemps, _ptIdx);
+ }
return Math.random();
}
@@ -243,7 +249,9 @@
@Override
public double getTimeStep(int _i) {
- if (_i < initTimeStep) return r.getTimeStep(_i);
+ if (_i < initTimeStep) {
+ return r.getTimeStep(_i);
+ }
return maxTime + (1 + _i - initTimeStep) * delta;
}
@@ -296,5 +304,4 @@
System.err.println(f2);
}
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-30 16:15:58
|
Revision: 7832
http://fudaa.svn.sourceforge.net/fudaa/?rev=7832&view=rev
Author: deniger
Date: 2012-10-30 16:15:47 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
am?\195?\169lioration support format serafin dans Fudaa
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
Added Paths:
-----------
trunk/business/dodico-h2d/nbactions.xml
Modified: trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
===================================================================
--- trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 16:14:51 UTC (rev 7831)
+++ trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 16:15:47 UTC (rev 7832)
@@ -9,6 +9,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Map;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
@@ -195,6 +196,11 @@
}
@Override
+ public Map getOptions() {
+ return null;
+ }
+
+ @Override
public boolean isXYdoublePrecision() {
return r.isXYdoublePrecision();
}
Added: trunk/business/dodico-h2d/nbactions.xml
===================================================================
--- trunk/business/dodico-h2d/nbactions.xml (rev 0)
+++ trunk/business/dodico-h2d/nbactions.xml 2012-10-30 16:15:47 UTC (rev 7832)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy</actionName>
+ <displayName>deploy</displayName>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </action>
+ </actions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-26 21:10:50
|
Revision: 8745
http://sourceforge.net/p/fudaa/svn/8745
Author: deniger
Date: 2014-05-26 21:10:46 +0000 (Mon, 26 May 2014)
Log Message:
-----------
correction bogues
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2014-05-26 21:08:19 UTC (rev 8744)
+++ trunk/business/dodico-h2d/core/pom.xml 2014-05-26 21:10:46 UTC (rev 8745)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2014-05-26 21:08:19 UTC (rev 8744)
+++ trunk/business/dodico-h2d/io/pom.xml 2014-05-26 21:10:46 UTC (rev 8745)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X