Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-11 18:40:55
|
Revision: 5225
http://fudaa.svn.sourceforge.net/fudaa/?rev=5225&view=rev
Author: deniger
Date: 2009-10-11 18:40:46 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/fudaa-common-corba/pom.xml
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2009-10-11 18:35:51 UTC (rev 5224)
+++ trunk/business/dodico-corba/pom.xml 2009-10-11 18:40:46 UTC (rev 5225)
@@ -1,14 +1,32 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <fudaa-framework.version>1.1-SNAPSHOT</fudaa-framework.version>
+ </properties>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
- <version>1.1-SNAPSHOT</version>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business</artifactId>
+ <version>0.2</version>
</parent>
- <groupId>${dodicoGroupId}</groupId>
+ <groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
+ <version>1.0</version>
<name>dodico-corba</name>
+ <!-- on importe les dépendences du framework -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
+ <version>${fudaa-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>jsci</groupId>
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2009-10-11 18:35:51 UTC (rev 5224)
+++ trunk/business/fudaa-common-corba/pom.xml 2009-10-11 18:40:46 UTC (rev 5225)
@@ -1,22 +1,44 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <dodico-corba.version>1.0</dodico-corba.version>
+ </properties>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
- <version>1.1-SNAPSHOT</version>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business</artifactId>
+ <version>0.2</version>
</parent>
- <groupId>${fudaaGroupId}</groupId>
+ <groupId>org.fudaa.business</groupId>
<artifactId>fudaa-common-corba</artifactId>
+ <version>1.0</version>
<name>fudaa-common-corba</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>dodico-corba</artifactId>
+ <version>${dodico-corba.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>dodico-corba</artifactId>
+ <version>${dodico-corba.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>${fudaaGroupId}</groupId>
<artifactId>fudaa-common</artifactId>
</dependency>
<dependency>
- <groupId>${dodicoGroupId}</groupId>
+ <groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
+ <version>${dodico-corba.version}</version>
</dependency>
<dependency>
<groupId>${ebliGroupId}</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-13 20:42:14
|
Revision: 5255
http://fudaa.svn.sourceforge.net/fudaa/?rev=5255&view=rev
Author: deniger
Date: 2009-10-13 20:42:06 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/business/fudaa-ef/
trunk/business/fudaa-ef/client/
trunk/business/fudaa-ef/client/.settings/
trunk/business/fudaa-ef/client/.settings/org.eclipse.core.resources.prefs
trunk/business/fudaa-ef/client/.settings/org.eclipse.jdt.core.prefs
trunk/business/fudaa-ef/client/pom.xml
trunk/business/fudaa-ef/client/src/
trunk/business/fudaa-ef/client/src/main/
trunk/business/fudaa-ef/client/src/main/java/
trunk/business/fudaa-ef/client/src/main/resources/
trunk/business/fudaa-ef/client/src/site/
trunk/business/fudaa-ef/client/src/test/
trunk/business/fudaa-ef/client/src/test/java/
trunk/business/fudaa-ef/core/
trunk/business/fudaa-ef/core/.settings/
trunk/business/fudaa-ef/core/.settings/org.eclipse.core.resources.prefs
trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/core/src/
trunk/business/fudaa-ef/core/src/main/
trunk/business/fudaa-ef/core/src/main/java/
trunk/business/fudaa-ef/core/src/main/java/org/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/AllFrontierIteratorInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfData.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataElement.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataInterpolationAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfElement.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfElementType.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfElementVolume.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterNone.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedElement.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterTime.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFrontierInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridData.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridDataInterpolationValuesAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridSource.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridVolumeInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfIndexInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfIndexVisitor.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfNeighborMesh.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfNodeMutable.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfSegment.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfSegmentMutable.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfVoisinageFinderActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersion.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersionAbstract.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfBilanHelper.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolume.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfDataIntegrale.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/AbstractEfGridDataDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataCacheOneTimeDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataCacheSoftReferenceDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataOneTimeDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataRenumeroteDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataT64T3Decorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataTimeDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataToT6Decorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfGridDataTranslateDecorator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/decorator/EfSwapListManager.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EFGridArrayZ.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfFoundSegment.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfFrontier.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGrid.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridAbstract.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridArray.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridBathyAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDataDefault.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridGisAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridMutable.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridRedispatched.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridTranslate.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridVolume.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridVolumeArray.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfLibImpl.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfRefinedGridAddedPt.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/FrontierIteratorInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/interpolation/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/interpolation/EfGridDataInterpolator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/interpolation/EfInterpolationTargetGridAdapter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/interpolation/EfInterpolator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/AbstractEfOperation.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfComparator.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexHelper.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexRegular.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSet.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSetNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestElt.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexVisitorNodeSelect.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIndexerActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridResult.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoResultDefault.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoResultInterface.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersection.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionI.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionParent.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionParentDefault.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionTester.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsBuilder.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsDefault.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsI.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsMng.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineIntersectorActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfLineSingleIntersectFinder.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfOperation.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfOperationResult.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireGridDataProvider.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireMarqueurBuilder.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireParameters.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireParametersMarqueur.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfTrajectoireResultBuilder.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfFindEdgeToSwap.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationSwapSelectedEdge.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfOperationRefine.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleResult.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationBackElimination.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationShufle.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/type/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/type/EfOperationToT3.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/type/EfOperationToT6.java
trunk/business/fudaa-ef/core/src/main/resources/
trunk/business/fudaa-ef/core/src/site/
trunk/business/fudaa-ef/core/src/test/
trunk/business/fudaa-ef/core/src/test/java/
trunk/business/fudaa-ef/core/src/test/java/org/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/EfTestFactory.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/TestJLineIntersection.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/TestJSearchInGrid.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/TestJSearchIso.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/decorator/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/decorator/TestEfSwapListManager.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/overstressed/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/overstressed/TestEfFindEdgeToSwap.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/overstressed/TestEfOperationOverstressed.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/overstressed/TestEfOperationSwapSelectedEdge.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/refine/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/refine/TestEfOperationRefine.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/renum/
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/renum/TestEfOperationShufle.java
trunk/business/fudaa-ef/io/
trunk/business/fudaa-ef/io/.settings/
trunk/business/fudaa-ef/io/.settings/org.eclipse.core.resources.prefs
trunk/business/fudaa-ef/io/.settings/org.eclipse.jdt.core.prefs
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/io/src/
trunk/business/fudaa-ef/io/src/main/
trunk/business/fudaa-ef/io/src/main/java/
trunk/business/fudaa-ef/io/src/main/java/org/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/EfIOResource.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/olb/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/olb/exec/
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/olb/exec/OLBExec.java
trunk/business/fudaa-ef/io/src/main/resources/
trunk/business/fudaa-ef/io/src/main/resources/org/
trunk/business/fudaa-ef/io/src/main/resources/org/fudaa/
trunk/business/fudaa-ef/io/src/main/resources/org/fudaa/dodico/
trunk/business/fudaa-ef/io/src/main/resources/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/io/src/main/resources/org/fudaa/dodico/ef/io/
trunk/business/fudaa-ef/io/src/main/resources/org/fudaa/dodico/ef/io/efio_en.fr_txt
trunk/business/fudaa-ef/io/src/site/
trunk/business/fudaa-ef/io/src/test/
trunk/business/fudaa-ef/io/src/test/java/
trunk/business/fudaa-ef/pom.xml
trunk/business/fudaa-ef/src/
Added: trunk/business/fudaa-ef/client/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/business/fudaa-ef/client/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/business/fudaa-ef/client/.settings/org.eclipse.core.resources.prefs 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,3 @@
+#Tue Jul 21 11:46:37 CEST 2009
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-15
Added: trunk/business/fudaa-ef/client/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/business/fudaa-ef/client/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/business/fudaa-ef/client/.settings/org.eclipse.jdt.core.prefs 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,5 @@
+#Tue Jul 21 11:57:47 CEST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: trunk/business/fudaa-ef/client/pom.xml
===================================================================
--- trunk/business/fudaa-ef/client/pom.xml (rev 0)
+++ trunk/business/fudaa-ef/client/pom.xml 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,25 @@
+<?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.ef</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>client</artifactId>
+ <name>EF Client</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/business/fudaa-ef/core/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/business/fudaa-ef/core/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/business/fudaa-ef/core/.settings/org.eclipse.core.resources.prefs 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,3 @@
+#Tue Jul 21 11:46:37 CEST 2009
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-15
Added: trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,5 @@
+#Tue Jul 21 11:57:47 CEST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml (rev 0)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,29 @@
+<?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.ef</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>core</artifactId>
+ <name>EF Core</name>
+ <dependencies>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/AllFrontierIteratorInterface.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/AllFrontierIteratorInterface.java (rev 0)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/AllFrontierIteratorInterface.java 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,30 @@
+/*
+ * @creation 17 janv. 07
+ * @modification $Date: 2007-01-19 13:07:19 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.ef;
+
+import org.fudaa.dodico.commun.DodicoIntIterator;
+
+/**
+ * @author fred deniger
+ * @version $Id: AllFrontierIteratorInterface.java,v 1.1 2007-01-19 13:07:19 deniger Exp $
+ */
+public interface AllFrontierIteratorInterface extends DodicoIntIterator {
+
+ int getBordIDx();
+
+ /**
+ * @return l'indice du point sur les frontieres
+ */
+ int getFrontierIdx();
+
+ /**
+ * Return the next index in the general numbering.
+ */
+ int next();
+
+}
\ No newline at end of file
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfData.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfData.java (rev 0)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfData.java 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,23 @@
+/**
+ * @creation 18 mars 2004
+ * @modification $Date: 2007-01-10 09:04:17 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.ef;
+
+import org.fudaa.ctulu.collection.CtuluCollectionDouble;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: EfData.java,v 1.4 2007-01-10 09:04:17 deniger Exp $
+ */
+public interface EfData extends CtuluCollectionDouble {
+
+ /**
+ * @return true si c'est des donn\xE9es par elements
+ */
+ boolean isElementData();
+
+}
\ No newline at end of file
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataAdapter.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataAdapter.java (rev 0)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataAdapter.java 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,78 @@
+/*
+ * @creation 19 d\xE9c. 2005
+ * @modification $Date: 2007-05-04 13:45:58 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.ef;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluRange;
+import org.fudaa.ctulu.collection.CtuluCollectionDouble;
+import org.fudaa.ctulu.collection.CtuluDoubleVisitor;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: EfDataAdapter.java,v 1.10 2007-05-04 13:45:58 deniger Exp $
+ */
+public class EfDataAdapter implements EfData {
+
+ final boolean isElement_;
+ final CtuluCollectionDouble model_;
+
+ /**
+ * @param _model
+ */
+ public EfDataAdapter(final CtuluCollectionDouble _model, final boolean _isElement) {
+ super();
+ model_ = _model;
+ isElement_ = _isElement;
+ }
+
+ public void expandTo(final CtuluRange _rangeToExpand) {
+ model_.expandTo(_rangeToExpand);
+ }
+
+ public void getRange(final CtuluRange _r) {
+ model_.getRange(_r);
+
+ }
+
+ public Double getCommonValue(final int[] _i) {
+ return model_.getCommonValue(_i);
+ }
+
+ public double getMax() {
+ return model_.getMax();
+ }
+
+ public double getMin() {
+ return model_.getMin();
+ }
+
+ public int getSize() {
+ return model_.getSize();
+ }
+
+ public double getValue(final int _i) {
+ return model_ == null ? 0 : model_.getValue(_i);
+ }
+
+ public Object getObjectValueAt(final int _i) {
+ return CtuluLib.getDouble(getValue(_i));
+ }
+
+ public double[] getValues() {
+ return model_.getValues();
+ }
+
+ public boolean isElementData() {
+ return isElement_;
+ }
+
+ public void iterate(final CtuluDoubleVisitor _visitor) {
+ model_.iterate(_visitor);
+ }
+
+}
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataElement.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataElement.java (rev 0)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataElement.java 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,70 @@
+/**
+ * @creation 17 d\xE9c. 2004
+ * @modification $Date: 2007-01-10 09:04:17 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+* @mail de...@fu...
+ */
+package org.fudaa.dodico.ef;
+
+import gnu.trove.TDoubleArrayList;
+
+import org.fudaa.ctulu.collection.CtuluArrayDoubleImmutable;
+import org.fudaa.ctulu.collection.CtuluCollectionDouble;
+
+
+/**
+ * @author Fred Deniger
+ * @version $Id: EfDataElement.java,v 1.3 2007-01-10 09:04:17 deniger Exp $
+ */
+public class EfDataElement extends CtuluArrayDoubleImmutable implements EfData{
+
+ /**
+ * @param _init
+ */
+ public EfDataElement(final CtuluArrayDoubleImmutable _init) {
+ super(_init);
+ }
+
+ /**
+ * @param _init
+ */
+ public EfDataElement(final CtuluCollectionDouble _init) {
+ super(_init);
+ }
+
+ /**
+ * @param _init
+ */
+ public EfDataElement(final double[] _init) {
+ super(_init);
+ }
+
+ /**
+ * @param _nb
+ */
+ public EfDataElement(final int _nb) {
+ super(_nb);
+ }
+
+ /**
+ * @param _init
+ */
+ public EfDataElement(final Object[] _init) {
+ super(_init);
+ }
+
+ /**
+ * @param _init
+ */
+ public EfDataElement(final TDoubleArrayList _init) {
+ super(_init);
+ }
+
+ public final boolean isElementData(){
+ return true;
+ }
+
+
+
+}
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataInterpolationAdapter.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataInterpolationAdapter.java (rev 0)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataInterpolationAdapter.java 2009-10-13 20:42:06 UTC (rev 5255)
@@ -0,0 +1,45 @@
+/*
+ * @creation 30 mai 07
+ * @modification $Date: 2007-06-05 08:59:13 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.ef;
+
+import org.fudaa.ctulu.interpolation.InterpolationCollectionAdapter;
+
+/**
+ * @author fred deniger
+ * @version $Id: EfDataInterpolationAdapter.java,v 1.1 2007-06-05 08:59:13 deniger Exp $
+ */
+public final class EfDataInterpolationAdapter {
+
+ public static class Norm extends InterpolationCollectionAdapter.Norm implements EfData {
+
+ public Norm(EfData _vx, EfData _vy) {
+ super(_vx, _vy);
+ vx_ = _vx;
+ }
+
+ final EfData vx_;
+
+ public boolean isElementData() {
+ return vx_.isElementData();
+ }
+
+ }
+ public static class Theta extends InterpolationCollectionAdapter.Theta implements EfData {
+
+ public Theta(EfData _vx, EfData _vy) {
+ super(_vx, _vy);
+ vx_ = _vx;
+ }
+
+ final EfData vx_;
+
+ public boolean isElementData() {
+ return vx_.isElementData();
+ }
+ }
+}
Added: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataNode.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfDataNode....
[truncated message content] |
|
From: <de...@us...> - 2009-10-14 22:03:51
|
Revision: 5270
http://fudaa.svn.sourceforge.net/fudaa/?rev=5270&view=rev
Author: deniger
Date: 2009-10-14 22:03:34 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/business/dodico-h2d/
trunk/business/dodico-h2d/core/
trunk/business/dodico-h2d/core/.settings/
trunk/business/dodico-h2d/core/.settings/org.eclipse.core.resources.prefs
trunk/business/dodico-h2d/core/.settings/org.eclipse.jdt.core.prefs
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/core/src/
trunk/business/dodico-h2d/core/src/main/
trunk/business/dodico-h2d/core/src/main/java/
trunk/business/dodico-h2d/core/src/main/java/org/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2DLib.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2DNodalPropertyMixteChangeListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2DSiProfilListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcFrontierBlockAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcFrontierBlockInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcFrontierInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcFrontierMiddleInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcListenerDispatcher.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcManagerAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcManagerBlockAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcManagerBlockInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBcManagerMiddleInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBoundary.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBoundaryCondition.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBoundaryMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dBoundaryTypeControllerInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dEvolutionFrontiereLiquide.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dEvolutionFrontiereLiquideMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dEvolutionUseCounter.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dEvolutionVariableMap.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dNodalPropertiesMngAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dNodalPropertiesMngI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dNodalProperty.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dNodalPropertyMixte.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dNodalPropertyMixteMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParallelogrammeData.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParallelogrammeDataAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParallelogrammeDataInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParallelogrammeManagerInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dParameters.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dProjectDispatcherListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dRegularGrid.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dRegularGridData.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dRegularGridDataInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dRegularGridInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dSIListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dSiSourceInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dSpatialPropertyAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dSpatialPropertyInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dTimeStepGroup.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dVariableProviderContainerInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/H2dVariableProviderInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBcListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBcManager.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBordIndexGeneral.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundary.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryCondition.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMiddle.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMiddleFriction.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxDicoModel.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxDicoVersion.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxElementImposedProperty.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxElementProperty.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyCourant2dMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyMngAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyMngListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxNodalPropertiesListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxNodalPropertiesMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxParameters.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxProjectDispatcherListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxSICourant2D.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxSolutionInitAdapterInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxSolutionInitialeInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxSourceInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxValue.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxValueCommonMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/reflux/H2dRefluxVarEltProvider.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/resource/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/resource/H2dResource.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/resource/h2d_en.fr_txt
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarDicoCasFileFormatVersion.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarDicoModelTransport.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarDicoParams.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarDiffusionListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarDiffusionModel.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarFrictionListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarFrictionModel.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2DRubarSolutionsInitialesInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarAppInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarApportListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarApportSpatialMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarArete.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarBcListener.java
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/H2dRubarDTRResult.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDicoModel.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesBathy.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesDiffusion.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesFrottement.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesIni.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesVisitorClient.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarElementProperty.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarElementPropertyAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarEvolution.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarGrid.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarGridAreteDefault.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarGridAreteSource.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarLimniListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarLimniMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarNumberFormatter.java
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/H2dRubarOuvrageContainer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElemBuilder.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireApport.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireApportI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireBreche.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireBrecheI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireDeversoir.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireDeversoirI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireTransfert.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireTransfertDebitI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageTypeCreator.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarParameters.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarProjectDispatcherListener.java
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/H2dRubarTarageListener.java
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/H2dRubarTimeCondition.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionCommon.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarVF2MResultInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2DTelemacNodalPropertiesDelegate.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2DTelemacNodalPropertiesMngAbstract.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcManager.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameter.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterConcentration.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterElevation.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterFactory.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterFlowrate.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterLiquidOption.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterSedimentEvol.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterTracer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterVelocity.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterVelocityProfil.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBordParFrontiere.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundary.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryCondition.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryConditionMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryMutable.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLSourceInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacDicoFileFormatVersion.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacDicoParams.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacEvolutionUsedListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalPropListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java
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/H2dTelemacProjectDispatcherListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSIProperties.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuil.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilContainer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilSiphonContainer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSiphonContainer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSiphonInterface.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSource.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacTransient.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dtelemacSiphon.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dtelemacSiponListener.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dBcType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dBoundaryHouleType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dBoundaryType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dBoundaryTypeCommon.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dProjetType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRefluxBoundaryType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRefluxImpressionType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dResolutionMethodType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dResolutionSchemaType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarBcTypeList.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarBoundaryDefaultType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarBoundaryFlowrateGroupType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarBoundaryFlowrateType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarBoundaryType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarOuvrageRef.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarOuvrageType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarOuvrageTypeClient.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dRubarProjetType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableTimeType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableTransType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableTypeContainer.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableTypeCreated.java
trunk/business/dodico-h2d/core/src/main/resources/
trunk/business/dodico-h2d/core/src/site/
trunk/business/dodico-h2d/core/src/test/
trunk/business/dodico-h2d/core/src/test/java/
trunk/business/dodico-h2d/core/src/test/java/org/
trunk/business/dodico-h2d/core/src/test/java/org/fudaa/
trunk/business/dodico-h2d/core/src/test/java/org/fudaa/dodico/
trunk/business/dodico-h2d/core/src/test/java/org/fudaa/dodico/h2d/
trunk/business/dodico-h2d/core/src/test/java/org/fudaa/dodico/h2d/TestJMaillage.java
trunk/business/dodico-h2d/io/
trunk/business/dodico-h2d/io/.settings/
trunk/business/dodico-h2d/io/.settings/org.eclipse.core.resources.prefs
trunk/business/dodico-h2d/io/.settings/org.eclipse.jdt.core.prefs
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/io/src/
trunk/business/dodico-h2d/io/src/main/
trunk/business/dodico-h2d/io/src/main/java/
trunk/business/dodico-h2d/io/src/main/java/org/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/exec/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/exec/RefluxExec.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/exec/reflux-launch.tpl.bat
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/exec/reflux-launch.tpl.sh
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLTransitoireFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CrbFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CrbReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CrbWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPInterface.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPReaderAbstract.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPReaderV5P0.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPReaderV5P1.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPWriterAbstract.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPWriterV5P0.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/INPWriterV5P1.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/PnTransitoireFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadBERFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadBERReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadPROFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadPROReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadSEMFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/ReflucadSEMReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxINPV5P0Version.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxINPV5P1Version.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxInpAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxRefondeResultatGisAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxRefondeSolutionFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxRefondeSolutionNewReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxRefondeSolutionSequentielResult.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSollicitationFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSollicitationFortranAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSollicitationReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionInitAdapter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionInitFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionInitReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionInitWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionInterface.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionSequentielReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/RefluxSolutionWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/refonde/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/refonde/io/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/refonde/io/RefondeINPResult.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/refonde/io/RefondeINPResultDefault.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/refonde/io/RefondeQuickINPReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/RubarExecAbstract.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/RubarRubarExec.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/RubarRubarSedimentExec.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/RubarVF2MExec.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/RubarVFALUVExec.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarAPPFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarAPPReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarAPPResult.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarAPPWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCINFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCINReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCINResult.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCINWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCLIFileFormat.java
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/RubarCLIWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCOTFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarCOXFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarDATFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarDATReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarDATWriter.java
trunk/bus...
[truncated message content] |
|
From: <de...@us...> - 2009-10-15 18:30:31
|
Revision: 5281
http://fudaa.svn.sourceforge.net/fudaa/?rev=5281&view=rev
Author: deniger
Date: 2009-10-15 18:30:21 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/fudaa-common-corba/pom.xml
Removed Paths:
-------------
trunk/business/fudaa-common-corba/src/main/java/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java
Property Changed:
----------------
trunk/business/dodico-h2d/
trunk/business/dodico-h2d/core/
trunk/business/dodico-h2d/io/
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2009-10-15 18:22:55 UTC (rev 5280)
+++ trunk/business/dodico-corba/pom.xml 2009-10-15 18:30:21 UTC (rev 5281)
@@ -7,8 +7,8 @@
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
- <artifactId>business</artifactId>
- <version>0.2</version>
+ <artifactId>business-pom</artifactId>
+ <version>0.3</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
Property changes on: trunk/business/dodico-h2d
___________________________________________________________________
Added: svn:ignore
+ .project
target
Property changes on: trunk/business/dodico-h2d/core
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
Property changes on: trunk/business/dodico-h2d/io
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
target
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2009-10-15 18:22:55 UTC (rev 5280)
+++ trunk/business/fudaa-common-corba/pom.xml 2009-10-15 18:30:21 UTC (rev 5281)
@@ -7,8 +7,8 @@
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
- <artifactId>business</artifactId>
- <version>0.2</version>
+ <artifactId>business-pom</artifactId>
+ <version>0.3</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>fudaa-common-corba</artifactId>
Deleted: trunk/business/fudaa-common-corba/src/main/java/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java
===================================================================
--- trunk/business/fudaa-common-corba/src/main/java/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java 2009-10-15 18:22:55 UTC (rev 5280)
+++ trunk/business/fudaa-common-corba/src/main/java/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java 2009-10-15 18:30:21 UTC (rev 5281)
@@ -1,101 +0,0 @@
-/*
- * @file FudaaProjetInformationPanel.java
- * @creation 23 mars 2004
- * @modification $Date: 2006-10-19 13:55:16 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.commun.projet;
-
-import java.awt.Frame;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuGridLayout;
-import com.memoire.bu.BuInformationsDocument;
-import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.bu.BuTextArea;
-import com.memoire.bu.BuTextField;
-
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-
-import org.fudaa.fudaa.commun.FudaaLib;
-
-/**
- * @author Fred Deniger
- * @version $Id: FudaaProjetInformationPanel.java,v 1.7 2006-10-19 13:55:16 deniger Exp $
- */
-public class FudaaProjetInformationPanel extends CtuluDialogPanel {
-
- BuInformationsDocument d_;
- BuTextField author_;
- BuTextField date_;
- BuTextArea com_;
-
- /**
- * @param _d les infos non nulles
- */
- public FudaaProjetInformationPanel(final BuInformationsDocument _d) {
- super();
- d_ = _d;
- addEmptyBorder(10);
- final BuPanel pn = new BuPanel();
- pn.setLayout(new BuGridLayout(2, 5, 5));
- author_ = addLabelStringText(pn, FudaaLib.getS("Auteur"));
- author_.setText(d_.author);
- date_ = addLabelStringText(pn, FudaaLib.getS("Date"));
- date_.setText(d_.date);
- setLayout(new BuBorderLayout(10, 10));
- add(pn, BuBorderLayout.CENTER);
- com_ = new BuTextArea();
- com_.setText(d_.comment);
- add(new BuScrollPane(com_), BuBorderLayout.SOUTH);
- }
-
- /**
- * @return les nouvelles info sur le doc si modifie. null sinon
- */
- public BuInformationsDocument getModifyDoc(){
- boolean change = false;
- if (!d_.author.equals(author_.getText().trim())) {
- change = true;
- }
- else if (!d_.date.equals(date_.getText().trim())) {
- change = true;
- }
- else if (!d_.comment.equals(com_.getText().trim())) {
- change = true;
- }
- if (change) {
- final BuInformationsDocument r = new BuInformationsDocument();
- r.author = author_.getText().trim();
- r.date = date_.getText().trim();
- r.comment = com_.getText().trim();
- return r;
- }
- return null;
- }
-
- /**
- * @param _f la fenetre
- * @param _init le document init
- * @return le doc modifie ou nul si pas de modif
- */
- public static BuInformationsDocument editInfoDoc(final Frame _f,final BuInformationsDocument _init){
- BuInformationsDocument init = _init;
- if (init == null) {
- init = new BuInformationsDocument();
- }
- final FudaaProjetInformationPanel pn = new FudaaProjetInformationPanel(init);
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_f))) {
- final BuInformationsDocument d = pn.getModifyDoc();
- if (d != null) {
- return d;
- } else if (_init == null) {
- return init;
- }
- }
- return null;
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-15 19:57:06
|
Revision: 5296
http://fudaa.svn.sourceforge.net/fudaa/?rev=5296&view=rev
Author: deniger
Date: 2009-10-15 19:56:52 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/dodico-h2d/pom.xml
trunk/business/fudaa-ef/pom.xml
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
+++ trunk/business/dodico-corba/pom.xml 2009-10-15 19:56:52 UTC (rev 5296)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.1-SNAPSHOT</fudaa-framework.version>
+ <fudaa-framework.version>1.0</fudaa-framework.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
@@ -12,7 +12,7 @@
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<name>dodico-corba</name>
<!-- on importe les dépendences du framework -->
<dependencyManagement>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-15 19:56:52 UTC (rev 5296)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.0-SNAPSHOT</fudaa-ef.version>
+ <fudaa-ef.version>1.0</fudaa-ef.version>
</properties>
<parent>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-15 19:56:52 UTC (rev 5296)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.1-SNAPSHOT</fudaa-framework.version>
+ <fudaa-framework.version>1.0</fudaa-framework.version>
</properties>
<parent>
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
+++ trunk/business/fudaa-sig/pom.xml 2009-10-15 19:56:52 UTC (rev 5296)
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
- <dodico-h2d.version>1.0-SNAPSHOT</dodico-h2d.version>
+ <dodico-h2d.version>1.0</dodico-h2d.version>
</properties>
<parent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-16 20:01:35
|
Revision: 5308
http://fudaa.svn.sourceforge.net/fudaa/?rev=5308&view=rev
Author: deniger
Date: 2009-10-16 20:01:28 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
trunk/business/fudaa-common-corba/pom.xml
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/dodico-corba/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
@@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
+ <artifactId>fudaa-framework</artifactId>
<version>${fudaa-framework.version}</version>
<type>pom</type>
<scope>import</scope>
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/dodico-h2d/core/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.business.h2d</groupId>
- <artifactId>project</artifactId>
+ <artifactId>dodico-h2d</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.h2d</groupId>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/dodico-h2d/io/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.business.h2d</groupId>
- <artifactId>project</artifactId>
+ <artifactId>dodico-h2d</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.h2d</groupId>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -11,10 +11,10 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.business.h2d</groupId>
- <artifactId>project</artifactId>
+ <artifactId>dodico-h2d</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
@@ -26,7 +26,7 @@
<dependencies>
<dependency>
<groupId>org.fudaa.business.ef</groupId>
- <artifactId>project</artifactId>
+ <artifactId>fudaa-ef</artifactId>
<version>${fudaa-ef.version}</version>
<type>pom</type>
<scope>import</scope>
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/fudaa-common-corba/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>fudaa-common-corba</artifactId>
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.business.ef</groupId>
- <artifactId>project</artifactId>
+ <artifactId>fudaa-ef</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.business.ef</groupId>
- <artifactId>project</artifactId>
+ <artifactId>fudaa-ef</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -11,10 +11,10 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
- <artifactId>project</artifactId>
+ <artifactId>fudaa-ef</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
+ <artifactId>fudaa-framework</artifactId>
<version>${fudaa-framework.version}</version>
<type>pom</type>
<scope>import</scope>
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2009-10-16 19:51:59 UTC (rev 5307)
+++ trunk/business/fudaa-sig/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
@@ -10,17 +10,17 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.business.sig</groupId>
- <artifactId>sig-ui</artifactId>
+ <artifactId>fudaa-sig</artifactId>
<version>1.0-SNAPSHOT</version>
<name>sig-ui</name>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.fudaa.business.h2d</groupId>
- <artifactId>project</artifactId>
+ <artifactId>dodico-h2d</artifactId>
<version>${dodico-h2d.version}</version>
<type>pom</type>
<scope>import</scope>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-15 18:23:08
|
Revision: 5280
http://fudaa.svn.sourceforge.net/fudaa/?rev=5280&view=rev
Author: deniger
Date: 2009-10-15 18:22:55 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/business/fudaa-sig/
trunk/business/fudaa-sig/.settings/
trunk/business/fudaa-sig/.settings/org.eclipse.core.resources.prefs
trunk/business/fudaa-sig/.settings/org.eclipse.jdt.core.prefs
trunk/business/fudaa-sig/pom.xml
trunk/business/fudaa-sig/src/
trunk/business/fudaa-sig/src/main/
trunk/business/fudaa-sig/src/main/java/
trunk/business/fudaa-sig/src/main/java/org/
trunk/business/fudaa-sig/src/main/java/org/fudaa/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttibuteTypeManager.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeTableModel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigFilterZone.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigFilterZoneActivity.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcData.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcDataUtils.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLayerGroupSaver.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLayerLineAddedSaver.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLayerPointAddedSaver.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLib.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLoaderPreviewer.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigProjectPersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigProjet.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarAttrMapperTableModel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarPolygoneModifierActivity.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResultSub.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigGrillePalette.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerAction.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLine.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerPointEditable.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigVisuPanelController.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerGroupPersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerLinePersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerMultiPointPersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderCsv.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGIS.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGrid.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderI.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderInp.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderReflucadBER.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderReflucadPRO.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderReflucadSEM.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarCox.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarInx.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSem.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRubarSt.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardPanelController.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalage.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepImage.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardTableModel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardTask.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardDefaultPanel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileMng.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardImport.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardImportHelper.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardImportStepDestination.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardStepInterface.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
trunk/business/fudaa-sig/src/main/resources/
trunk/business/fudaa-sig/src/main/resources/org/
trunk/business/fudaa-sig/src/main/resources/org/fudaa/
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/package.html
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/persistence/
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/persistence/lisez-moi.txt
trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/persistence/readme.txt
trunk/business/fudaa-sig/src/site/
trunk/business/fudaa-sig/src/test/
trunk/business/fudaa-sig/src/test/java/
trunk/business/fudaa-sig/src/test/java/org/
trunk/business/fudaa-sig/src/test/java/org/fudaa/
trunk/business/fudaa-sig/src/test/java/org/fudaa/fudaa/
trunk/business/fudaa-sig/src/test/java/org/fudaa/fudaa/sig/
trunk/business/fudaa-sig/src/test/java/org/fudaa/fudaa/sig/TestSigAttributesExample.java
Added: trunk/business/fudaa-sig/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/business/fudaa-sig/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/business/fudaa-sig/.settings/org.eclipse.core.resources.prefs 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,3 @@
+#Tue Jul 21 11:46:37 CEST 2009
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-15
Added: trunk/business/fudaa-sig/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/business/fudaa-sig/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/business/fudaa-sig/.settings/org.eclipse.jdt.core.prefs 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,5 @@
+#Tue Jul 21 11:57:47 CEST 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml (rev 0)
+++ trunk/business/fudaa-sig/pom.xml 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,44 @@
+<?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>
+ <dodico-h2d.version>1.0-SNAPSHOT</dodico-h2d.version>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>0.3</version>
+ </parent>
+ <groupId>org.fudaa.business.sig</groupId>
+ <artifactId>sig-ui</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>sig-ui</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>project</artifactId>
+ <version>${dodico-h2d.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.h2d</groupId>
+ <artifactId>h2d-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-2d</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa</groupId>
+ <artifactId>fudaa-common-save</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttibuteTypeManager.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttibuteTypeManager.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttibuteTypeManager.java 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,123 @@
+/*
+ * @creation 18 mai 2005
+ * @modification $Date: 2006-09-19 15:10:21 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.sig;
+
+import gnu.trove.TObjectIntHashMap;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.fudaa.ctulu.CtuluVariable;
+import org.fudaa.ctulu.gis.GISAttributeBoolean;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInteger;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISAttributeString;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: FSigAttibuteTypeManager.java,v 1.4 2006-09-19 15:10:21 deniger Exp $
+ */
+public class FSigAttibuteTypeManager {
+
+ final Map atts_ = new TreeMap();
+ final TObjectIntHashMap attUsed_ = new TObjectIntHashMap();
+
+ public GISAttributeInterface getAttribute(final String _name) {
+ return (GISAttributeInterface) atts_.get(_name);
+ }
+
+ public boolean contains(final String _name) {
+ return atts_.containsKey(_name);
+ }
+
+ public int getNbUsed(final GISAttributeInterface _att) {
+ return attUsed_.get(_att);
+ }
+
+ public GISAttributeDouble addDoubleAttribute(final String _name) {
+ return addDoubleAttribute(_name, false);
+ }
+
+ public void fillListWithAtt(final List _dest) {
+ _dest.addAll(atts_.values());
+ }
+
+ public GISAttributeDouble addDoubleAttribute(final CtuluVariable _var, final boolean _atomic) {
+ final GISAttributeDouble r = addDoubleAttribute(_var.getName(), _atomic);
+ if (r != null) {
+ r.setUserData(_var.getID());
+ }
+ return r;
+ }
+
+ public GISAttributeDouble addDoubleAttribute(final String _name, final boolean _atomic) {
+ if (contains(_name)) { return null; }
+ final GISAttributeDouble r = new GISAttributeDouble(_name, _atomic);
+ atts_.put(_name, r);
+ return r;
+ }
+
+ public GISAttributeInteger addIntegerAttribute(final String _name) {
+ return addIntegerAttribute(_name, false);
+
+ }
+
+ public GISAttributeInteger addIntegerAttribute(final String _name, final boolean _atomic) {
+ if (contains(_name)) { return null; }
+ final GISAttributeInteger r = new GISAttributeInteger(_name, _atomic);
+ atts_.put(_name, r);
+ return r;
+ }
+
+ public GISAttributeBoolean addBooleanAttribute(final String _name, final boolean _atomic) {
+ if (contains(_name)) { return null; }
+ final GISAttributeBoolean r = new GISAttributeBoolean(_name, _atomic);
+ atts_.put(_name, r);
+ return r;
+ }
+
+ public GISAttributeString addTextAttribute(final String _name) {
+ if (contains(_name)) { return null; }
+ final GISAttributeString r = new GISAttributeString(_name);
+ atts_.put(_name, r);
+ return r;
+ }
+
+ /**
+ *
+ */
+ public FSigAttibuteTypeManager() {
+ super();
+ atts_.put("name", GISAttributeConstants.TITRE);
+ atts_.put("Z", GISAttributeConstants.BATHY);
+ }
+
+ /**
+ * @param _att attribut utilisee par un groupe de calque SIG
+ */
+ public void setUsed(final GISAttributeInterface _att) {
+ attUsed_.put(_att, getNbUsed(_att) + 1);
+ }
+
+ /**
+ * @param _att attribut qui n'est plus utilisr par un groupe de calque SIG
+ */
+ public void setUnUsed(final GISAttributeInterface _att) {
+ final int newUsed = getNbUsed(_att) - 1;
+ if (newUsed <= 0) {
+ attUsed_.remove(_att);
+ atts_.remove(_att);
+ } else {
+ attUsed_.put(_att, newUsed);
+ }
+ }
+
+}
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,243 @@
+/*
+ * @creation 18 mai 2005
+ * @modification $Date: 2008-01-11 12:20:39 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.sig;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.AbstractListModel;
+import javax.swing.BorderFactory;
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JTable;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluListEditorModel;
+import org.fudaa.ctulu.gui.CtuluListEditorPanel;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuResource;
+import com.memoire.fu.FuEmptyArrays;
+import com.memoire.fu.FuLog;
+
+/**
+ * Un panneau d'\xE9dition des attributs d'un groupe de calque SIG utilis\xE9 lors de la
+ * cr\xE9ation du groupe.
+ *
+ * @author Fred Deniger
+ * @version $Id: FSigAttributeEditorPanel.java,v 1.12 2008-01-11 12:20:39 bmarchan Exp $
+ */
+public class FSigAttributeEditorPanel extends CtuluDialogPanel {
+
+ final GISZoneCollection collect_;
+ final FSigAttibuteTypeManager mng_;
+ SpecModel model_;
+
+ private class SpecModel extends CtuluListEditorModel {
+
+ SpecModel() {
+ super(collect_ == null ? FuEmptyArrays.OBJECT0 : collect_.getAttributes(), true);
+ }
+
+ public int getRowCount() {
+ return super.getRowCount() + 1;
+ }
+
+ public boolean actionAdd() {
+ return false;
+ }
+
+ public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
+ return _columnIndex == 1 && _rowIndex == getRowCount() - 1;
+ }
+
+ public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
+ if (_value == null || _value.toString().trim().length() == 0) {
+ return;
+ }
+ Object newValue = mng_.getAttribute(_value.toString());
+ if (newValue == null) {
+ newValue = _value;
+ }
+ v_.add(newValue);
+ final int n = v_.size();
+ fireTableRowsInserted(n, n);
+ }
+
+ public Object getValueAt(final int _row, final int _col) {
+ if (_col == 1 && _row == getRowCount() - 1) {
+ return null;
+ }
+ return super.getValueAt(_row, _col);
+ }
+
+ public boolean actionInserer(final int _r) {
+ return false;
+ }
+
+ }
+
+ private class SpecCbModel extends AbstractListModel implements ComboBoxModel {
+
+ Object select_;
+ List att_ = new ArrayList();
+
+ SpecCbModel() {
+ fillModel();
+ }
+
+ public Object getSelectedItem() {
+ return select_;
+ }
+
+ final void fillModel() {
+ att_.clear();
+ mng_.fillListWithAtt(att_);
+ if (proposedVar_ != null) {
+ att_.addAll(Arrays.asList(proposedVar_));
+ fireIntervalAdded(this, 0, att_.size());
+ }
+ }
+
+ public void setSelectedItem(final Object _anItem) {
+ if (_anItem != select_) {
+ select_ = _anItem;
+ fireContentsChanged(this, -1, -1);
+ }
+ }
+
+ public Object getElementAt(final int _index) {
+ if (_index == 0) {
+ return null;
+ }
+ return att_.get(_index - 1);
+ }
+
+ public int getSize() {
+ return 1 + att_.size();
+ }
+ }
+
+ H2dVariableType[] proposedVar_;
+
+ Set initAtt_;
+
+ public boolean valide() {
+ if (t_.isEditing()) {
+ t_.getCellEditor().stopCellEditing();
+ }
+ return true;
+ }
+
+ public void fillWithAddedRemovedAttribute(final Set _add, final Set _removed) {
+ final Object[] o = model_.getValues();
+ _removed.addAll(initAtt_);
+ for (int i = o.length - 1; i >= 0; i--) {
+ final Object oi = o[i];
+ if (oi instanceof GISAttributeInterface) {
+ if (initAtt_.contains(oi)) {
+ _removed.remove(oi);
+ } else {
+ _add.add(oi);
+ }
+ } else if (oi instanceof H2dVariableType) {
+ final GISAttributeDouble d = mng_.addDoubleAttribute((H2dVariableType) oi, false);
+ if (d == null) {
+ FuLog.warning(new Throwable());
+ } else {
+ _add.add(d);
+ }
+ } else if (oi instanceof String) {
+ final GISAttributeDouble d = mng_.addDoubleAttribute((String) oi, false);
+ if (d == null) {
+ FuLog.warning(new Throwable());
+ } else {
+ _add.add(d);
+ }
+ }
+
+ }
+ }
+
+ JTable t_;
+
+ /**
+ * @param _collect
+ * @param _mng
+ * @param _proposedVar
+ */
+ public FSigAttributeEditorPanel(final GISZoneCollection _collect, final FSigAttibuteTypeManager _mng,
+ final H2dVariableType[] _proposedVar, final String _titleForEditor) {
+ super();
+ collect_ = _collect;
+ initAtt_ = new HashSet();
+
+ if (collect_ != null) {
+ initAtt_.addAll(Arrays.asList(collect_.getAttributes()));
+ }
+ mng_ = _mng;
+ model_ = new SpecModel();
+ proposedVar_ = _proposedVar;
+ final CtuluListEditorPanel editor = new CtuluListEditorPanel(model_, false, true, false);
+ t_ = editor.getTable();
+ final JComboBox cb = new JComboBox(new SpecCbModel());
+ cb.setEditable(true);
+ final DefaultCellEditor cellEditor = new DefaultCellEditor(cb);
+ final CtuluCellTextRenderer cbRenderer = createCbCellRenderer();
+ final CtuluCellTextRenderer cellRenderer = createCellRenderer();
+ cb.setRenderer(cbRenderer);
+ editor.setValueListCellEditor(cellEditor);
+ editor.setValueListCellRenderer(cellRenderer);
+ setLayout(new BuBorderLayout());
+ if (_titleForEditor != null) {
+ editor.setBorder(BorderFactory.createTitledBorder(_titleForEditor));
+ }
+ add(editor, BuBorderLayout.CENTER);
+ }
+
+ private static CtuluCellTextRenderer createCellRenderer() {
+ return new CtuluCellTextRenderer() {
+
+ protected void setValue(final Object _value) {
+ if (_value == null) {
+ setText(BuResource.BU.getString("Ajouter..."));
+ } else if (_value instanceof GISAttributeInterface) {
+ setText(((GISAttributeInterface) _value).getLongName());
+ } else {
+ super.setValue(_value);
+ }
+ }
+ };
+ }
+
+ private static CtuluCellTextRenderer createCbCellRenderer() {
+ return new CtuluCellTextRenderer() {
+
+ protected void setValue(final Object _value) {
+ if (_value == null) {
+ setText(CtuluLibString.EMPTY_STRING);
+ } else if (_value instanceof GISAttributeInterface) {
+ final GISAttributeInterface att = (GISAttributeInterface) _value;
+ setText(att.getLongName());
+ } else {
+ super.setValue(_value);
+ }
+ }
+ };
+ }
+}
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeTableModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeTableModel.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeTableModel.java 2009-10-15 18:22:55 UTC (rev 5280)
@@ -0,0 +1,279 @@
+/*
+ * @creation 18 janv. 2006
+ * @modification $Date: 2008-01-11 12:20:37 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.sig;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultCellEditor;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ListSelectionModel;
+
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+import org.fudaa.ctulu.gui.CtuluListEditorModel;
+import org.fudaa.ctulu.gui.CtuluListEditorPanel;
+
+import com.memoire.bu.BuComboBox;
+
+/**
+ * Un mod\xE8le pour les attributs d'un groupe SIG.
+ *
+ * @author Fred Deniger
+ * @version $Id: FSigAttributeTableModel.java,v 1.10 2008-01-11 12:20:37 bmarchan Exp $
+ */
+public final class FSigAttributeTableModel extends CtuluListEditorModel {
+
+ Map attributeNewName_ = new HashMap();
+
+ public boolean canAdd() {
+ return true;
+ }
+
+ public Map getRenamedAttribute() {
+ return new HashMap(attributeNewName_);
+ }
+
+ protected Object createAttribute(final int _i) {
+ final Object o = v_.get(_i);
+ if (o instanceof GISAttributeInterface) {
+ return o;
+ }
+ final String s = ((String) o).trim();
+ if (s.length() > 0) {
+ return new GISAttributeDouble(s, false);
+ }
+ return null;
+ }
+
+ /**
+ * @return les attributs non renomme
+ */
+ public GISAttributeInterface[] getAttributes() {
+ final int nb = getRowCount();
+ final List r = new ArrayList(nb);
+ for (int i = 0; i < nb; i++) {
+ final Object o = createAttribute(i);
+ if (o != null) {
+ r.add(o);
+ }
+ }
+ return (GISAttributeInterface[]) r.toArray(new GISAttributeInterface[r.size()]);
+ }
+
+ /**
+ *
+ */
+ public FSigAttributeTableModel() {
+ super();
+ buildProposedValue();
+
+ }
+
+ /**
+ * @param _showNumber
+ */
+ public FSigAttributeTableModel(final boolean _showNumber) {
+ super(_showNumber);
+ buildProposedValue();
+ }
+
+ /**
+ * @param _maxNumber
+ */
+ public FSigAttributeTableModel(final int _maxNumber) {
+ super(_maxNumber);
+ buildProposedValue();
+ }
+
+ /**
+ * @param _l
+ * @param _showNumber
+ * @param _maxNbValue
+ */
+ public FSigAttributeTableModel(final List _l, final boolean _showNumber, final int _maxNbValue) {
+ super(_l, _showNumber, _maxNbValue);
+ buildProposedValue();
+ }
+
+ /**
+ * @param _l
+ * @param _showNumber
+ */
+ public FSigAttributeTableModel(final List _l, final boolean _showNumber) {
+ super(_l, _showNumber);
+ buildProposedValue();
+ }
+
+ /**
+ * @param _o
+ * @param _showNumber
+ * @param _maxNbValue
+ */
+ public FSigAttributeTableModel(final Object[] _o, final boolean _showNumber, final int _maxNbValue) {
+ super(_o, _showNumber, _maxNbValue);
+ buildProposedValue();
+ }
+
+ /**
+ * @param _o
+ * @param _showNumber
+ */
+ public FSigAttributeTableModel(final Object[] _o, final boolean _showNumber) {
+ super(_o, _showNumber);
+ buildProposedValue();
+ }
+
+ public Class getColumnClass(final int _columnIndex) {
+ return String.class;
+ }
+
+ public boolean canRemove() {
+ return true;
+ }
+
+ public void edit(final int _r) {}
+
+ protected void buildProposedValue() {
+
+ final List defaultAtt = GISAttributeConstants.getDefaults();
+ defaultAtt.removeAll(super.v_);
+ if (model_ != null) {
+ model_.removeAllElements();
+ final int nb = defaultAtt.size();
+ for (int i = 0; i < nb; i++) {
+ model_.addElement(defaultAtt.get(i));
+ }
+ }
+ }
+
+ DefaultComboBoxModel model_;
+
+ public ComboBoxModel getProposedValueModel() {
+ if (model_ == null) {
+ model_ = new DefaultComboBoxModel();
+ }
+ buildProposedValue();
+ return model_;
+ }
+
+ public Object getValueAt(final int _i) {
+
+ final Object o = super.getValueAt(_i);
+ if (attributeNewName_.containsKey(o)) {
+ return attributeNewName_.get(o);
+ } else if (o instanceof GISAttributeInterface) {
+ return ((GISAttributeInterface) o).getName();
+ }
+ return o.toString();
+ }
+
+ public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
+ if (super.isShowNumber() && _columnIndex == 0) {
+ return false;
+ }
+ final Object o = super.getValueAt(_rowIndex);
+ if (o instanceof GISAttributeInterface) {
+ return !GISAttributeConstants.isConstant((GISAttributeInterface) o);
+ }
+ return super.isCellEditable(_rowIndex, _columnIndex);
+ }
+
+ public CtuluListEditorPanel buildEditor() {
+ final CtuluListEditorPanel ed = new CtuluListEditorPanel(this);
+ final ComboBoxModel cbModel = getProposedValueModel();
+ final BuComboBox cb = new BuComboBox();
+ createRendererFor(cb);
+ cb.setModel(cbModel);
+ cb.setEditable(true);
+ final DefaultCellEditor cellEd = new DefaultCellEditor(cb);
+ ed.getTable().getColumnModel().getColumn(1).setCellEditor(cellEd);
+ return ed;
+ }
+
+ static void createRendererFor(final BuComboBox _cb) {
+ _cb.setRenderer(new CtuluCellTextRenderer() {
+
+ protected void setValue(final Object _value) {
+ if (_value instanceof GISAttributeInterface) {
+ super.setValue(((GISAttributeInterface) _value).getName());
+ } else {
+ super.setValue(_value);
+ }
+ }
+
+ });
+ }
+
+ public static boolean rename(final Map _attNewName) {
+ boolean changed = false;
+ if (_attNewName.size() > 0) {
+ for (final Iterator it = _attNewName.entrySet().iterator(); it.hasNext();) {
+ final Map.Entry e = (Map.Entry) it.next();
+ final GISAttributeInterface attChanged = (GISAttributeInterface) e.getKey();
+ final String oldName = attChanged.getName();
+ final boolean add = attChanged.setName((String) e.getValue());
+ if (add) {
+ e.setValue(oldName);
+ } else {
+ it.remove();
+ }
+ change...
[truncated message content] |
|
From: <de...@us...> - 2009-10-22 20:33:40
|
Revision: 5433
http://fudaa.svn.sourceforge.net/fudaa/?rev=5433&view=rev
Author: deniger
Date: 2009-10-22 20:33:31 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java
trunk/business/dodico-h2d/pom.xml
trunk/business/fudaa-ef/pom.xml
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java 2009-10-22 20:27:55 UTC (rev 5432)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java 2009-10-22 20:33:31 UTC (rev 5433)
@@ -9,6 +9,7 @@
import org.fudaa.dodico.h2d.type.H2dBcType;
import org.fudaa.dodico.h2d.type.H2dBoundaryType;
+import org.fudaa.dodico.h2d.type.H2dBoundaryTypeCommon;
/**
* Conteneur pour transferer les valeurs entre les operation io et les modele de donnees.
@@ -67,6 +68,20 @@
* L'indice global du point (dans la numerotation des points du maillage).
*/
public int ptGlobalIdx_;
+
+
+ /**
+ * @return une condition pour un bord solide
+ */
+ public static H2dTelemacCLElementSource createDefault(){
+ H2dTelemacCLElementSource res=new H2dTelemacCLElementSource ();
+ res.bordType_=H2dBoundaryTypeCommon.SOLIDE;
+ res.uType_=H2dBcType.LIBRE;
+ res.vType_=H2dBcType.LIBRE;
+ res.tracerType_=H2dBcType.LIBRE;
+ return res;
+
+ }
/**
*
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
+++ trunk/business/dodico-h2d/pom.xml 2009-10-22 20:33:31 UTC (rev 5433)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.0</fudaa-ef.version>
+ <fudaa-ef.version>1.1-SNAPSHOT</fudaa-ef.version>
</properties>
<parent>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-22 20:33:31 UTC (rev 5433)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.0</fudaa-framework.version>
+ <fudaa-framework.version>1.1-SNAPSHOT</fudaa-framework.version>
</properties>
<parent>
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
+++ trunk/business/fudaa-sig/pom.xml 2009-10-22 20:33:31 UTC (rev 5433)
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <dodico-h2d.version>1.0</dodico-h2d.version>
+ <dodico-h2d.version>1.1-SNAPSHOT</dodico-h2d.version>
</properties>
<parent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-02-08 21:05:50
|
Revision: 5674
http://fudaa.svn.sourceforge.net/fudaa/?rev=5674&view=rev
Author: deniger
Date: 2010-02-08 21:05:43 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java 2010-02-08 20:51:15 UTC (rev 5673)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java 2010-02-08 21:05:43 UTC (rev 5674)
@@ -139,16 +139,16 @@
current_.removeValues(_key, _cmd);
}
- public void setValues(final H2dVariableType _var, final int[] _idxPtElt, final double _values,
- final CtuluCommandContainer _cmd) {
- current_.setValues(_var, _idxPtElt, _values, _cmd);
- }
+// public void setValues(final H2dVariableType _var, final int[] _idxPtElt, final double _values,
+// final CtuluCommandContainer _cmd) {
+// current_.setValues(_var, _idxPtElt, _values, _cmd);
+// }
+//
+// public void setValues(final H2dVariableType _var, final int[] _idxPtElt, final double[] _values,
+// final CtuluCommandContainer _cmd) {
+// current_.setValues(_var, _idxPtElt, _values, _cmd);
+// }
- public void setValues(final H2dVariableType _var, final int[] _idxPtElt, final double[] _values,
- final CtuluCommandContainer _cmd) {
- current_.setValues(_var, _idxPtElt, _values, _cmd);
- }
-
protected void fireChanged(final H2dVariableType _var) {
// if (si_ != null) FuLog.error("si is defined");
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java 2010-02-08 20:51:15 UTC (rev 5673)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java 2010-02-08 21:05:43 UTC (rev 5674)
@@ -133,7 +133,7 @@
}
public String getValueId(final int _i) {
- return fondInValue_ ? source_.getValueId(_i) : (_i == 0 ? fond_ : source_.getValueId(_i));
+ return fondInValue_ ? source_.getValueId(_i) : (_i == 0 ? fond_ : source_.getValueId(_i-1));
}
public int getValueNb() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-04-13 15:48:58
|
Revision: 6212
http://fudaa.svn.sourceforge.net/fudaa/?rev=6212&view=rev
Author: bmarchan
Date: 2011-04-13 15:48:46 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Mascaret : Lecture/restitution des limites de lit (stockage + rives)
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOWriter.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretProfilAbstractRepresentation.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStWriter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
Added Paths:
-----------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
Added: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java (rev 0)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -0,0 +1,179 @@
+package org.fudaa.dodico.mascaret.io;
+
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
+import java.util.ArrayList;
+import java.util.List;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISGeometryFactory;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.ctulu.gis.GISPolyligne;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.dodico.commun.DodicoLib;
+
+/**
+ * Une repr\xE9sentation d'un bief Mascaret.
+ * @author bmarchan
+ */
+public class MascaretBief {
+
+ /** Profils ordonn\xE9es du bief */
+ List<MascaretProfilAbstractRepresentation> profils_=new ArrayList<MascaretProfilAbstractRepresentation>();
+
+ public void addProfil(MascaretProfilAbstractRepresentation _prof) {
+ profils_.add(_prof);
+ }
+
+ public int getNbProfils() {
+ return profils_.size();
+ }
+
+ public MascaretProfilAbstractRepresentation getProfil(int _i) {
+ return profils_.get(_i);
+ }
+
+ /**
+ * @param _analyze Pour suivi du traitement.
+ * @param _progress La progression de lecture.
+ * @return Les 5 zones correspondant aux traces, profils, axe, rives, stockage
+ * dans cet ordre.
+ */
+ public GISZoneCollectionLigneBrisee[] buildZones(CtuluAnalyze _analyze, ProgressionInterface _progress) {
+ if (profils_.size()==0)
+ _analyze.addError(DodicoLib.getS("Aucun profil dans le bief."));
+
+
+ GISZoneCollectionLigneBrisee traces=new GISZoneCollectionLigneBrisee();
+ traces.setAttributes(new GISAttributeInterface[]{
+ GISAttributeConstants.TITRE, GISAttributeConstants.NATURE}, null);
+
+ GISZoneCollectionLigneBrisee profs=new GISZoneCollectionLigneBrisee();
+ profs.setAttributes(new GISAttributeInterface[]{
+ GISAttributeConstants.TITRE, GISAttributeConstants.NATURE,
+ GISAttributeConstants.BATHY, GISAttributeConstants.COMMENTAIRE_HYDRO}, null);
+
+ GISZoneCollectionLigneBrisee axe=new GISZoneCollectionLigneBrisee();
+ axe.setAttributes(new GISAttributeInterface[]{
+ GISAttributeConstants.NATURE, GISAttributeConstants.CURVILIGNE_DECALAGE}, null);
+
+ // G\xE9n\xE9ration des profiles et des traces de profiles \\
+ for(int k=0;k<profils_.size();k++){
+ _progress.setProgression((int)((float)k/profils_.size()*100));
+ MascaretProfilAbstractRepresentation profil=profils_.get(k);
+ CoordinateArraySequence coordSeq=new CoordinateArraySequence(profil.coordXYTraceProfil.size());
+ // Trace profil
+ for(int i=0;i<profil.coordXYTraceProfil.size();i++){
+ coordSeq.setOrdinate(i, 0, profil.coordXYTraceProfil.get(i)[0]);
+ coordSeq.setOrdinate(i, 1, profil.coordXYTraceProfil.get(i)[1]);
+ coordSeq.setOrdinate(i, 2, 0);
+ }
+ traces.addGeometry(new GISPolyligne(coordSeq), new Object[]{profil.nomProfil, GISAttributeConstants.ATT_NATURE_TP}, null);
+
+ // Profil
+ coordSeq=new CoordinateArraySequence(profil.coordXYProfil.size());
+ Object[] z=new Object[profil.coordXYProfil.size()];
+ for(int i=0;i<profil.coordXYProfil.size();i++){
+ coordSeq.setOrdinate(i, 0, profil.coordXYProfil.get(i)[0]);
+ coordSeq.setOrdinate(i, 1, profil.coordXYProfil.get(i)[1]);
+ z[i]=profil.coordZ.get(i);
+ coordSeq.setOrdinate(i, 2, 0);
+ }
+ String comm=GISLib.setHydroCommentDouble("", profil.abscisseCurviligneAxeHydraulique, GISAttributeConstants.ATT_COMM_HYDRO_PK);
+ profs.addGeometry(new GISPolyligne(coordSeq), new Object[]{profil.nomProfil, GISAttributeConstants.ATT_NATURE_PF, z, comm}, null);
+ }
+
+ if (profils_.size()>1) {
+ // G\xE9n\xE9ration de l'axe hydraulique \\
+ CoordinateArraySequence coordSeq=new CoordinateArraySequence(profils_.size());
+ for (int i=0; i<profils_.size(); i++) {
+ coordSeq.setOrdinate(i, 0, profils_.get(i).coordIntersectionAxeHydraulique[0]);
+ coordSeq.setOrdinate(i, 1, profils_.get(i).coordIntersectionAxeHydraulique[1]);
+ coordSeq.setOrdinate(i, 2, 0);
+ }
+ axe.addGeometry(new GISPolyligne(coordSeq), new Object[]{GISAttributeConstants.ATT_NATURE_AH, profils_.get(0).abscisseCurviligneAxeHydraulique}, null);
+ }
+ else
+ _analyze.addInfo(DodicoLib.getS("Le bief ne comporte qu'un profil : Aucun axe hydraulique, aucune rive, aucune limite ne seront g\xE9n\xE9r\xE9s."));
+
+ GISZoneCollectionLigneBrisee[] zlims=buildLimites();
+ return new GISZoneCollectionLigneBrisee[]{traces,profs,axe,zlims[0],zlims[1]};
+ }
+
+ /**
+ *
+ * @return Les zones correspondant aux limites de biefs (rives + limites stockage
+ * dans cet ordre)
+ */
+ private GISZoneCollectionLigneBrisee[] buildLimites() {
+ GISZoneCollectionLigneBrisee rives=new GISZoneCollectionLigneBrisee();
+ rives.setAttributes(new GISAttributeInterface[]{
+ GISAttributeConstants.TITRE, GISAttributeConstants.NATURE}, null);
+
+ GISZoneCollectionLigneBrisee stockages=new GISZoneCollectionLigneBrisee();
+ stockages.setAttributes(new GISAttributeInterface[]{
+ GISAttributeConstants.TITRE, GISAttributeConstants.NATURE}, null);
+
+ // Les 4 lignes, dans l'ordre SG, SD, RG, RD
+ CoordinateSequence[] seqs=new CoordinateSequence[4];
+ for (int i=0; i<seqs.length; i++) {
+ seqs[i]=GISGeometryFactory.INSTANCE.getCoordinateSequenceFactory().create(profils_.size(),3);
+ }
+
+ for (int j=0; j<profils_.size(); j++) {
+ // Flag qui indique qu'on est pass\xE9 par le lit mineur
+ boolean lm=false;
+
+ Integer[] idx=new Integer[4];
+ idx[0]=0;
+ idx[1]=null;
+ idx[2]=0;
+ idx[3]=null;
+
+ for (int i=0; i<profils_.get(j).bathyOuTopoOuStockage.size(); i++) {
+ if (profils_.get(j).bathyOuTopoOuStockage.get(i)=='S') {
+ if (!lm) {
+ idx[0]=i+1;
+ idx[2]=i+1;
+ }
+ else if (idx[1]==null) {
+ idx[1]=i-1;
+ }
+ }
+ if (profils_.get(j).bathyOuTopoOuStockage.get(i)=='T') {
+ if (!lm) {
+ idx[2]=i+1;
+ }
+ else if (idx[3]==null) {
+ idx[3]=i-1;
+ }
+ }
+ if (profils_.get(j).bathyOuTopoOuStockage.get(i)=='B') {
+ lm=true;
+ }
+ }
+
+ if (idx[3]==null)
+ idx[3]=profils_.get(j).bathyOuTopoOuStockage.size()-1;
+ if (idx[1]==null)
+ idx[1]=profils_.get(j).bathyOuTopoOuStockage.size()-1;
+
+ for (int i=0; i<seqs.length; i++) {
+ seqs[i].setOrdinate(j, 0, profils_.get(j).coordXYProfil.get(idx[i])[0]);
+ seqs[i].setOrdinate(j, 1, profils_.get(j).coordXYProfil.get(idx[i])[1]);
+ seqs[i].setOrdinate(j, 2, 0);
+ }
+ }
+
+ // Les limites de stockage
+ stockages.addGeometry(new GISPolyligne(seqs[0]), new Object[]{"SG", GISAttributeConstants.ATT_NATURE_LS}, null);
+ stockages.addGeometry(new GISPolyligne(seqs[1]), new Object[]{"SD", GISAttributeConstants.ATT_NATURE_LS}, null);
+ // Les rives
+ rives.addGeometry(new GISPolyligne(seqs[2]), new Object[]{"RG", GISAttributeConstants.ATT_NATURE_RV}, null);
+ rives.addGeometry(new GISPolyligne(seqs[3]), new Object[]{"RD", GISAttributeConstants.ATT_NATURE_RV}, null);
+
+ return new GISZoneCollectionLigneBrisee[]{rives,stockages};
+ }
+}
Property changes on: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -10,23 +10,19 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FortranInterface;
-import org.fudaa.ctulu.gis.GISAttributeConstants;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.dodico.commun.DodicoLib;
-import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
/**
- * Parser du format Mascaret. (versions 6.0 et pr\xE9c\xE9dentes)
- * @author Emmanuel MARTIN
+ * Parser du format Mascaret. (versions 6.0 et pr\xE9c\xE9dentes).
+ * Lit des fichiers Mascaret g\xE9or\xE9f\xE9renc\xE9s ou non.
+ *
+ * @author Emmanuel MARTIN, mar...@de...
* @version $Id$
*/
public class MascaretGEOReader extends FileReadOperationAbstract {
@@ -44,8 +40,8 @@
/** Les caract\xE8res de 's\xE9paration' */
private char[] charSeparation_=new char[]{' ', '\t'};
private char charSeparationNewLigne_='\n';
- /** Profiles extraits */
- List<MascaretProfilAbstractRepresentation> profils_=new ArrayList<MascaretProfilAbstractRepresentation>();
+ /** Le bief */
+ MascaretBief bief=new MascaretBief();
public MascaretGEOReader() {
rawData_=null;
@@ -108,11 +104,12 @@
return token.toString().length()==0 ? null:token.toString();
}
- /* (non-Javadoc)
- * @see org.fudaa.ctulu.fileformat.FileReadOperationAbstract#internalRead()
+ /*
+ * Lit les g\xE9om\xE9tries et les retourne sous forme de 5 collections distinctes.
+ * 0: Traces, 1: Profils, 2:Axe, 3:Rives, 4:Stockage
*/
@Override
- protected Object internalRead() {
+ protected GISZoneCollectionLigneBrisee[] internalRead() {
try {
StringBuffer lineToken=nextLineToken();
if(lineToken==null)
@@ -128,7 +125,7 @@
// Extraction des informations commune \xE0 1d et 2d
profil.nomBief=nextWordToken(lineToken);
profil.nomProfil=nextWordToken(lineToken);
- profil.abscisseCurvilingeAxeHydraulique=Double.parseDouble(nextWordToken(lineToken));
+ profil.abscisseCurviligneAxeHydraulique=Double.parseDouble(nextWordToken(lineToken));
// Coordonn\xE9es de trace de profile : non pr\xE9sent dans les fichiers 1d
token=nextWordToken(lineToken);
while (token!=null&&!token.equals("AXE")) {
@@ -158,11 +155,13 @@
else if (!(profil.is2d()&&profil.check2D()))
throw new ParseError(fileName_+DodicoLib.getS(" : le fichier source comporte des erreurs."));
// Ajout du profile \xE0 la liste et traitement du profile suivant
- profils_.add(profil);
+ bief.addProfil(profil);
}
- // G\xE9n\xE9ration d'un GISZoneCollection avec les informations extraites et
+
+ // G\xE9n\xE9ration des GISZoneCollectionLigneBrisee avec les informations extraites et
// retour de celle-ci
- return generateGIS();
+ progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
+ return bief.buildZones(analyze_, progress_);
}
catch (ParseError _exc) {
analyze_.addFatalError(_exc.getMessage());
@@ -175,49 +174,6 @@
}
return null;
}
-
- private GISZoneCollectionLigneBrisee generateGIS(){
- progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
- // Cr\xE9ation de la GISZoneCollectionLigneBrisee
- GISZoneCollectionLigneBrisee zone=new GISZoneCollectionLigneBrisee();
- zone.setAttributes(new GISAttributeInterface[]{GISAttributeConstants.TITRE, GISAttributeConstants.NATURE, GISAttributeConstants.BATHY}, null);
- // G\xE9n\xE9ration des profiles et des traces de profiles \\
- for(int k=0;k<profils_.size();k++){
- progress_.setProgression((int)((float)k/profils_.size()*100));
- MascaretProfilAbstractRepresentation profil=profils_.get(k);
- CoordinateArraySequence coordSeq=new CoordinateArraySequence(profil.coordXYTraceProfil.size());
- // Trace profil
- for(int i=0;i<profil.coordXYTraceProfil.size();i++){
- coordSeq.setOrdinate(i, 0, profil.coordXYTraceProfil.get(i)[0]);
- coordSeq.setOrdinate(i, 1, profil.coordXYTraceProfil.get(i)[1]);
- coordSeq.setOrdinate(i, 2, 0);
- }
- zone.addGeometry(new GISPolyligne(coordSeq), new Object[]{profil.nomProfil, GISAttributeConstants.ATT_NATURE_TP, null}, null);
- // Profil
- coordSeq=new CoordinateArraySequence(profil.coordXYProfil.size());
- Object[] z=new Object[profil.coordXYProfil.size()];
- for(int i=0;i<profil.coordXYProfil.size();i++){
- coordSeq.setOrdinate(i, 0, profil.coordXYProfil.get(i)[0]);
- coordSeq.setOrdinate(i, 1, profil.coordXYProfil.get(i)[1]);
- coordSeq.setOrdinate(i, 2, 0);
- z[i]=profil.coordZ.get(i);
- }
- zone.addGeometry(new GISPolyligne(coordSeq), new Object[]{profil.nomProfil, GISAttributeConstants.ATT_NATURE_PF, z}, null);
- }
- if (profils_.size()>1) {
- // G\xE9n\xE9ration de l'axe hydraulique \\
- CoordinateArraySequence coordSeq=new CoordinateArraySequence(profils_.size());
- for (int i=0; i<profils_.size(); i++) {
- coordSeq.setOrdinate(i, 0, profils_.get(i).coordIntersectionAxeHydraulique[0]);
- coordSeq.setOrdinate(i, 1, profils_.get(i).coordIntersectionAxeHydraulique[1]);
- coordSeq.setOrdinate(i, 2, 0);
- }
- zone.addGeometry(new GISPolyligne(coordSeq), new Object[]{null, GISAttributeConstants.ATT_NATURE_AH, null}, null);
- }
- else
- analyze_.addInfo(fileName_+DodicoLib.getS(" : le fichier ne comporte qu'un profil, aucun axe hydraulique ne sera g\xE9n\xE9r\xE9."));
- return zone;
- }
/* (non-Javadoc)
* @see org.fudaa.ctulu.fileformat.FileOperationAbstract#getFortranInterface()
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOWriter.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOWriter.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -38,8 +38,8 @@
/** Le flux de sorti. */
private Writer out_;
- /** Les profils \xE0 \xE9crire. */
- private MascaretProfilAbstractRepresentation[] profils_;
+ /** Le bief au format Mascaret \xE0 \xE9crire. */
+ private MascaretBief bief_;
/** Type du fichier mascaret de destination 1D ou 2D. */
private boolean is1D_=true;
@@ -87,10 +87,10 @@
throw new IllegalArgumentException("zones mustn't be null");
generateMascaretProfilAbstractRepresentations(nomBief, zones, selectorProfil);
- for (int i=0; i<profils_.length; i++) {
- MascaretProfilAbstractRepresentation profil=profils_[i];
+ for (int i=0; i<bief_.getNbProfils(); i++) {
+ MascaretProfilAbstractRepresentation profil=bief_.getProfil(i);
// Premi\xE8re ligne
- out_.write("Profil "+profil.nomBief+" "+profil.nomProfil+" "+profil.abscisseCurvilingeAxeHydraulique);
+ out_.write("Profil "+profil.nomBief+" "+profil.nomProfil+" "+profil.abscisseCurviligneAxeHydraulique);
if (is1D_)
out_.write('\n');
else {
@@ -192,7 +192,7 @@
// G\xE9n\xE9ration des MascaretProfilAbstractRepresentations \\
- profils_=new MascaretProfilAbstractRepresentation[profils.size()];
+ bief_=new MascaretBief();
int countNoName=1;
GISPolyligne axeHydraulique=(GISPolyligne)zoneAxeHydraulique.getGeometry(indexAxeHydraulique);
for (int i=0;i<profils.size();i++) {
@@ -222,9 +222,9 @@
if(idxAttrCommHydraulique==-1)
throw new MascaretDataError("L'attribut COMMENTAIRE_HYDRO doit \xEAtre pr\xE9sent.");
String comm=(String) zoneProfil.getValue(idxAttrCommHydraulique, idxProfil);
- if(!GISLib.isHydroCommentValued(comm, "PK"))
+ if(!GISLib.isHydroCommentValued(comm, GISAttributeConstants.ATT_COMM_HYDRO_PK))
throw new MascaretDataError("La propri\xE9t\xE9 PK de COMMENTAIRE_HYDRO doit \xEAtre valu\xE9e.");
- profilAbs.abscisseCurvilingeAxeHydraulique=GISLib.getHydroCommentDouble(comm, "PK");
+ profilAbs.abscisseCurviligneAxeHydraulique=GISLib.getHydroCommentDouble(comm, GISAttributeConstants.ATT_COMM_HYDRO_PK);
CoordinateSequence coordSeq=axeHydraulique.getCoordinateSequence();
// Trace profil
coordSeq=profil.getCoordinateSequence();
@@ -329,7 +329,7 @@
throw new MascaretDataError("Erreur de programmation : les donn\xE9es g\xE9n\xE9r\xE9es ne sont pas coh\xE9rentes pour le 2d.");
// Stockage avec les autres \\
- profils_[i]=profilAbs;
+ bief_.addProfil(profilAbs);
}
}
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretProfilAbstractRepresentation.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretProfilAbstractRepresentation.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretProfilAbstractRepresentation.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -14,7 +14,7 @@
* Container des informations relative \xE0 un profil.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public class MascaretProfilAbstractRepresentation {
public String nomBief;
@@ -22,7 +22,7 @@
public List<Double> coordZ=new ArrayList<Double>(); // Bathy ou Topo
public List<Character> bathyOuTopoOuStockage=new ArrayList<Character>(); // B ou T ou S
// Info sp\xE9cifique 1D
- public double abscisseCurvilingeAxeHydraulique;
+ public double abscisseCurviligneAxeHydraulique;
public List<Double> coordCurviligneProfil=new ArrayList<Double>();
// Info sp\xE9cifique 2D
public List<double[]> coordXYTraceProfil=new ArrayList<double[]>();
@@ -53,7 +53,7 @@
/** @return vrai si les informations utile 1D sont compl\xE8tes et coh\xE9rentes. */
public boolean check1D(){
- boolean check=checkCommon()&&abscisseCurvilingeAxeHydraulique>=0&&coordCurviligneProfil.size()==coordZ.size();
+ boolean check=checkCommon()&&abscisseCurviligneAxeHydraulique>=0&&coordCurviligneProfil.size()==coordZ.size();
int i=0;
// Verifi que l'ordre des coordonn\xE9es est croissant.
while(check&&++i<coordCurviligneProfil.size())
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -24,9 +24,6 @@
* @version $Id$
*/
public class RubarStCnFileFormat extends FileFormatUnique {
-
- /** Commentaire hydro PK. Utilis\xE9 pour transporter les infos de l'import vers l'export. */
- public static final String COMM_HYDRO_PK="PK";
private RubarStCnFileFormat() {
super(1);
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -95,7 +95,7 @@
if (isSt_) {
in_.readFields(fmt1Line);
name=in_.stringField(6).trim();
- pk=RubarStCnFileFormat.COMM_HYDRO_PK+"="+in_.stringField(4).trim();
+ pk=GISAttributeConstants.ATT_COMM_HYDRO_PK+"="+in_.stringField(4).trim();
}
String first = CtuluLibString.EMPTY_STRING;
String sec = CtuluLibString.EMPTY_STRING;
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStWriter.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStWriter.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -114,7 +114,7 @@
name=name.substring(0,Math.min(name.length(),42));
// PK, issu du commentaire hydrualique.
if (attPk!=-1) {
- pk=GISLib.getHydroCommentDouble((String)profs_.getValue(attPk, i),RubarStCnFileFormat.COMM_HYDRO_PK);
+ pk=GISLib.getHydroCommentDouble((String)profs_.getValue(attPk, i),GISAttributeConstants.ATT_COMM_HYDRO_PK);
}
// Nombre de points => On tient compte des points dupliqu\xE9s car partag\xE9s par plusieurs lignes directrices.
int nbpt=0;
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-04-13 15:34:07 UTC (rev 6211)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-04-13 15:48:46 UTC (rev 6212)
@@ -63,16 +63,16 @@
if(op.containsMessages()&&op.getAnalyze().containsFatalError())
return;
- GISZoneCollectionLigneBrisee lines=(GISZoneCollectionLigneBrisee)op.getSource();
- _r.nbPointTotal_+=lines.getNumPoints();
- _r.nbPolylignes_+=lines.getNumGeometries();
- // Ajout de l'attribut ETAT_GEOM
- _r.findOrCreateAttribute(GISAttributeConstants.ETAT_GEOM.getID(), String.class, false);
- GISDataModelAttributeAdapter adapter = new GISDataModelAttributeAdapter(lines);
- adapter.addAttribut(GISAttributeConstants.ETAT_GEOM, _origine);
- //
- _r.ligneModel_.add(adapter);
- _r.addUsedAttributes(GISLib.getAttributeFrom(lines));
+ GISZoneCollectionLigneBrisee[] lines=(GISZoneCollectionLigneBrisee[])op.getSource();
+ for (GISZoneCollectionLigneBrisee zl : lines) {
+ _r.nbPointTotal_+=zl.getNumPoints();
+ _r.nbPolylignes_+=zl.getNumGeometries();
+ // Ajout de l'attribut ETAT_GEOM
+ _r.findOrCreateAttribute(GISAttributeConstants.ETAT_GEOM.getID(), String.class, false);
+ GISDataModelAttributeAdapter adapter = new GISDataModelAttributeAdapter(zl);
+ adapter.addAttribut(GISAttributeConstants.ETAT_GEOM, _origine);
+ _r.ligneModel_.add(adapter);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-04-22 08:29:35
|
Revision: 6233
http://fudaa.svn.sourceforge.net/fudaa/?rev=6233&view=rev
Author: bmarchan
Date: 2011-04-22 08:29:29 +0000 (Fri, 22 Apr 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-04-22 08:29:29 UTC (rev 6233)
@@ -62,7 +62,9 @@
// G\xE9n\xE9ration des profiles et des traces de profiles \\
for(int k=0;k<profils_.size();k++){
- _progress.setProgression((int)((float)k/profils_.size()*100));
+ if (_progress!=null)
+ _progress.setProgression((int)((float)k/profils_.size()*100));
+
MascaretProfilAbstractRepresentation profil=profils_.get(k);
CoordinateArraySequence coordSeq=new CoordinateArraySequence(profil.coordXYTraceProfil.size());
// Trace profil
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-04-22 08:29:29 UTC (rev 6233)
@@ -160,7 +160,8 @@
// G\xE9n\xE9ration des GISZoneCollectionLigneBrisee avec les informations extraites et
// retour de celle-ci
- progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
+ if (progress_!=null)
+ progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
return bief.buildZones(analyze_, progress_);
}
catch (ParseError _exc) {
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java 2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java 2011-04-22 08:29:29 UTC (rev 6233)
@@ -59,7 +59,7 @@
* @return Un tableau GISZoneCollectionLigneBrisee[2]. [0] : la collection des profils (ou null si aucun profil),
* [1] : la collection de lignes directrices (ou null si aucune ligne directrice).
*/
- protected Object internalRead() {
+ protected GISZoneCollectionLigneBrisee[] internalRead() {
// Remarque : Cette impl\xE9mentation empeche des noms semblables (les noms sont stock\xE9s comme cl\xE9 de Map) sur les lignes
// directrices. Ce qui peut \xEAtre normal puisque c'est le m\xEAme nom en un point de chaque profil qui permet de constituer
// la ligne.
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java 2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java 2011-04-22 08:29:29 UTC (rev 6233)
@@ -7,13 +7,8 @@
*/
package org.fudaa.fudaa.sig;
-import java.util.ArrayList;
-import java.util.List;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
-import org.fudaa.ctulu.gis.GISZoneListener;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
import org.fudaa.ebli.calque.edition.ZModeleGeometryDefault;
@@ -115,7 +110,7 @@
public void prepareExport() {}
- public GISZoneCollection getGeomData() {
+ public GISZoneCollectionLigneBrisee getGeomData() {
return geom_;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-04 13:30:54
|
Revision: 6242
http://fudaa.svn.sourceforge.net/fudaa/?rev=6242&view=rev
Author: bmarchan
Date: 2011-05-04 13:30:44 +0000 (Wed, 04 May 2011)
Log Message:
-----------
MOD : Ajout du nom du bief dans la lecture d'un fichier Mascaret geo r?\195?\169f?\195?\169renc?\195?\169.
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -41,6 +41,14 @@
}
/**
+ * @return Le nom du bief, ou null si aucun profil dans le bief.
+ */
+ public String getBiefName() {
+ if (profils_.size()>0) return profils_.get(0).nomBief;
+ return null;
+ }
+
+ /**
* @param _analyze Pour suivi du traitement.
* @param _progress La progression de lecture.
* @return Les 5 zones correspondant aux traces, profils, axe, rives, stockage
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -108,11 +108,13 @@
}
/*
- * Lit les g\xE9om\xE9tries et les retourne sous forme de 5 collections distinctes.
- * 0: Traces, 1: Profils, 2:Axe, 3:Rives, 4:Stockage
+ * Lit les g\xE9om\xE9tries et les retourne sous forme d'un tableau d'objets contenant
+ * le nom du bief + 5 collections distinctes.<p>
+ * [0] : Nom du bief<br>
+ * [1] : Les 5 collections : 0: Traces, 1: Profils, 2:Axe, 3:Rives, 4:Stockage
*/
@Override
- protected GISZoneCollectionLigneBrisee[] internalRead() {
+ protected Object[] internalRead() {
try {
StringBuffer lineToken=nextLineToken();
if(lineToken==null)
@@ -165,7 +167,7 @@
// retour de celle-ci
if (progress_!=null)
progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
- return bief.buildZones(analyze_, progress_);
+ return new Object[]{bief.getBiefName(),bief.buildZones(analyze_, progress_)};
}
catch (ParseError _exc) {
analyze_.addFatalError(_exc.getMessage());
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-05-03 15:51:42 UTC (rev 6241)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderMascaret.java 2011-05-04 13:30:44 UTC (rev 6242)
@@ -63,7 +63,7 @@
if(op.containsMessages()&&op.getAnalyze().containsFatalError())
return;
- GISZoneCollectionLigneBrisee[] lines=(GISZoneCollectionLigneBrisee[])op.getSource();
+ GISZoneCollectionLigneBrisee[] lines=(GISZoneCollectionLigneBrisee[])((Object[])op.getSource())[1];
for (GISZoneCollectionLigneBrisee zl : lines) {
_r.nbPointTotal_+=zl.getNumPoints();
_r.nbPolylignes_+=zl.getNumGeometries();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-01-18 14:57:45
|
Revision: 8222
http://fudaa.svn.sourceforge.net/fudaa/?rev=8222&view=rev
Author: bmarchan
Date: 2013-01-18 14:57:38 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/fudaa-common-corba/pom.xml
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2013-01-18 14:52:54 UTC (rev 8221)
+++ trunk/business/dodico-corba/pom.xml 2013-01-18 14:57:38 UTC (rev 8222)
@@ -81,4 +81,41 @@
</profile>
</profiles>
+ <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>
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2013-01-18 14:52:54 UTC (rev 8221)
+++ trunk/business/fudaa-common-corba/pom.xml 2013-01-18 14:57:38 UTC (rev 8222)
@@ -55,4 +55,41 @@
<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>
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