Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-07 19:52:49
|
Revision: 5197
http://fudaa.svn.sourceforge.net/fudaa/?rev=5197&view=rev
Author: deniger
Date: 2009-10-07 19:52:39 +0000 (Wed, 07 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/src/pmd.xml
Removed Paths:
-------------
trunk/framework/super-pom/pmd.xml
Copied: trunk/framework/src/pmd.xml (from rev 5196, trunk/framework/super-pom/pmd.xml)
===================================================================
--- trunk/framework/src/pmd.xml (rev 0)
+++ trunk/framework/src/pmd.xml 2009-10-07 19:52:39 UTC (rev 5197)
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
+ xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+ <description>PMD Plugin preferences rule set</description>
+ <rule ref="rulesets/typeresolution.xml/LooseCoupling" />
+ <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable" />
+ <rule ref="rulesets/typeresolution.xml/UnusedImports" />
+ <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException" />
+ <rule ref="rulesets/basic.xml/EmptyCatchBlock" />
+ <rule ref="rulesets/basic.xml/EmptyIfStmt" />
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt" />
+ <rule ref="rulesets/basic.xml/EmptyTryBlock" />
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock" />
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements" />
+ <rule ref="rulesets/basic.xml/JumbledIncrementer" />
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop" />
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary" />
+ <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking" />
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock" />
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn" />
+ <rule ref="rulesets/basic.xml/EmptyStaticInitializer" />
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement" />
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop" />
+ <rule ref="rulesets/basic.xml/BooleanInstantiation" />
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier" />
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements" />
+ <rule ref="rulesets/basic.xml/UselessOverridingMethod" />
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray" />
+ <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable" />
+ <rule ref="rulesets/basic.xml/MisplacedNullCheck" />
+ <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals" />
+ <rule ref="rulesets/basic.xml/AvoidThreadGroup" />
+ <rule ref="rulesets/basic.xml/BrokenNullCheck" />
+ <rule ref="rulesets/basic.xml/BigIntegerInstantiation">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/basic.xml/AvoidUsingOctalValues" />
+ <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP" />
+ <rule ref="rulesets/basic.xml/CheckResultSet" />
+ <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators" />
+ <rule ref="rulesets/basic.xml/EmptyInitializer" />
+ <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces" />
+ <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces" />
+ <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces" />
+ <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces" />
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
+ <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
+ <rule ref="rulesets/logging-java.xml/MoreThanOneLogger" />
+ <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal" />
+ <rule ref="rulesets/logging-java.xml/SystemPrintln" />
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace" />
+ <rule ref="rulesets/controversial.xml/NullAssignment">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/UnusedModifier" />
+ <rule ref="rulesets/controversial.xml/AssignmentInOperand" />
+ <rule ref="rulesets/controversial.xml/DontImportSun" />
+ <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape" />
+ <rule ref="rulesets/controversial.xml/UnnecessaryParentheses" />
+ <rule ref="rulesets/controversial.xml/DefaultPackage">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/BooleanInversion">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/controversial.xml/AvoidUsingShortType" />
+ <rule ref="rulesets/controversial.xml/AvoidUsingVolatile" />
+ <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode" />
+ <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration" />
+ <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly" />
+ <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals" />
+ <rule ref="rulesets/strings.xml/StringInstantiation" />
+ <rule ref="rulesets/strings.xml/StringToString" />
+ <rule ref="rulesets/strings.xml/InefficientStringBuffering" />
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange" />
+ <rule ref="rulesets/strings.xml/UseStringBufferLength" />
+ <rule ref="rulesets/strings.xml/AppendCharacterWithChar" />
+ <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends" />
+ <rule ref="rulesets/strings.xml/UseIndexOfChar" />
+ <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck" />
+ <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration" />
+ <rule ref="rulesets/strings.xml/UselessStringValueOf" />
+ <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar" />
+ <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings" />
+ <rule ref="rulesets/strings.xml/AvoidStringBufferField" />
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable" />
+ <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException" />
+ <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl" />
+ <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE" />
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes" />
+ <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException" />
+ <rule ref="rulesets/strictexception.xml/AvoidRethrowingException" />
+ <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError" />
+ <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally" />
+ <rule ref="rulesets/migrating.xml/ReplaceVectorWithList" />
+ <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap" />
+ <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator" />
+ <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier" />
+ <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier" />
+ <rule ref="rulesets/migrating.xml/IntegerInstantiation" />
+ <rule ref="rulesets/migrating.xml/ByteInstantiation" />
+ <rule ref="rulesets/migrating.xml/ShortInstantiation" />
+ <rule ref="rulesets/migrating.xml/LongInstantiation" />
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/migrating.xml/JUnitUseExpected">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal" />
+ <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal" />
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector" />
+ <rule ref="rulesets/optimizations.xml/SimplifyStartsWith" />
+ <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends" />
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList" />
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops" />
+ <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation" />
+ <rule ref="rulesets/optimizations.xml/AddEmptyString" />
+ <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray" />
+ <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly" />
+ <rule ref="rulesets/coupling.xml/CouplingBetweenObjects" />
+ <rule ref="rulesets/coupling.xml/ExcessiveImports" />
+ <rule ref="rulesets/coupling.xml/LooseCoupling" />
+ <rule ref="rulesets/imports.xml/DuplicateImports" />
+ <rule ref="rulesets/imports.xml/DontImportJavaLang" />
+ <rule ref="rulesets/imports.xml/UnusedImports" />
+ <rule ref="rulesets/imports.xml/ImportFromSamePackage" />
+ <rule ref="rulesets/imports.xml/TooManyStaticImports" />
+ <rule ref="rulesets/junit.xml/JUnitSpelling" />
+ <rule ref="rulesets/junit.xml/TestClassWithoutTestCases" />
+ <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion" />
+ <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue" />
+ <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue" />
+ <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue" />
+ <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion" />
+ <rule ref="rulesets/naming.xml/ShortMethodName" />
+ <rule ref="rulesets/naming.xml/VariableNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/MethodNamingConventions">
+ <priority>3</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/ClassNamingConventions" />
+ <rule ref="rulesets/naming.xml/AbstractNaming">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/naming.xml/AvoidDollarSigns" />
+ <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass" />
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName" />
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName" />
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName" />
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName" />
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName" />
+ <rule ref="rulesets/naming.xml/NoPackage" />
+ <rule ref="rulesets/naming.xml/PackageCase" />
+ <rule ref="rulesets/naming.xml/MisleadingVariableName" />
+ <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
+ <rule ref="rulesets/codesize.xml/NPathComplexity" />
+ <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
+ <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
+ <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
+ <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+ <rule ref="rulesets/codesize.xml/ExcessivePublicCount" />
+ <rule ref="rulesets/codesize.xml/TooManyFields" />
+ <rule ref="rulesets/codesize.xml/NcssMethodCount" />
+ <rule ref="rulesets/codesize.xml/NcssTypeCount" />
+ <rule ref="rulesets/codesize.xml/NcssConstructorCount" />
+ <rule ref="rulesets/codesize.xml/TooManyMethods" />
+ <rule ref="rulesets/finalizers.xml/EmptyFinalizer" />
+ <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize" />
+ <rule ref="rulesets/finalizers.xml/FinalizeOverloaded" />
+ <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize" />
+ <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected" />
+ <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize" />
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging" />
+ <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger" />
+ <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID" />
+ <rule ref="rulesets/clone.xml/ProperCloneImplementation" />
+ <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException" />
+ <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable" />
+ <rule ref="rulesets/design.xml/UseSingleton" />
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns" />
+ <rule ref="rulesets/design.xml/SimplifyBooleanExpressions" />
+ <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault" />
+ <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts" />
+ <rule ref="rulesets/design.xml/AvoidReassigningParameters" />
+ <rule ref="rulesets/design.xml/SwitchDensity" />
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod" />
+ <rule ref="rulesets/design.xml/AccessorClassGeneration" />
+ <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic" />
+ <rule ref="rulesets/design.xml/CloseResource" />
+ <rule ref="rulesets/design.xml/NonStaticInitializer" />
+ <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt" />
+ <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement" />
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall" />
+ <rule ref="rulesets/design.xml/BadComparison" />
+ <rule ref="rulesets/design.xml/EqualsNull" />
+ <rule ref="rulesets/design.xml/ConfusingTernary" />
+ <rule ref="rulesets/design.xml/InstantiationToGetClass" />
+ <rule ref="rulesets/design.xml/IdempotentOperations" />
+ <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale" />
+ <rule ref="rulesets/design.xml/ImmutableField" />
+ <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions">
+ <priority>5</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass" />
+ <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic" />
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass" />
+ <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel" />
+ <rule ref="rulesets/design.xml/MissingBreakInSwitch" />
+ <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify" />
+ <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause">
+ <priority>2</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod" />
+ <rule ref="rulesets/design.xml/SimplifyConditional" />
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals" />
+ <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons" />
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn" />
+ <rule ref="rulesets/design.xml/NonThreadSafeSingleton" />
+ <rule ref="rulesets/design.xml/UncommentedEmptyMethod" />
+ <rule ref="rulesets/design.xml/UncommentedEmptyConstructor" />
+ <rule ref="rulesets/design.xml/AvoidConstantsInterface" />
+ <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter" />
+ <rule ref="rulesets/design.xml/PreserveStackTrace" />
+ <rule ref="rulesets/design.xml/UseCollectionIsEmpty" />
+ <rule
+ ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal" />
+ <rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract" />
+ <rule ref="rulesets/design.xml/SingularField" />
+ <rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull" />
+ <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod">
+ <priority>4</priority>
+ </rule>
+ <rule ref="rulesets/design.xml/TooFewBranchesForASwitchStatement" />
+</ruleset>
Deleted: trunk/framework/super-pom/pmd.xml
===================================================================
--- trunk/framework/super-pom/pmd.xml 2009-10-07 19:50:17 UTC (rev 5196)
+++ trunk/framework/super-pom/pmd.xml 2009-10-07 19:52:39 UTC (rev 5197)
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0" name="pmd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
- xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
- <description>PMD Plugin preferences rule set</description>
- <rule ref="rulesets/typeresolution.xml/LooseCoupling" />
- <rule ref="rulesets/typeresolution.xml/CloneMethodMustImplementCloneable" />
- <rule ref="rulesets/typeresolution.xml/UnusedImports" />
- <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException" />
- <rule ref="rulesets/basic.xml/EmptyCatchBlock" />
- <rule ref="rulesets/basic.xml/EmptyIfStmt" />
- <rule ref="rulesets/basic.xml/EmptyWhileStmt" />
- <rule ref="rulesets/basic.xml/EmptyTryBlock" />
- <rule ref="rulesets/basic.xml/EmptyFinallyBlock" />
- <rule ref="rulesets/basic.xml/EmptySwitchStatements" />
- <rule ref="rulesets/basic.xml/JumbledIncrementer" />
- <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop" />
- <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary" />
- <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode">
- <priority>2</priority>
- </rule>
- <rule ref="rulesets/basic.xml/DoubleCheckedLocking" />
- <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock">
- <priority>4</priority>
- </rule>
- <rule ref="rulesets/basic.xml/EmptySynchronizedBlock" />
- <rule ref="rulesets/basic.xml/UnnecessaryReturn" />
- <rule ref="rulesets/basic.xml/EmptyStaticInitializer" />
- <rule ref="rulesets/basic.xml/UnconditionalIfStatement" />
- <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop" />
- <rule ref="rulesets/basic.xml/BooleanInstantiation" />
- <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier" />
- <rule ref="rulesets/basic.xml/CollapsibleIfStatements" />
- <rule ref="rulesets/basic.xml/UselessOverridingMethod" />
- <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray" />
- <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
- <rule ref="rulesets/basic.xml/UselessOperationOnImmutable" />
- <rule ref="rulesets/basic.xml/MisplacedNullCheck" />
- <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals" />
- <rule ref="rulesets/basic.xml/AvoidThreadGroup" />
- <rule ref="rulesets/basic.xml/BrokenNullCheck" />
- <rule ref="rulesets/basic.xml/BigIntegerInstantiation">
- <priority>2</priority>
- </rule>
- <rule ref="rulesets/basic.xml/AvoidUsingOctalValues" />
- <rule ref="rulesets/basic.xml/AvoidUsingHardCodedIP" />
- <rule ref="rulesets/basic.xml/CheckResultSet" />
- <rule ref="rulesets/basic.xml/AvoidMultipleUnaryOperators" />
- <rule ref="rulesets/basic.xml/EmptyInitializer" />
- <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces" />
- <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces" />
- <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces" />
- <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces" />
- <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
- <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
- <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
- <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
- <rule ref="rulesets/logging-java.xml/MoreThanOneLogger" />
- <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal" />
- <rule ref="rulesets/logging-java.xml/SystemPrintln" />
- <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace" />
- <rule ref="rulesets/controversial.xml/NullAssignment">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/controversial.xml/UnusedModifier" />
- <rule ref="rulesets/controversial.xml/AssignmentInOperand" />
- <rule ref="rulesets/controversial.xml/DontImportSun" />
- <rule ref="rulesets/controversial.xml/SuspiciousOctalEscape" />
- <rule ref="rulesets/controversial.xml/UnnecessaryParentheses" />
- <rule ref="rulesets/controversial.xml/DefaultPackage">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/controversial.xml/BooleanInversion">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/controversial.xml/AvoidUsingShortType" />
- <rule ref="rulesets/controversial.xml/AvoidUsingVolatile" />
- <rule ref="rulesets/controversial.xml/AvoidUsingNativeCode" />
- <rule ref="rulesets/controversial.xml/AvoidAccessibilityAlteration" />
- <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly" />
- <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals" />
- <rule ref="rulesets/strings.xml/StringInstantiation" />
- <rule ref="rulesets/strings.xml/StringToString" />
- <rule ref="rulesets/strings.xml/InefficientStringBuffering" />
- <rule ref="rulesets/strings.xml/UnnecessaryCaseChange" />
- <rule ref="rulesets/strings.xml/UseStringBufferLength" />
- <rule ref="rulesets/strings.xml/AppendCharacterWithChar" />
- <rule ref="rulesets/strings.xml/ConsecutiveLiteralAppends" />
- <rule ref="rulesets/strings.xml/UseIndexOfChar" />
- <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck" />
- <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration" />
- <rule ref="rulesets/strings.xml/UselessStringValueOf" />
- <rule ref="rulesets/strings.xml/StringBufferInstantiationWithChar" />
- <rule ref="rulesets/strings.xml/UseEqualsToCompareStrings" />
- <rule ref="rulesets/strings.xml/AvoidStringBufferField" />
- <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable" />
- <rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException" />
- <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl" />
- <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE" />
- <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes" />
- <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException" />
- <rule ref="rulesets/strictexception.xml/AvoidRethrowingException" />
- <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError" />
- <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally" />
- <rule ref="rulesets/migrating.xml/ReplaceVectorWithList" />
- <rule ref="rulesets/migrating.xml/ReplaceHashtableWithMap" />
- <rule ref="rulesets/migrating.xml/ReplaceEnumerationWithIterator" />
- <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier" />
- <rule ref="rulesets/migrating.xml/AvoidAssertAsIdentifier" />
- <rule ref="rulesets/migrating.xml/IntegerInstantiation" />
- <rule ref="rulesets/migrating.xml/ByteInstantiation" />
- <rule ref="rulesets/migrating.xml/ShortInstantiation" />
- <rule ref="rulesets/migrating.xml/LongInstantiation" />
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseBeforeAnnotation">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseAfterAnnotation">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/migrating.xml/JUnit4TestShouldUseTestAnnotation">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/migrating.xml/JUnitUseExpected">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal" />
- <rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal" />
- <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector" />
- <rule ref="rulesets/optimizations.xml/SimplifyStartsWith" />
- <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends" />
- <rule ref="rulesets/optimizations.xml/UseArraysAsList" />
- <rule ref="rulesets/optimizations.xml/AvoidArrayLoops" />
- <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation" />
- <rule ref="rulesets/optimizations.xml/AddEmptyString" />
- <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray" />
- <rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly" />
- <rule ref="rulesets/coupling.xml/CouplingBetweenObjects" />
- <rule ref="rulesets/coupling.xml/ExcessiveImports" />
- <rule ref="rulesets/coupling.xml/LooseCoupling" />
- <rule ref="rulesets/imports.xml/DuplicateImports" />
- <rule ref="rulesets/imports.xml/DontImportJavaLang" />
- <rule ref="rulesets/imports.xml/UnusedImports" />
- <rule ref="rulesets/imports.xml/ImportFromSamePackage" />
- <rule ref="rulesets/imports.xml/TooManyStaticImports" />
- <rule ref="rulesets/junit.xml/JUnitSpelling" />
- <rule ref="rulesets/junit.xml/TestClassWithoutTestCases" />
- <rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion" />
- <rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue" />
- <rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue" />
- <rule ref="rulesets/junit.xml/UseAssertNullInsteadOfAssertTrue" />
- <rule ref="rulesets/junit.xml/SimplifyBooleanAssertion" />
- <rule ref="rulesets/naming.xml/ShortMethodName" />
- <rule ref="rulesets/naming.xml/VariableNamingConventions">
- <priority>3</priority>
- </rule>
- <rule ref="rulesets/naming.xml/MethodNamingConventions">
- <priority>3</priority>
- </rule>
- <rule ref="rulesets/naming.xml/ClassNamingConventions" />
- <rule ref="rulesets/naming.xml/AbstractNaming">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/naming.xml/AvoidDollarSigns" />
- <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass" />
- <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName" />
- <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName" />
- <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName" />
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName" />
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName" />
- <rule ref="rulesets/naming.xml/NoPackage" />
- <rule ref="rulesets/naming.xml/PackageCase" />
- <rule ref="rulesets/naming.xml/MisleadingVariableName" />
- <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
- <rule ref="rulesets/codesize.xml/NPathComplexity" />
- <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
- <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
- <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
- <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
- <rule ref="rulesets/codesize.xml/ExcessivePublicCount" />
- <rule ref="rulesets/codesize.xml/TooManyFields" />
- <rule ref="rulesets/codesize.xml/NcssMethodCount" />
- <rule ref="rulesets/codesize.xml/NcssTypeCount" />
- <rule ref="rulesets/codesize.xml/NcssConstructorCount" />
- <rule ref="rulesets/codesize.xml/TooManyMethods" />
- <rule ref="rulesets/finalizers.xml/EmptyFinalizer" />
- <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize" />
- <rule ref="rulesets/finalizers.xml/FinalizeOverloaded" />
- <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize" />
- <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected" />
- <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize" />
- <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging" />
- <rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger" />
- <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID" />
- <rule ref="rulesets/clone.xml/ProperCloneImplementation" />
- <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException" />
- <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable" />
- <rule ref="rulesets/design.xml/UseSingleton" />
- <rule ref="rulesets/design.xml/SimplifyBooleanReturns" />
- <rule ref="rulesets/design.xml/SimplifyBooleanExpressions" />
- <rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault" />
- <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts" />
- <rule ref="rulesets/design.xml/AvoidReassigningParameters" />
- <rule ref="rulesets/design.xml/SwitchDensity" />
- <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod" />
- <rule ref="rulesets/design.xml/AccessorClassGeneration" />
- <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic" />
- <rule ref="rulesets/design.xml/CloseResource" />
- <rule ref="rulesets/design.xml/NonStaticInitializer" />
- <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt" />
- <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement" />
- <rule ref="rulesets/design.xml/OptimizableToArrayCall" />
- <rule ref="rulesets/design.xml/BadComparison" />
- <rule ref="rulesets/design.xml/EqualsNull" />
- <rule ref="rulesets/design.xml/ConfusingTernary" />
- <rule ref="rulesets/design.xml/InstantiationToGetClass" />
- <rule ref="rulesets/design.xml/IdempotentOperations" />
- <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale" />
- <rule ref="rulesets/design.xml/ImmutableField" />
- <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions">
- <priority>5</priority>
- </rule>
- <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass" />
- <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic" />
- <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass" />
- <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel" />
- <rule ref="rulesets/design.xml/MissingBreakInSwitch" />
- <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify" />
- <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause">
- <priority>2</priority>
- </rule>
- <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod" />
- <rule ref="rulesets/design.xml/SimplifyConditional" />
- <rule ref="rulesets/design.xml/CompareObjectsWithEquals" />
- <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons" />
- <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn" />
- <rule ref="rulesets/design.xml/NonThreadSafeSingleton" />
- <rule ref="rulesets/design.xml/UncommentedEmptyMethod" />
- <rule ref="rulesets/design.xml/UncommentedEmptyConstructor" />
- <rule ref="rulesets/design.xml/AvoidConstantsInterface" />
- <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter" />
- <rule ref="rulesets/design.xml/PreserveStackTrace" />
- <rule ref="rulesets/design.xml/UseCollectionIsEmpty" />
- <rule
- ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal" />
- <rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract" />
- <rule ref="rulesets/design.xml/SingularField" />
- <rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull" />
- <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod">
- <priority>4</priority>
- </rule>
- <rule ref="rulesets/design.xml/TooFewBranchesForASwitchStatement" />
-</ruleset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-11 19:10:19
|
Revision: 5228
http://fudaa.svn.sourceforge.net/fudaa/?rev=5228&view=rev
Author: deniger
Date: 2009-10-11 19:10:04 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDelete.java
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Added Paths:
-----------
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiere.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiereDirectionnelle.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BNuagePoints.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BObjet2D.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BTriangles.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BUnivers.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BVolume.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/EbliFilleVue3D.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/VolumePreferencesPanel.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/ZVue3DController.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/ZVue3DPanel.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/ZVueAnimAdapter.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BControleAffichageTarget.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BControleLumiereTarget.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BGrilleAbstract.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BTextureTargetInterface.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BUniversInterface.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/BVolumeAbstract.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/GroupeInterface.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/common/Objet3DInterface.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BArbreVolume.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleAffichage.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleEchelle.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleLumiere.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleTexture.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVisible.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVolume.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BMagnetoscope.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BPas.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BPosition.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BSelecteurTexture.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BUniversInteraction.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BVolumeTransformation.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/TrajectoireCamera.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/TransformTypeIn.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/ZControleEchelle.java
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/ZControleLumiere.java
trunk/framework/ebli-3d/test.txt
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
<name>ctulu-bu</name>
<dependencies>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
<name>ctulu-common</name>
<dependencies>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.fudaa</groupId>
- <artifactId>fudaa-framework</artifactId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
<packaging>jar</packaging>
<description>Les package de com.memoire non graphique</description>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
<name>ctulu-gis</name>
<dependencies>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
<name>ctulu-ui</name>
<dependencies>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,19 +1,20 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ctuluGroupId}</groupId>
+ <groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
<name>ctulu-video</name>
<dependencies>
<dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-common</artifactId>
- </dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-common</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/dodico-common/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${dodicoGroupId}</groupId>
+ <groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
<name>dodico-common</name>
<dependencies>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ebliGroupId}</groupId>
+ <groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
<name>ebli-1d</name>
<dependencies>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ebliGroupId}</groupId>
+ <groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
<name>ebli-2d</name>
<dependencies>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-11 18:59:48 UTC (rev 5227)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-11 19:10:04 UTC (rev 5228)
@@ -1,12 +1,13 @@
<?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>
<parent>
- <artifactId>fudaa-framework</artifactId>
- <groupId>org.fudaa</groupId>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>pom</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
- <groupId>${ebliGroupId}</groupId>
+ <groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
<name>ebli-3d</name>
<dependencies>
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiere.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiere.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiere.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,156 @@
+/*
+ * @creation 1999-12-30
+ * @modification $Date: 2006-11-14 09:06:28 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import javax.media.j3d.BranchGroup;
+
+import org.fudaa.ebli.volume.common.GroupeInterface;
+import org.fudaa.ebli.volume.common.Objet3DInterface;
+
+/**
+ * @version $Revision: 1.15 $ $Date: 2006-11-14 09:06:28 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public abstract class BLumiere extends BranchGroup implements Objet3DInterface {
+ // l'ID de l'objet
+ protected int index_;
+ // son pere
+ protected GroupeInterface pere_;
+ // proprietes :
+ protected boolean visible_;
+ protected String nom_;
+
+ public BLumiere() {
+ nom_ = null;
+ pere_ = null;
+ index_ = 0;
+ visible_ = false;
+ // setCapability(BranchGroup.ALLOW_DETACH);
+ }
+
+ public boolean isFilaireEditable() {
+ return false;
+ }
+
+ public boolean isRapideEditable() {
+ return false;
+ }
+
+ /**
+ * Nomme le volume.
+ *
+ * @param _name le nom du volume
+ */
+ public void setName(final String _name) {
+ nom_ = _name;
+ }
+
+ /**
+ * Nom du volume.
+ *
+ * @return le nom du volume
+ */
+ public String getName() {
+ return nom_;
+ }
+
+ /**
+ * Renvoie l'indice de l'objet dans le groupe.
+ *
+ * @return index_ l'indice (entier)
+ */
+ public int getIndex() {
+ return index_;
+ }
+
+ /**
+ * Mutateur de la propri\xE9t\xE9 index.
+ *
+ * @param _index le nouvel indice (entier)
+ */
+ public void setIndex(final int _index) {
+ index_ = _index;
+ }
+
+ /**
+ * @return true si volume visible
+ */
+ public boolean isVisible() {
+ return visible_;
+ }
+
+ /**
+ * Indique si l'objet doit \xEAtre afficher rapidement.
+ *
+ * @return vrai si le mode rapide est selectionn\xE9 pour cet objet
+ */
+ public boolean isRapide() {
+ return false;
+ }
+
+ /**
+ * Affiche ou non l'objet sous forme rapide (boite...).
+ *
+ * @param _rapide true: le mode d'affichage rapide est selection\xE9
+ */
+ public void setRapide(final boolean _rapide) {}
+
+ /**
+ * Renvoie le groupe p\xE8re de l'objet.
+ *
+ * @return le groupe p\xE8re
+ */
+ public GroupeInterface getPere() {
+ return pere_;
+ }
+
+ /**
+ * Modifie le p\xE8re de l'objet (= le groupe auquel l'objet appartient).
+ *
+ * @param _pere le groupe p\xE8re
+ */
+ public void setPere(final GroupeInterface _pere) {
+ pere_ = _pere;
+ }
+
+ /**
+ * M\xE9thode qui modifie une propri\xE9t\xE9 de l'objet.
+ *
+ * @param _name : le nom de la propri\xE9t\xE9
+ * @param _value sa nouvelle valeur
+ */
+ public boolean setProperty(final String _name, final Object _value) {
+ return BVolume.setDefaultProperty(this, _name, _value);
+ }
+ boolean destructible_;
+
+ /**
+ * Indique si l'objet peut \xEAtre supprim\xE9 de la sc\xE8ne.
+ */
+ public boolean isDestructible() {
+ return destructible_;
+ }
+
+ /**
+ * Modifie l'enlevabilit\xE9 de l'objet.
+ *
+ * @param _destructible : vrai si l'objet peut \xEAtre d\xE9truit
+ */
+ public void setDestructible(final boolean _destructible) {
+ destructible_ = _destructible;
+ }
+
+ /**
+ * detruit l'objet (il est retir\xE9 de l'arbre).
+ */
+ public void detruire() {
+ if (isDestructible() && (pere_ != null)) {
+ pere_.remove(index_);
+ }
+ }
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiereDirectionnelle.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiereDirectionnelle.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BLumiereDirectionnelle.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,105 @@
+/*
+ * @creation 1999-12-30
+ * @modification $Date: 2006-11-20 08:40:15 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import java.awt.Color;
+
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.DirectionalLight;
+import javax.media.j3d.Light;
+import javax.media.j3d.Node;
+import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3f;
+
+import org.fudaa.ebli.volume.common.BControleLumiereTarget;
+
+/**
+ * @version $Revision: 1.10 $ $Date: 2006-11-20 08:40:15 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public class BLumiereDirectionnelle extends BLumiere implements BControleLumiereTarget {
+ DirectionalLight l_;
+ Vector3f direction_;
+ protected Color couleur_;
+ protected double intensite_ = 1;
+
+ public BLumiereDirectionnelle(final Vector3f _vecteur, final Color _couleur) {
+ couleur_ = _couleur;
+ direction_ = _vecteur;
+ l_ = new DirectionalLight(new Color3f(_couleur), _vecteur);
+ l_.setCapability(Light.ALLOW_STATE_WRITE);
+ l_.setCapability(Light.ALLOW_STATE_READ);
+ l_.setCapability(Light.ALLOW_COLOR_WRITE);
+ l_.setCapability(Light.ALLOW_COLOR_READ);
+ l_.setCapability(DirectionalLight.ALLOW_DIRECTION_WRITE);
+ l_.setCapability(DirectionalLight.ALLOW_DIRECTION_READ);
+ l_.setCapability(Node.ALLOW_BOUNDS_READ);
+ l_.setCapability(Node.ALLOW_BOUNDS_WRITE);
+ l_.setCapability(Light.ALLOW_INFLUENCING_BOUNDS_READ);
+ l_.setCapability(Light.ALLOW_INFLUENCING_BOUNDS_WRITE);
+ setCapability(ALLOW_AUTO_COMPUTE_BOUNDS_READ);
+ setCapability(ALLOW_AUTO_COMPUTE_BOUNDS_READ);
+ l_.setInfluencingBounds(new BoundingSphere(new Point3d(), 100));
+ for (int i = 18; i < 20; i++) {
+ l_.setCapability(i);
+ }
+ addChild(l_);
+ setName("Direction");
+ }
+
+ public void setBounds(final Bounds _b) {
+ l_.setInfluencingBounds(_b);
+ }
+
+ public BoundingSphere getLightBounds() {
+ return (BoundingSphere) l_.getInfluencingBounds();
+ }
+
+ public void setVisible(final boolean _visible) {
+ l_.setEnable(_visible);
+ visible_ = _visible;
+ }
+
+ public Vector3f getDirection() {
+ return direction_;
+ }
+
+ public void setDirection(final Vector3f _direction) {
+ try {
+ direction_ = _direction;
+ l_.setDirection(direction_);
+ } catch (final Exception ex) {}
+ }
+
+ public Color getCouleur() {
+ return couleur_;
+ }
+
+ public void setCouleur(final Color _couleur) {
+ couleur_ = _couleur;
+ l_.setColor(new Color3f(couleur_));
+ }
+
+ public void setIntensite(final double _intensite) {
+ intensite_ = _intensite;
+ float red, green, blue;
+ red = (float) (couleur_.getRed() * intensite_ / 255);
+ green = (float) (couleur_.getGreen() * intensite_ / 255);
+ blue = (float) (couleur_.getBlue() * intensite_ / 255);
+ try {
+ l_.setColor(new Color3f(red, green, blue));
+ } catch (final Exception ex) {}
+ }
+
+ public double getIntensite() {
+ return intensite_;
+ }
+
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BNuagePoints.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BNuagePoints.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BNuagePoints.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,78 @@
+/*
+ * @file BNuagePoints.java
+ * @creation 1999-11-29
+ * @modification $Date: 2006-07-13 13:35:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import javax.media.j3d.*;
+import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
+/**
+ * @version $Revision: 1.13 $ $Date: 2006-07-13 13:35:48 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public class BNuagePoints extends BGrille {
+ private int npoints_;
+
+ public BNuagePoints() {
+ super();
+ npoints_ = 0;
+ }
+
+ public BNuagePoints(final String _s) {
+ super(_s);
+ npoints_ = 0;
+ }
+
+ public void setGeometrie(final Point3d[] _points) {
+ /* for (int i = 0; i < _points.length; i++) {
+ _points[i].x = _points[i].x / ParametresVolumes.ECHELLE;
+ _points[i].y = _points[i].y / ParametresVolumes.ECHELLE;
+ _points[i].z = _points[i].z / ParametresVolumes.ECHELLE;
+ // System.out.println("Point "+points[i]);
+ }*/
+ bbox_=new BoundingBox();
+ bbox_.combine(_points);
+ final Point3d low = new Point3d();
+ final Point3d up = new Point3d();
+ bbox_.getLower(low);
+ bbox_.getUpper(up);
+ npoints_ = _points.length;
+ final PointArray pointarray = new PointArray(npoints_, GeometryArray.COORDINATES | GeometryArray.COLOR_3);
+ pointarray.setCoordinates(0, _points);
+ for (int i = 0; i < npoints_; i++) {
+ pointarray.setColor(i, new Color3f(1f, 1f, 1f));
+ }
+ pointarray.setCapability(GeometryArray.ALLOW_COLOR_READ);
+ pointarray.setCapability(GeometryArray.ALLOW_COLOR_WRITE);
+ shape_.setGeometry(pointarray);
+ final PolygonAttributes pa = new PolygonAttributes();
+ pa.setCapability(PolygonAttributes.ALLOW_MODE_READ);
+ pa.setCapability(PolygonAttributes.ALLOW_MODE_WRITE);
+ pa.setPolygonMode(PolygonAttributes.POLYGON_LINE);
+ pa.setCullFace(PolygonAttributes.CULL_NONE);
+ pa.setBackFaceNormalFlip(true);
+ final Appearance ap = new Appearance();
+ ap.setPolygonAttributes(pa);
+ boiteEnglobante_ = new com.sun.j3d.utils.geometry.Box((float) (up.x - low.x) / 2, (float) (up.y - low.y) / 2,
+ (float) (up.z - low.z) / 2, ap);
+ final TransformGroup bTg = new TransformGroup();
+ final Transform3D t3d = new Transform3D();
+ t3d.set(new Vector3d((up.x - low.x) / 2, (float) (up.y - low.y) / 2, -(float) (up.z - low.z) / 2));
+ bTg.setTransform(t3d);
+ bTg.addChild(boiteEnglobante_);
+ switch_.addChild(bTg);
+ /*for (int i = 0; i < _points.length; i++) {
+ _points[i].x = _points[i].x * ParametresVolumes.ECHELLE;
+ _points[i].y = _points[i].y * ParametresVolumes.ECHELLE;
+ _points[i].z = _points[i].z * ParametresVolumes.ECHELLE;
+ // System.out.println("Point "+points[i]);
+ }*/
+ }
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BObjet2D.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BObjet2D.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BObjet2D.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,140 @@
+/*
+ * @creation 1999-12-30
+ * @modification $Date: 2006-11-14 09:06:29 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import java.awt.Canvas;
+import java.beans.PropertyChangeListener;
+import java.lang.reflect.Method;
+
+import org.fudaa.ebli.volume.common.GroupeInterface;
+import org.fudaa.ebli.volume.common.Objet3DInterface;
+
+/**
+ * @version $Revision: 1.13 $ $Date: 2006-11-14 09:06:29 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public abstract class BObjet2D extends Canvas implements PropertyChangeListener, Objet3DInterface {
+ private int index_;
+ private String nom_;
+ private GroupeInterface pere_;
+ private boolean rapide_;
+
+ /**
+ * Nomme le volume.
+ *
+ * @param _nom le nouveau nom du volume
+ */
+ public void setName(final String _nom) {
+ nom_ = _nom;
+ }
+
+ public boolean isFilaireEditable() {
+ return true;
+ }
+
+ public boolean isRapideEditable() {
+ return true;
+ }
+
+ /**
+ * Renvoie le nom du volume.
+ *
+ * @return le nom du volume
+ */
+ public String getName() {
+ return nom_;
+ }
+
+ /**
+ * Renvoie l'indice de l'objet dans le groupe.
+ *
+ * @return l'indice
+ */
+ public int getIndex() {
+ return index_;
+ }
+
+ /**
+ * Modifie l'indice de l'objet dans le groupe.
+ *
+ * @param _index le nouvel indice
+ */
+ public void setIndex(final int _index) {
+ index_ = _index;
+ }
+
+ public boolean isRapide() {
+ return rapide_;
+ }
+
+ public void setRapide(final boolean _rapide) {
+ rapide_ = _rapide;
+ }
+
+ public GroupeInterface getPere() {
+ return pere_;
+ }
+
+ public void setPere(final GroupeInterface _pere) {
+ pere_ = _pere;
+ }
+
+ public boolean setProperty(final String _name, final Object _value) {
+ boolean res = false;
+ try {
+ final String n = "set" + _name.substring(0, 1).toUpperCase() + _name.substring(1);
+ Class z = _value.getClass();
+ try {
+ z = (Class) (z.getField("TYPE").get(z));
+ } catch (final Exception ey) {}
+ Class[] c = null;
+ Method m = null;
+ do {
+ c = new Class[] { z };
+ try {
+ m = getClass().getMethod(n, c);
+ } catch (final Exception ey) {}
+ z = z.getSuperclass();
+ } while ((m == null) && (z != null));
+ final Object[] o = new Object[] { _value };
+ if (m != null) {
+ m.invoke(this, o);
+ res = true;
+ }
+ } catch (final Exception ex) {}
+ return res;
+ }
+ private boolean destructible_;
+
+ /**
+ * Indique si l'objet peut etre supprime de la scene.
+ *
+ * @return vrai si l'objet peut etre detruit
+ */
+ public boolean isDestructible() {
+ return destructible_;
+ }
+
+ /**
+ * Modifie le caractere suppressible de l'objet.
+ *
+ * @param _destructible indique si l'objet peut etre detruit
+ */
+ public void setDestructible(final boolean _destructible) {
+ destructible_ = _destructible;
+ }
+
+ /**
+ * Detruit l'objet. Il est retire de l'arbre.
+ */
+ public void detruire() {
+ if (isDestructible() && (pere_ != null)) {
+ pere_.remove(index_);
+ }
+ }
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BTriangles.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BTriangles.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BTriangles.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,126 @@
+/*
+ * @creation 2000-02-04
+ * @modification $Date: 2006-07-13 13:35:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+import java.awt.Color;
+
+import javax.media.j3d.*;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3d;
+/**
+ * @version $Revision: 1.12 $ $Date: 2006-07-13 13:35:48 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public class BTriangles extends BGrille {
+/* private int npoints_;
+ private TriangleArray geometrie_;*/
+ public BTriangles() {
+ super();
+ /*npoints_= 0;
+ geometrie_= null;*/
+ }
+ public BTriangles(final String _s) {
+ super(_s);
+/* npoints_= 0;*/
+ }
+ public void setGeometrie(final TriangleArray _geometrie) {
+ _geometrie.setCapability(Geometry.ALLOW_INTERSECT);
+ _geometrie.setCapability(GeometryArray.ALLOW_COLOR_READ);
+ _geometrie.setCapability(GeometryArray.ALLOW_COLOR_WRITE);
+ _geometrie.setCapability(GeometryArray.ALLOW_COUNT_READ);
+ _geometrie.setCapability(GeometryArray.ALLOW_COORDINATE_READ);
+ _geometrie.setCapability(GeometryArray.ALLOW_COORDINATE_WRITE);
+// geometrie_= _geometrie;
+ shape_.setGeometry(_geometrie);
+ calculeBBox();
+ final Point3d low= new Point3d();
+ final Point3d up= new Point3d();
+ bbox_.getLower(low);
+ bbox_.getUpper(up);
+ // Appearance ap=shape_.getAppearance();
+ final PolygonAttributes pa= new PolygonAttributes();
+ pa.setCapability(PolygonAttributes.ALLOW_MODE_READ);
+ pa.setCapability(PolygonAttributes.ALLOW_MODE_WRITE);
+ pa.setPolygonMode(PolygonAttributes.POLYGON_LINE);
+ pa.setCullFace(PolygonAttributes.CULL_NONE);
+ pa.setBackFaceNormalFlip(true);
+ final ColoringAttributes ca= new ColoringAttributes();
+ ca.setColor(new Color3f(1f, 0f, 0f));
+ final Appearance ap= new Appearance();
+ ap.setPolygonAttributes(pa);
+ ap.setColoringAttributes(ca);
+ // ap.getPolygonAttributes().setPolygonMode(PolygonAttributes.POLYGON_LINE);
+ boiteEnglobante_=
+ new com.sun.j3d.utils.geometry.Box(
+ (float) (up.x - low.x) / 2,
+ (float) (up.y - low.y) / 2,
+ (float) (up.z - low.z) / 2,
+ ap);
+ final TransformGroup bTg= new TransformGroup();
+ final Transform3D t3d= new Transform3D();
+ t3d.set(
+ new Vector3d((low.x + up.x) / 2, (low.y + up.y) / 2, (low.z + up.z) / 2));
+ bTg.setTransform(t3d);
+ bTg.addChild(boiteEnglobante_);
+ switch_.addChild(bTg);
+ // centre();
+ }
+ public void setGeometrie(final int _nbNds, final Point3d[] _noeuds) {
+ final Color[] c= new Color[_nbNds];
+ for (int i= 0; i < _nbNds; i++) {
+ c[i]= Color.white;
+ }
+ setGeometrie(_nbNds, _noeuds, c);
+ }
+ public void setGeometrie(final int _nbNds, final Point3d[] _noeuds, final Color[] _c) {
+ /*for (int i= 0; i < _nbNds; i++) {
+ _noeuds[i].x= _noeuds[i].x / ParametresVolumes.ECHELLE;
+ _noeuds[i].y= _noeuds[i].y / ParametresVolumes.ECHELLE;
+ _noeuds[i].z= _noeuds[i].z / ParametresVolumes.ECHELLE;
+ }*/
+ bbox_=new BoundingBox();
+ bbox_.combine(_noeuds);
+ final Point3f[] texpoints= new Point3f[_nbNds];
+ for (int i= 0; i < _nbNds; i++) {
+ texpoints[i]=
+ new Point3f(
+ (float) ((_noeuds[i].x + getBoite().o_.x_)
+ / (getBoite().e_.x_ - getBoite().o_.x_)),
+ (float) ((_noeuds[i].y + getBoite().o_.y_)
+ / (getBoite().e_.y_ - getBoite().o_.y_)),
+ (float)_noeuds[i].z);
+ }
+ /* System.out.println("Generation des normales...");
+ GeometryInfo geo=new GeometryInfo(GeometryInfo.TRIANGLE_ARRAY);
+ geo.setCoordinates(noeuds);
+ new NormalGenerator().generateNormals(geo);
+ System.out.println("...OK!");
+ */
+ final TriangleArray ta=
+ new TriangleArray(
+ _nbNds,
+ GeometryArray.COORDINATES | GeometryArray.COLOR_4 // |TriangleArray.NORMALS
+ | GeometryArray.TEXTURE_COORDINATE_3);
+ final Color4f[] couleurs= new Color4f[_nbNds];
+ for (int i= 0; i < _nbNds; i++) {
+ couleurs[i]=
+ new Color4f(
+ (float)_c[i].getRed() / 255,
+ (float)_c[i].getGreen() / 255,
+ (float)_c[i].getBlue() / 255,
+ (float)_c[i].getAlpha() / 255);
+ }
+ ta.setCoordinates(0, _noeuds);
+ // ta.setNormals(0,geo.getNormals());
+ ta.setColors(0, couleurs);
+ ta.setTextureCoordinates(0, texpoints);
+ setGeometrie(ta);
+ }
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BUnivers.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BUnivers.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BUnivers.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,641 @@
+/*
+ * @creation 11 mai 2006
+ * @modification $Date: 2007-05-22 14:19:03 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.media.j3d.*;
+import javax.vecmath.AxisAngle4d;
+import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.volume.common.BUniversInterface;
+
+/**
+ * @author fred deniger
+ * @version $Id: BUnivers.java,v 1.22 2007-05-22 14:19:03 deniger Exp $
+ */
+public class BUnivers extends VirtualUniverse implements BUniversInterface {
+
+ BCanvas3D canvas_;
+
+ class TimerListener implements ActionListener {
+ long time_ = System.currentTimeMillis();
+
+ public void actionPerformed(final ActionEvent _evt) {
+ canvas_.stopRenderer();
+ final List v = BUnivers.this.volumes_.getTousEnfants();
+ for (int idx = 0; idx < v.size(); idx++) {
+ ((BVolume) v.get(idx)).actualise(time_ - System.currentTimeMillis());
+ }
+ canvas_.startRenderer();
+ }
+ }
+
+ // trois constantes pour definir les axes de transformation
+ public final static int X = 0;
+
+ public final static int Y = 1;
+ public final static int Z = 2;
+
+ // le pere de tous les groupes
+ private BGroupeStandard groupe_;
+ // le pere de tous les objets : non private pour etre acceder depuis un thread sans artifact
+ // le pere de toutes les lumieres
+ // Position de la camera, pour affichage
+ private Vector3d position_;
+ private javax.swing.Timer timer_;
+ private TransformGroup transformU_;
+ // la vue en cours
+ private int vue_;
+ // le fond
+ // les quatre vues
+ private Transform3D[] vues_;
+ Background background_;
+ BGroupeLumiere lumieres_;
+ PropertyChangeSupport support_;
+ Locale locale_;
+
+ BGroupeVolume volumes_;
+
+ public BUnivers() {
+ this(new BCanvas3D(null));
+ }
+
+ public BUnivers(final BCanvas3D _canvas) {
+ canvas_ = _canvas;
+ locale_ = new Locale(this);
+ final ViewPlatform camera = new ViewPlatform();
+ final BranchGroup viewGroup = new BranchGroup();
+ final TransformGroup viewTg = new TransformGroup();
+ viewTg.setCapability(TransformGroup.ALLOW_TRANSFORM_READ);
+ viewTg.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
+ viewTg.setCapability(Node.ALLOW_LOCAL_TO_VWORLD_READ);
+ viewTg.addChild(camera);
+ viewGroup.addChild(viewTg);
+
+ final PhysicalBody body = new PhysicalBody();
+ final PhysicalEnvironment env = new PhysicalEnvironment();
+
+ final View view = new View();
+ view.setPhysicalBody(body);
+ view.setPhysicalEnvironment(env);
+ view.setBackClipDistance(100);
+ view.setFrontClipDistance(.1);
+ view.addCanvas3D(canvas_);
+ view.attachViewPlatform(camera);
+ transformU_ = viewTg;
+ position_ = new Vector3d();
+ viewGroup.setCapability(BranchGroup.ALLOW_DETACH);
+ locale_.addBranchGraph(viewGroup);
+ }
+
+ private void buildFond(Color3f _c) {
+ if (background_ == null) {
+ background_ = _c == null ? new Background(0F, 0F, 0F) : new Background(_c);
+ background_.setCapability(Background.ALLOW_COLOR_WRITE);
+ background_.setCapability(Background.ALLOW_COLOR_READ);
+ background_.setCapability(Background.ALLOW_APPLICATION_BOUNDS_READ);
+ background_.setCapability(Background.ALLOW_APPLICATION_BOUNDS_WRITE);
+ // background_.setApplicationBounds(new BoundingSphere(new Point3d(0, 0, 0), 1E12));
+ background_.setBoundsAutoCompute(true);
+
+ final BranchGroup fond = new BranchGroup();
+ fond.addChild(background_);
+ fond.setCapability(BranchGroup.ALLOW_DETACH);
+ addBranchGraph(fond);
+ }
+ }
+
+ /**
+ * Ajoute une Branche \xE0 l'arbre de la scene, apres l'avoir compil\xE9e.
+ *
+ * @param _bg BranchGroup \xE0 ajouter
+ */
+ public void addBranchGraph(final BranchGroup _bg) {
+ if (!_bg.isCompiled()) {
+ _bg.compile();
+ }
+
+ locale_.addBranchGraph(_bg);
+ }
+
+ public void addObjet(final BVolume _v) {
+ volumes_.add(_v);
+ }
+
+ public void addPropertyChangeListener(final PropertyChangeListener _l) {
+ if (support_ == null) {
+ support_ = new PropertyChangeSupport(this);
+ }
+ support_.addPropertyChangeListener(_l);
+ }
+
+ public void addPropertyChangeListener(final String _propr, final PropertyChangeListener _l) {
+ if (support_ == null) {
+ support_ = new PropertyChangeSupport(this);
+ }
+ support_.addPropertyChangeListener(_propr, _l);
+ }
+
+ /**
+ * met en route ou arrete le timer.
+ */
+ public void animate(final boolean _b) {
+ if (_b) {
+ if (timer_ == null) {
+ timer_ = new javax.swing.Timer(100, new TimerListener());
+ }
+ timer_.start();
+ } else if (timer_ != null) {
+ timer_.stop();
+ }
+ }
+
+ /**
+ * detruit le groupe d'objet racine. A modifier par la suite: essaie de contourner les bugs de Java3D. Voir le site
+ * http://wiki.java.net/bin/view/Javadesktop/Java3DApplicationDevelopment#Releasing_Canvas3D_View_and_Virt
+ */
+ public void destroy() {
+ for (final Enumeration e = getLocale().getAllBranchGraphs(); e.hasMoreElements();) {
+ ((BranchGroup) e.nextElement()).detach();
+ }
+ BranchGroup emptyGroup = new BranchGroup();
+ emptyGroup.setCapability(BranchGroup.ALLOW_DETACH);
+ locale_.addBranchGraph(emptyGroup);
+ locale_.removeBranchGraph(emptyGroup);
+ emptyGroup = null;
+ try {
+ getCanvas3D().stopRenderer();
+ getCanvas3D().setVisible(false);
+ try {
+ getCanvas3D().setOffScreenBuffer(null);
+ } catch (final RuntimeException _evt) {
+
+ }
+ final View view = getCanvas3D().getView();
+ view.removeAllCanvas3Ds();
+ try {
+ view.attachViewPlatform(null);
+ } catch (final RuntimeException _evt) {
+
+ }
+ groupe_.detruire();
+
+ removeAllLocales();
+ com.sun.j3d.utils.universe.Viewer.clearViewerMap();
+ } catch (final RuntimeException _evt) {
+
+ }
+ }
+
+ public void freeze(final boolean _b) {
+ getCanvas3D().freeze(_b);
+ }
+
+ public BCanvas3D getCanvas3D() {
+ return canvas_;
+ }
+
+ public TransformGroup getObjectTransformGroup() {
+ return volumes_.getTransformGroup();
+ }
+
+ /**
+ * Renvoie l'objet racine de la scene.
+ *
+ * @return le p\xE8re de tous les objets.
+ */
+ public BGroupeStandard getRoot() {
+ return groupe_;
+ }
+
+ /**
+ * Renvoie tous les volumes de la scene (descends dans les groupes de volumes).
+ *
+ * @return vecteur contenant tous les volumes.
+ */
+ public List getTousEnfants() {
+ return groupe_.getTousEnfants();
+ }
+
+ public TransformGroup getTransformGroup() {
+ return transformU_;
+ }
+
+ /**
+ * renvoie la position et l'orientation de la camera.
+ */
+ public Transform3D[] getUniversTransforms() {
+ final Transform3D[] t = new Transform3D[2];
+ t[0] = new Transform3D();
+ transformU_.getTransform(t[0]);
+ t[1] = new Transform3D();
+ volumes_.getTransformGroup().getTransform(t[1]);
+ return t;
+ }
+
+ public int getVue() {
+ return vue_;
+ }
+
+ public final static int SUD = 0;
+ public final static int EST = 1;
+ public final static int NORD = 2;
+ public final static int OUEST = 3;
+ public final static int DESSUS = 4;
+
+ public final static String[] getVues() {
+ return new String[] { EbliLib.getS("Sud"), EbliLib.getS("Est"), EbliLib.getS("Nord"), EbliLib.getS("Ouest"),
+ EbliLib.getS("Dessus") };
+ }
+
+ double zmid_;
+
+ private void updateFond(GrBoite _boite) {
+ buildFond(null);
+ if (_boite == null) return;
+ double maxDist = Math.max(Math.max(_boite.getDeltaX(), _boite.getDeltaY()), _boite.getDeltaZ());
+ background_.setApplicationBounds(new BoundingSphere(new Point3d(_boite.getMidX(), _boite.getMidY(), _boite
+ .getMidZ()), maxDist * 20));
+ }
+
+ public void init() {
+ if (vues_ == null) {
+ vues_ = new Transform3D[5];
+ }
+ for (int idx = 0; idx < vues_.length; idx++) {
+ vues_[idx] = new Transform3D();
+ }
+ // on cree une nouvelle boite.
+ final GrBoite boite = volumes_.getBoite();
+ // on calcule les future coordonn\xE9es de la camera.
+ final double midX = boite.getMidX();
+ final double deltaX = boite.getDeltaX();
+ final double midY = boite.getMidY();
+ zmid_ = boite.getMidZ();
+ final double deltaY = boite.getDeltaY();
+ updateFond(boite);
+
+ volumes_.getTransformGroup().setTransform(new Transform3D());
+
+ // l'angle de vision
+ final double angleCamera = getCanvas3D().getView().getFieldOfView();
+ final double maxL = Math.max(deltaX, deltaY);
+
+ final double z = 0.5 * maxL / Math.tan(angleCamera / 2) + (boite.e_.z_ * echelle_);
+ // on suppose qu'une \xE9chelle de 20 est le max pour z
+ final double zForClip = 0.5 * maxL / Math.tan(angleCamera / 2) + (boite.e_.z_ * echelle_ * 20);
+ final double backClip = Math.hypot(maxL , zForClip);
+ getCanvas3D().getView().setBackClipDistance(Math.abs(backClip));
+ // conseille par la javadoc de java3D
+ getCanvas3D().getView().setFrontClipDistance(backClip / 100);
+ // getCanvas3D().getView().setFrontClipDistance(Math.abs(backClip)/4000);
+ // L'angle pour la vue perspective
+ // final double anglePersp = Math.toRadians(50);
+ // VUE SUD
+ // on positionne en y pour respecte l'angle de la perspective et
+ // et la distance du milieu de la scene
+ // on se place en bas de la scene : nord
+ /*******************************************************************************************************************
+ * <pre>
+ * A
+ * |\ E
+ * | \ |
+ * | \ |
+ * |_ _\|_________________________________
+ * B C D
+ * yMoins deltaY/2
+ * </pre>
+ ******************************************************************************************************************/
+ // l'angle CAD est l'angle de la camera
+ // l'angle BAC est alpha1
+ // l'angle CDA est b\xE9ta
+ // AED sont align\xE9s
+ // BCD sont a l'attitude zmin
+ // ||EC|| vaut deltaZ
+ // ||AC||=dminForX
+ // la camera se trouve en A et on veut quelle soit au dessus du zmax donc ||EC||=deltaZ et que l'on voit les bords
+ // du projet: donc AC=dminForX.
+ // dminForX =distance entre le milieu de la scene et la camera
+ // calcule afin que l'on puisse voir les bords des X
+ double ac = deltaX / (2 * Math.tan(angleCamera / 2));
+
+ // double beta = Math.atan(boite.getDeltaZ() / deltaY);
+ final double alpha1 = Math.toRadians(70);
+ // puis pour la boite
+ ac += boite.getDeltaZ() / Math.cos(alpha1);
+ double yMoins = Math.sin(alpha1) * ac;
+
+ double yA = boite.o_.y_ - yMoins;
+ double zA = (boite.o_.z_ * echelle_) + (Math.cos(alpha1) * ac);
+
+ // on peut calculer le z qui se place au milieu des z et qui prend en compte
+ // l'angle de la perspective et la distance par rapport au milieu
+
+ Transform3D t3d2;
+ // angle pour le faire regarder vers le bas
+ // SUD
+ // transformU_.getTransform(vues_[SUD]);
+ double alphaCam = alpha1 + angleCamera / 4;
+ vues_[SUD].setTranslation(new Vector3d(midX, yA/* + z / 4 */, zA));
+ vues_[SUD].setRotation(new AxisAngle4d(1, 0, 0, alphaCam));
+ // pour le nord on passe de l'autre cote
+ yA = boite.e_.y_ + yMoins;
+ vues_[NORD].setTranslation(new Vector3d(midX, yA/* + z / 4 */, zA));
+ vues_[NORD].setRotation(new AxisAngle4d(1, 0, 0, -alphaCam));
+ t3d2 = new Transform3D();
+ // oblige pour remettre la cam\xE9ra dans le bon sens
+ t3d2.setRotation(new AxisAngle4d(0, 0, 1, Math.PI));
+ vues_[NORD].mul(t3d2);
+
+ // DESSUS simple ....
+ vues_[DESSUS].set(new Vector3d(midX, midY, z));
+
+ // EST, OUEST:meme combat que nord sud
+ // dans ce cas, il suffit de tourner la camera de + ou - pi/2 selon Z
+ // pour l'est et l'ouest
+ ac = deltaY / (2 * Math.tan(angleCamera / 2));
+ ac += boite.getDeltaZ() / Math.cos(alpha1);
+ // beta = Math.atan(boite.getDeltaZ() / (deltaX / 2));
+ // alpha1 = Math.PI / 2 - beta - angleCamera;
+ yMoins = Math.sin(alpha1) * ac;
+ double xA = boite.e_.x_ + yMoins;
+ zA = (boite.o_.z_ * echelle_) + Math.cos(alpha1) * ac;
+ alphaCam = alpha1 + angleCamera / 2;
+ vues_[EST].setTranslation(new Vector3d(xA, midY, zA));
+ vues_[EST].setRotation(new AxisAngle4d(0, 0, 1, Math.PI / 2));
+ t3d2 = new Transform3D();
+ t3d2.setRotation(new AxisAngle4d(1, 0, 0, alphaCam));
+ vues_[EST].mul(t3d2);
+ xA = boite.o_.x_ - yMoins;
+ vues_[OUEST].setTranslation(new Vector3d(xA, midY, zA));
+ vues_[OUEST].setRotation(new AxisAngle4d(0, 0, 1, -Math.PI / 2));
+ t3d2 = new Transform3D();
+ t3d2.setRotation(new AxisAngle4d(1, 0, 0, alphaCam));
+ vues_[OUEST].mul(t3d2);
+
+ transformU_.setTransform(getCurrentCamera());
+ // vues_[3].setRotation(new AxisAngle4d(1,0,0,Math.PI/2));
+ }
+
+ /**
+ * Tourne les objets sur un des axes d'origine.
+ *
+ * @param _axe axe de rotation (X,Y ou Z)
+ * @param _valeur angle, en radians
+ */
+ public void orbital(final int _axe, final double _valeur) {
+ // on procede comme pour la translation sauf que la transformation est
+ // appliqu\xE9e \xE0 objets_ (pere de tous les objets) plutot qu'a la camera.
+ final Transform3D t3d = new Transform3D();
+ volumes_.getTransformGroup().getTransform(t3d);
+ final Transform3D t3d2 = new Transform3D();
+ AxisAngle4d v = new AxisAngle4d();
+ switch (_axe) {
+ case X:
+ v = new AxisAngle4d(1, 0, 0, _valeur);
+ break;
+ // penser que la camera a ete tourn\xE9 de PI/2 suivant l'axe X -> echange des axes Y et Z
+ case Y:
+ v = new AxisAngle4d(0, 0, -1, _valeur);
+ break;
+ case Z:
+ v = new AxisAngle4d(0, -1, 0, _valeur);
+ break;
+ default:
+ }
+ t3d2.setRotation(v);
+ // on applique cette transformation AVANT les autres
+ t3d2.mul(t3d);
+ volumes_.getTransformGroup().setTransform(t3d2);
+ }
+
+ public void removeBranchGraph(final BranchGroup _bg) {
+ getLocale().removeBranchGraph(_bg);
+
+ }
+
+ public void removePropertyChangeListener(final PropertyChangeListener _l) {
+ if (support_ != null) {
+ support_.removePropertyChangeListener(_l);
+ }
+ }
+
+ public void removePropertyChangeListener(final String _propr, final PropertyChangeListener _l) {
+ if (support_ != null) {
+ support_.removePropertyChangeListener(_propr, _l);
+ }
+ }
+
+ public void repaintCanvas() {
+ getCanvas3D().repaint();
+ }
+
+ /**
+ * Tourne la camera sur un axe.
+ *
+ * @param _axe axe de rotation (X,Y ou Z)
+ * @param _valeur angle, en radians
+ */
+ public void rotation(final int _axe, final double _valeur) {
+ // On procede comme pour la translation, sauf qu'il n'est pas necessaire d'envoier un
+ // PropertyChangeEvent: la position ne change pas
+ final Transform3D t3d = new Transform3D();
+ transformU_.getTransform(t3d);
+ final Transform3D t3d2 = new Transform3D();
+ // AxisAngle: vecteur 4*1 qui stocke l'axe de rotation et l'angle en radians
+ AxisAngle4d v = null;
+ switch (_axe) {
+ case X:
+ v = new AxisAngle4d(1, 0, 0, _valeur);
+ break;
+ case Y:
+ v = new AxisAngle4d(0, 1, 0, _valeur);
+ break;
+ case Z:
+ v = new AxisAngle4d(0, 0, 1, _valeur);
+ break;
+ default:
+ }
+ if (v == null) {
+ return;
+ }
+ t3d2.setRotation(v);
+ t3d.mul(t3d2);
+ transformU_.setTransform(t3d);
+ getCurrentCamera().set(t3d);
+ }
+
+ double echelle_ = 1f;
+
+ protected void updateEchelle(final double _newEchelle) {
+ if (_newEchelle == echelle_) {
+ return;
+ }
+ final GrBoite boite = getBoite();
+
+ final Transform3D t3d = new Transform3D();
+ transformU_.getTransform(t3d);
+ final Vector3d trans = new Vector3d();
+ t3d.get(trans);
+ final double deltaInit = trans.z - boite.o_.z_ * echelle_;
+ trans.z = boite.o_.z_ * _newEchelle + deltaInit;
+ t3d.setTranslation(trans);
+ transformU_.setTransform(t3d);
+ for (final Enumeration en = lumieres_.getAllChildren(); en.hasMoreElements();) {
+ final Object obj = en.nextElement();
+ if (obj instanceof BLumiereDirectionnelle) {
+ final BLumiereDirectionnelle calque = (BLumiereDirectionnelle) obj;
+ final BoundingSphere b = calque.getLightBounds();
+ final Point3d center = new Point3d();
+ b.getCenter(center);
+ center.z = boite.e_.z_ * _newEchelle;
+ b.setCenter(center);
+ }
+ }
+ echelle_ = _newEchelle;
+
+ // init();
+ // getCurrentCamera().set(t3d);
+ }
+
+ public void scale(final double _scale) {
+ final Vector3d pos = new Vector3d();
+ getCurrentCamera().get(pos);
+ final double deltaZ = -(pos.z - zmid_) / 5;
+ translation(Z, deltaZ);
+ }
+
+ private Transform3D getCurrentCamera() {
+ return vues_[vue_];
+ }
+
+ public GrBoite getBoite() {
+ return volumes_ == null ? null : volumes_.getBoite();
+ }
+
+ /**
+ * Fixe la couleur du fond.
+ */
+ public void setBackground(final Color _c) {
+ background_.setColor(new Color3f(_c));
+ // getCanvas3D().waitForSwap();
+ }
+
+ public void setImmediateBackground(final Color _c) {
+ if (background_ == null) buildFond(new Color3f(_c));
+ else
+ background_.setColor(new Color3f(_c));
+ }
+
+ public Color getBackground() {
+ Color3f c3f = new Color3f();
+ background_.getColor(c3f);
+ return c3f.get();
+ }
+
+ /**
+ * Change l'affichage de la sc\xE8ne : choix entre rapidit\xE9 et apparence.
+ *
+ * @params _rapide : mode rapide? ( =affichage d\xE9t\xE9rior\xE9)
+ */
+ public void setRapide(final boolean _rapide) {
+ groupe_.setRapide(_rapide);
+ }
+
+ public void setRoot(final BGroupeStandard _root) {
+ buildFond(new Color3f(Color.WHITE));
+ if (groupe_ != null) {
+ getLocale().removeBranchGraph(volumes_);
+ getLocale().removeBranchGraph(lumieres_);
+ }
+ groupe_ = _root;
+ volumes_ = _root.getGroupeVolume();
+ lumieres_ = _root.getGroupeLumiere();
+ addBranchGraph(volumes_);
+ addBranchGraph(lumieres_);
+ }
+
+ public void setUniversTransform(final Transform3D _t) {
+ transformU_.setTransform(_t);
+ }
+
+ /**
+ * positione la camera.
+ */
+ public void setUniversTransforms(final Transform3D[] _t) {
+ transformU_.setTransform(_t[0]);
+ volumes_.getTransformGroup().setTransform(_t[1]);
+ }
+
+ public void setVue(final int _vue) {
+ if (vues_[_vue] != null) {
+ transformU_.setTransform(vues_[_vue]);
+ vue_ = _vue;
+ }
+ }
+
+ /**
+ * Translate la camera sur un axe.
+ *
+ * @param _axe axe de translation (X,Y ou Z)
+ * @param _valeur longueur de la translation en metres
+ */
+ public void translation(final int _axe, final double _valeur) {
+ // on cree une nouvelle transformation
+ final Transform3D t3d = new Transform3D();
+ // o\xF9 l'on stocke celle de la camera
+ transformU_.getTransform(t3d);
+ // on stocke l'ancien vecteur position de la camera
+ final Vector3d oldPosition = new Vector3d();
+ t3d.get(oldPosition);
+ final Transform3D t3d2 = new Transform3D();
+ Vector3d v = new Vector3d();
+ switch (_axe) {
+ case X:
+ v = new Vector3d(_valeur, 0, 0);
+ break;
+ case Y:
+ v = new Vector3d(0, _valeur, 0);
+ break;
+ case Z:
+ v = new Vector3d(0, 0, _valeur);
+ break;
+ default:
+ }
+ // on stocke la translation dans une nouvelle matrice de transformation
+ t3d2.setTranslation(v);
+ // on multiplie l'ancienne matrice par la nouvelle
+ // t3d.mul(t3d2);
+ t3d.mul(t3d2);
+ // on prend le nouveau vecteur position
+ t3d.get(position_);
+ // on envoie un PropertyChanceEvent pour raffraichir l'affichage de la position de la camera
+ if (support_ != null) {
+ support_.firePropertyChange("position", oldPosition, position_);
+ }
+ // on remplace l'ancienne matrice par la nouvelle -> la camera s'est d\xE9plac\xE9e
+ transformU_.setTransform(t3d);
+ getCurrentCamera().set(t3d);
+ }
+
+ public Locale getLocale() {
+ return locale_;
+ }
+
+}
Added: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BVolume.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BVolume.java (rev 0)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/BVolume.java 2009-10-11 19:10:04 UTC (rev 5228)
@@ -0,0 +1,402 @@
+/*
+ * @creation 1999-11-29
+ * @modification $Date: 2006-11-14 09:06:28 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.volume;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.lang.reflect.Method;
+
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Group;
+import javax.media.j3d.Node;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Vector3d;
+
+import org.fudaa.ebli.controle.BSelecteurTargetInterface;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.volume.common.BVolumeAbstract;
+import org.fudaa.ebli.volume.common.GroupeInterface;
+
+/**
+ * @version $Revision: 1.16 $ $Date: 2006-11-14 09:06:28 $ by $Author: deniger $
+ * @author Christophe Delhorbe
+ */
+public abstract class BVolume extends BVolumeAbstract implements PropertyChangeListener, BSelecteurTargetInterface {
+
+ private boolean destructible_;
+
+ protected PropertyChangeSupport support_;
+ // la boite englobante
+ protected GrBoite boite_;
+ // l'ID de l'objet
+ protected int index_;
+ protected String nom_;
+ // son pere
+ protected GroupeInterface pere_;
+ protected boolean rapide_;
+ // la matrice de transformation
+ protected TransformGroup tg_;
+
+ // proprietes :
+ protected boolean visible_;
+
+ /**
+ * Constructeur de BVolume. Cree toute l'arborescence de l'objet et initialise une apparence par defaut.
+ */
+ public BVolume() {
+ nom_ = null;
+ pere_ = null;
+ index_ = 0;
+ visible_ = false;
+ rapide_ = false;
+ boite_ = new GrBoite();
+ setCapability(BranchGroup.ALLOW_DETACH);
+ tg_ = new TransformGroup();
+ tg_.setCapability(TransformGroup.ALLOW_TRANSFORM_READ);
+ tg_.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
+ tg_.setCapability(Group.ALLOW_CHILDREN_WRITE);
+ tg_.setCapability(Group.ALLOW_CHILDREN_READ);
+ tg_.setCapability(Group.ALLOW_CHILDREN_EXTEND);
+ tg_.setCapability(Node.ALLOW_LOCAL_TO_VWORLD_READ);
+ addChild(tg_);
+ }
+
+ /**
+ * Cree un BVolume de nom s.
+ *
+ * @param _nom le nom du volume
+ */
+ public BVolume(final String _nom) {
+ this();
+ setName(_nom);
+ }
+
+
+
+ public void actualise(final long _t) {
+ // System.out.println(getName()+" : je m'actualise!");
+ }
+
+ public void addPropertyChangeListener(final String _s, final PropertyChangeListener _l) {
+ if (support_ == null) {
+ support_ = new PropertyChangeSupport(this);
+ }
+ support_.addPropertyChangeListener(_s, _l);
+
+ }
+
+ public void calculeBBox() {}
+
+ /**
+ * Detruit l'objet (il est retire de l'arbre).
+ */
+ public void detruire() {
+ if (isDestructible() && (pere_ != null)) {
+ pere_.remove(index_);
+ }...
[truncated message content] |
|
From: <de...@us...> - 2009-10-14 21:56:10
|
Revision: 5266
http://fudaa.svn.sourceforge.net/fudaa/?rev=5266&view=rev
Author: deniger
Date: 2009-10-14 21:56:02 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/pom.xml
Added Paths:
-----------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaProjetInformationPanel.java
Removed Paths:
-------------
trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVisible.java
Property Changed:
----------------
trunk/framework/fudaa-common-courbe/
Deleted: trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVisible.java
===================================================================
--- trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVisible.java 2009-10-14 21:54:08 UTC (rev 5265)
+++ trunk/framework/ebli-3d/src/main/java/org/fudaa/ebli/volume/controles/BControleVisible.java 2009-10-14 21:56:02 UTC (rev 5266)
@@ -1,79 +0,0 @@
-/*
- * @creation 9 ao\xFBt 2004
- * @modification $Date: 2006-09-19 14:55:53 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.volume.controles;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuGridLayout;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuResource;
-
-/**
- * Une checkbox pour controler l'affichage d'un composant. Ce composant recoit les changements de proprietes ("visible")
- * pour se mettre a jour. Une reference est gardee vers le composant cible.
- *
- * @author Fred Deniger
- * @version $Id: BControleVisible.java,v 1.7 2006-09-19 14:55:53 deniger Exp $
- */
-public class BControleVisible extends BuCheckBox implements PropertyChangeListener, ActionListener {
-
- private JComponent target_;
-
- public BControleVisible() {
- super();
- addActionListener(this);
- }
-
- public void setTarget(final JComponent _c) {
- if (_c != target_) {
- if (target_ != null) {
- target_.removePropertyChangeListener(this);
- }
- target_ = _c;
- if (target_ != null) {
- setSelected(target_.isVisible());
- target_.addPropertyChangeListener("visible", this);
- }
- }
- setEnabled(target_ != null);
- }
-
- public void actionPerformed(final ActionEvent _e) {
- if (target_ != null) {
- target_.setVisible(isSelected());
- }
- }
-
- public void propertyChange(final PropertyChangeEvent _evt) {
- if (_evt.getSource() == target_) {
- setSelected(target_.isVisible());
- }
-
- }
-
- /**
- * Panneau permettant de controler l'etat de visibilite d'un composant.
- *
- * @return un panel avec un label et une checkbox.
- */
- public static BControleVisible buildPanelVisible(final JPanel _dest) {
- _dest.removeAll();
- _dest.setLayout(new BuGridLayout(2));
- _dest.add(new BuLabel(BuResource.BU.getString("Visible")));
- final BControleVisible r = new BControleVisible();
- _dest.add(r);
- return r;
- }
-}
\ No newline at end of file
Copied: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaProjetInformationPanel.java (from rev 5216, trunk/business/fudaa-common-corba/src/main/java/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java)
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaProjetInformationPanel.java (rev 0)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaProjetInformationPanel.java 2009-10-14 21:56:02 UTC (rev 5266)
@@ -0,0 +1,101 @@
+/*
+ * @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.impl;
+
+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;
+ }
+}
Property changes on: trunk/framework/fudaa-common-courbe
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-14 21:54:08 UTC (rev 5265)
+++ trunk/framework/pom.xml 2009-10-14 21:56:02 UTC (rev 5266)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
@@ -70,12 +70,26 @@
<artifactId>ctulu-gis</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!-- dodico-->
<dependency>
<groupId>${dodicoGroupId}</groupId>
<artifactId>dodico-common</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!-- ebli-->
<dependency>
<groupId>${ebliGroupId}</groupId>
@@ -146,6 +160,16 @@
<artifactId>fudaa-common-save</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>dico-server</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- dependence externes -->
<dependency>
<groupId>jsci</groupId>
@@ -328,19 +352,6 @@
<tagBase>https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags</tagBase>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-15 04:13:43
|
Revision: 5276
http://fudaa.svn.sourceforge.net/fudaa/?rev=5276&view=rev
Author: deniger
Date: 2009-10-15 04:13:30 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/ctulu-gis/src/test/java/org/fudaa/ctulu/interpolation/
trunk/framework/ctulu-gis/src/test/java/org/fudaa/ctulu/interpolation/TestJInterpolation.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BControleVisible.java
Added: trunk/framework/ctulu-gis/src/test/java/org/fudaa/ctulu/interpolation/TestJInterpolation.java
===================================================================
--- trunk/framework/ctulu-gis/src/test/java/org/fudaa/ctulu/interpolation/TestJInterpolation.java (rev 0)
+++ trunk/framework/ctulu-gis/src/test/java/org/fudaa/ctulu/interpolation/TestJInterpolation.java 2009-10-15 04:13:30 UTC (rev 5276)
@@ -0,0 +1,310 @@
+/*
+ * @creation 29 mai 07
+ * @modification $Date: 2007-06-11 13:03:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ctulu.interpolation;
+
+import gnu.trove.TDoubleArrayList;
+
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.CtuluVariable;
+import org.fudaa.ctulu.CtuluVariableDefault;
+import org.fudaa.ctulu.collection.CtuluListDouble;
+import org.fudaa.ctulu.gis.CtuluLibGeometrie;
+import org.fudaa.ctulu.interpolation.bilinear.InterpolatorBilinear;
+
+/**
+ * @author fred deniger
+ * @version $Id: TestJInterpolation.java,v 1.2 2007-06-11 13:03:48 deniger Exp $
+ */
+public class TestJInterpolation extends TestCase {
+
+ public void testToPolaire() {
+ final double eps = 1E-15;
+ TDoubleArrayList vxs = new TDoubleArrayList();
+ TDoubleArrayList vys = new TDoubleArrayList();
+ TDoubleArrayList rs = new TDoubleArrayList();
+ TDoubleArrayList thetas = new TDoubleArrayList();
+
+ double vx = 0;
+ double vy = 0;
+ double r = 0;
+ double theta = 0;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = 0;
+ vy = 1;
+ r = 1;
+ theta = Math.PI / 2;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = 0;
+ vy = -1;
+ r = 1;
+ theta = -Math.PI / 2;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = 0.5;
+ vy = 0;
+ r = 0.5;
+ theta = 0;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = -0.5;
+ vy = 0;
+ r = 0.5;
+ theta = Math.PI;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = 1;
+ vy = 1;
+ r = Math.sqrt(2);
+ theta = Math.PI / 4;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = -1;
+ vy = 1;
+ r = Math.sqrt(2);
+ theta = 3 * Math.PI / 4;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = 1;
+ vy = -1;
+ r = Math.sqrt(2);
+ theta = -Math.PI / 4;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = -1;
+ vy = -1;
+ r = Math.sqrt(2);
+ theta = -3 * Math.PI / 4;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ vx = Math.sqrt(3) / 2;
+ vy = 0.5;
+ r = 1;
+ theta = Math.PI / 6;
+ vxs.add(vx);
+ vys.add(vy);
+ rs.add(r);
+ thetas.add(theta);
+ assertEquals(r, InterpolationVectorContainer.getNorme(vx, vy), eps);
+ assertEquals(theta, InterpolationVectorContainer.getTheta(vx, vy), eps);
+ CtuluListDouble listVx = new CtuluListDouble(vxs.toNativeArray());
+ CtuluListDouble listVy = new CtuluListDouble(vys.toNativeArray());
+ assertTrue(CtuluLibArray.isDoubleEquals(InterpolationVectorContainer.getNorme(listVx, listVy), rs.toNativeArray(),
+ eps));
+ assertTrue(CtuluLibArray.isDoubleEquals(InterpolationVectorContainer.getTheta(listVx, listVy), thetas
+ .toNativeArray(), eps));
+ CtuluListDouble listR = new CtuluListDouble(rs.toNativeArray());
+ CtuluListDouble listTheta = new CtuluListDouble(thetas.toNativeArray());
+ assertTrue(CtuluLibArray.isDoubleEquals(InterpolationVectorContainer.getVx(listR, listTheta), vxs.toNativeArray(),
+ eps));
+ assertTrue(CtuluLibArray.isDoubleEquals(InterpolationVectorContainer.getVy(listR, listTheta), vys.toNativeArray(),
+ eps));
+ }
+
+ public void testToVxVy() {
+ final double eps = 1E-15;
+ double r = 0;
+ double theta = 0;
+ assertEquals(0, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(0, InterpolationVectorContainer.getVy(r, theta), eps);
+ r = 1;
+ theta = 0;
+ assertEquals(1, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(0, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = Math.PI;
+ assertEquals(-1, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(0, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = Math.PI / 2;
+ assertEquals(0, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(1, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = -Math.PI / 2;
+ assertEquals(0, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(-1, InterpolationVectorContainer.getVy(r, theta), eps);
+ double res = Math.sqrt(2) / 2;
+ theta = Math.PI / 4;
+ assertEquals(res, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(res, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = -Math.PI / 4;
+ assertEquals(res, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(-res, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = -3 * Math.PI / 4;
+ assertEquals(-res, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(-res, InterpolationVectorContainer.getVy(r, theta), eps);
+ theta = 3 * Math.PI / 4;
+ assertEquals(-res, InterpolationVectorContainer.getVx(r, theta), eps);
+ assertEquals(res, InterpolationVectorContainer.getVy(r, theta), eps);
+ }
+
+ public void testVectorParameters() {
+ CtuluVariableDefault vx = new CtuluVariableDefault("vx");
+ CtuluVariableDefault vy = new CtuluVariableDefault("vy");
+ CtuluVariableDefault bathy = new CtuluVariableDefault("bathy");
+ InterpolationVectorContainer vect = new InterpolationVectorContainer();
+ vect.addVxVy(vx, vy);
+ assertTrue(vect.isVect(vx));
+ assertTrue(vect.isVx(vx));
+ assertTrue(vect.isVect(vy));
+ assertTrue(vect.isVy(vy));
+ assertFalse(vect.isVect(bathy));
+ List var = Arrays.asList(new Object[] { vx, bathy });
+ InterpolationSrcAdapter src = new InterpolationSrcAdapter(bathy, vx, vy);
+ double dist = CtuluLibGeometrie.getDistance(0, 0, 0.5, 0.5);
+ double normeAttendue = getInterpolValue(dist, src.getNorme(0), dist, src.getNorme(1), dist, src.getNorme(2), dist,
+ src.getNorme(3));
+ double angleAttendue = getInterpolValue(dist, src.getAngle(0), dist, src.getAngle(1), dist, src.getAngle(2), dist,
+ src.getAngle(3));
+ double vxAttendu = InterpolationVectorContainer.getVx(normeAttendue, angleAttendue);
+ double vyAttendu = InterpolationVectorContainer.getVy(normeAttendue, angleAttendue);
+ InterpolationParameters params = new InterpolationParameters(var, new InterpolationTargetTmp(), src, vect);
+ // on teste les parametres tempos cr\xE9es pour contenir les vecteurs
+ InterpolationParameters forVect = params.createParametersForVect();
+ assertEquals(3, forVect.getVariable().size());
+ assertEquals(vy, forVect.getVariable().get(2));
+ new InterpolatorBilinear(src).interpolate(params);
+ InterpolationResultsHolderI res = params.getResults();
+ assertEquals(params.getTarget().getPtsNb(), res.getNbPtResultSet());
+ double[] valuesForPt = res.getValuesForPt(0);
+ assertNotNull(valuesForPt);
+ assertEquals(2, valuesForPt.length);
+ assertEquals(getInterpolValue(dist, src.getV(bathy, 0), dist, src.getV(bathy, 1), dist, src.getV(bathy, 2), dist,
+ src.getV(bathy, 3)), valuesForPt[1], 1E-5);
+ assertEquals(vxAttendu, valuesForPt[0], 1E-5);
+
+ // 2eme essai
+ var = Arrays.asList(new Object[] { vy, vx, bathy });
+ params = new InterpolationParameters(var, new InterpolationTargetTmp(), src, vect);
+ new InterpolatorBilinear(src).interpolate(params);
+ assertEquals(params.getTarget().getPtsNb(), res.getNbPtResultSet());
+ valuesForPt = params.getResults().getValuesForPt(0);
+ assertEquals(3, valuesForPt.length);
+ assertEquals(getInterpolValue(dist, src.getV(bathy, 0), dist, src.getV(bathy, 1), dist, src.getV(bathy, 2), dist,
+ src.getV(bathy, 3)), valuesForPt[2], 1E-5);
+
+ assertEquals(vxAttendu, valuesForPt[1], 1E-5);
+
+ assertEquals(vyAttendu, valuesForPt[0], 1E-5);
+
+ }
+
+ public static double getInterpolValue(final double _d1, final double _z1, final double _d2, final double _z2,
+ final double _d3, final double _z3, final double _d4, final double _z4) {
+ return (_z1 / (_d1 * _d1) + _z2 / (_d2 * _d2) + _z3 / (_d3 * _d3) + _z4 / (_d4 * _d4))
+ / (1 / (_d1 * _d1) + 1 / (_d2 * _d2) + 1 / (_d3 * _d3) + 1 / (_d4 * _d4));
+ }
+
+ static class InterpolationTargetTmp implements InterpolationTarget {
+ final double[] x_ = new double[] { 0.5 };
+ final double[] y_ = new double[] { 0.5 };
+
+ public int getPtsNb() {
+ return x_.length;
+ }
+
+ public double getPtX(int _i) {
+ return x_[_i];
+ }
+
+ public double getPtY(int _i) {
+ return y_[_i];
+ }
+
+ public boolean isInBuffer(double _xToTest, double _yToTest, double _maxDist) {
+ return true;
+ }
+
+ }
+
+ static class InterpolationSrcAdapter implements InterpolationSupportValuesI, SupportLocationI {
+
+ final double[] x_ = new double[] { 0, 1, 0, 1 };
+ final double[] y_ = new double[] { 0, 0, 1, 1 };
+ final double[] bathy_ = new double[] { 1, -1, 2, -2 };
+ final double[] vx_ = new double[] { 10, -10, -30, 30 };
+ final double[] vy_ = new double[] { -100, 100, -200, 200 };
+ final CtuluVariable vBathy_;
+ final CtuluVariable vVx_;
+ final CtuluVariable vVy_;
+
+ public InterpolationSrcAdapter(final CtuluVariable _bathy, final CtuluVariable _vx, final CtuluVariable _vy) {
+ super();
+ vBathy_ = _bathy;
+ vVx_ = _vx;
+ vVy_ = _vy;
+ }
+
+ public int getPtsNb() {
+ return x_.length;
+ }
+
+ public double getNorme(int _i) {
+ return InterpolationVectorContainer.getNorme(vx_[_i], vy_[_i]);
+ }
+
+ public double getAngle(int _i) {
+ return InterpolationVectorContainer.getTheta(vx_[_i], vy_[_i]);
+ }
+
+ public double getPtX(int _i) {
+ return x_[_i];
+ }
+
+ public double getPtY(int _i) {
+ return y_[_i];
+ }
+
+ public double getV(CtuluVariable _var, int _ptIdx) {
+ if (_var == vBathy_) return bathy_[_ptIdx];
+ if (_var == vVx_) return vx_[_ptIdx];
+ if (_var == vVy_) return vy_[_ptIdx];
+ return -1000000;
+ }
+ }
+
+}
Added: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BControleVisible.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BControleVisible.java (rev 0)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BControleVisible.java 2009-10-15 04:13:30 UTC (rev 5276)
@@ -0,0 +1,79 @@
+/*
+ * @creation 9 ao\xFBt 2004
+ * @modification $Date: 2006-09-19 14:55:53 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.controle;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuGridLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuResource;
+
+/**
+ * Une checkbox pour controler l'affichage d'un composant. Ce composant recoit les changements de proprietes ("visible")
+ * pour se mettre a jour. Une reference est gardee vers le composant cible.
+ *
+ * @author Fred Deniger
+ * @version $Id: BControleVisible.java,v 1.7 2006-09-19 14:55:53 deniger Exp $
+ */
+public class BControleVisible extends BuCheckBox implements PropertyChangeListener, ActionListener {
+
+ private JComponent target_;
+
+ public BControleVisible() {
+ super();
+ addActionListener(this);
+ }
+
+ public void setTarget(final JComponent _c) {
+ if (_c != target_) {
+ if (target_ != null) {
+ target_.removePropertyChangeListener(this);
+ }
+ target_ = _c;
+ if (target_ != null) {
+ setSelected(target_.isVisible());
+ target_.addPropertyChangeListener("visible", this);
+ }
+ }
+ setEnabled(target_ != null);
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ if (target_ != null) {
+ target_.setVisible(isSelected());
+ }
+ }
+
+ public void propertyChange(final PropertyChangeEvent _evt) {
+ if (_evt.getSource() == target_) {
+ setSelected(target_.isVisible());
+ }
+
+ }
+
+ /**
+ * Panneau permettant de controler l'etat de visibilite d'un composant.
+ *
+ * @return un panel avec un label et une checkbox.
+ */
+ public static BControleVisible buildPanelVisible(final JPanel _dest) {
+ _dest.removeAll();
+ _dest.setLayout(new BuGridLayout(2));
+ _dest.add(new BuLabel(BuResource.BU.getString("Visible")));
+ final BControleVisible r = new BControleVisible();
+ _dest.add(r);
+ return r;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-14 21:52:13
|
Revision: 5263
http://fudaa.svn.sourceforge.net/fudaa/?rev=5263&view=rev
Author: deniger
Date: 2009-10-14 21:52:02 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/fudaa-dico/
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/
trunk/framework/fudaa-dico/server/.settings/
trunk/framework/fudaa-dico/server/.settings/org.eclipse.core.resources.prefs
trunk/framework/fudaa-dico/server/.settings/org.eclipse.jdt.core.prefs
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/server/src/
trunk/framework/fudaa-dico/server/src/main/
trunk/framework/fudaa-dico/server/src/main/java/
trunk/framework/fudaa-dico/server/src/main/java/org/
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAbstract.java.tpl
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAnalyzer.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormat.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatDefault.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersion.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasInterface.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasReader.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasResult.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasWriter.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoComponentVisitor.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoComportValues.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoDataType.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoDataTypeGenerate.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoDynamiqueGenerator.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoEntite.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoEntiteComparator.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoEntiteFileState.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoEntiteGenerate.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoEntiteList.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoExec.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoFactory.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoGenerator.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoKeyword.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoLanguage.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoManager.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoModelAbstract.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoModelAbstractDyn.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParams.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsChangeState.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsChangeStateInterface.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsChangeStateListener.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsInterface.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsLinkedSource.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsListener.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoParamsPrevalid.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoResource.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoVersionManager.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/TelemacExec.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/dico_en.fr_txt
trunk/framework/fudaa-dico/server/src/main/resources/
trunk/framework/fudaa-dico/server/src/main/resources/org/
trunk/framework/fudaa-dico/server/src/main/resources/org/fudaa/
trunk/framework/fudaa-dico/server/src/main/resources/org/fudaa/dodico/
trunk/framework/fudaa-dico/server/src/main/resources/org/fudaa/dodico/dico/
trunk/framework/fudaa-dico/server/src/main/resources/org/fudaa/dodico/dico/DicoAbstract.java.tpl
trunk/framework/fudaa-dico/server/src/main/resources/org/fudaa/dodico/dico/dico_en.fr_txt
trunk/framework/fudaa-dico/server/src/site/
trunk/framework/fudaa-dico/server/src/test/
trunk/framework/fudaa-dico/server/src/test/java/
trunk/framework/fudaa-dico/src/
trunk/framework/fudaa-dico/ui/
trunk/framework/fudaa-dico/ui/.settings/
trunk/framework/fudaa-dico/ui/.settings/org.eclipse.core.resources.prefs
trunk/framework/fudaa-dico/ui/.settings/org.eclipse.jdt.core.prefs
trunk/framework/fudaa-dico/ui/pom.xml
trunk/framework/fudaa-dico/ui/src/
trunk/framework/fudaa-dico/ui/src/main/
trunk/framework/fudaa-dico/ui/src/main/java/
trunk/framework/fudaa-dico/ui/src/main/java/org/
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDIcoFiltreChooserMode.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDico.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoBooleanCellEditor.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoCalculLocalBuilder.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoCalculLocalOp.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoChooserPanel.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoComparator.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoEditorInterface.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoEntiteFileTableModelInterface.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoEntitePanel.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoEntiteTableModel.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFilleProjet.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltre.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserAbstract.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserListAbstract.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserModified.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserName.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserRubrique.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreChooserSimple.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreController.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoFiltreEntiteList.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoImplementation.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoLib.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoMultiEntiteViewer.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoNewProjectPanel.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoOpenDialog.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoParams.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoPreferences.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoProjectPanel.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoProjectState.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoProjet.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoProjetInterface.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoResource.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoTableColumn.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoTableColumnIdentifier.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoTableEditorChooser.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoTableRendererChooser.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/FDicoTableSortIndicator.java
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/fdico_en.fr_txt
trunk/framework/fudaa-dico/ui/src/main/java/org/fudaa/fudaa/fdico/package.html
trunk/framework/fudaa-dico/ui/src/main/resources/
trunk/framework/fudaa-dico/ui/src/main/resources/org/
trunk/framework/fudaa-dico/ui/src/main/resources/org/fudaa/
trunk/framework/fudaa-dico/ui/src/main/resources/org/fudaa/fudaa/
trunk/framework/fudaa-dico/ui/src/main/resources/org/fudaa/fudaa/fdico/
trunk/framework/fudaa-dico/ui/src/main/resources/org/fudaa/fudaa/fdico/fdico_en.fr_txt
trunk/framework/fudaa-dico/ui/src/main/resources/org/fudaa/fudaa/fdico/package.html
trunk/framework/fudaa-dico/ui/src/site/
trunk/framework/fudaa-dico/ui/src/test/
trunk/framework/fudaa-dico/ui/src/test/java/
Added: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml (rev 0)
+++ trunk/framework/fudaa-dico/pom.xml 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,34 @@
+<?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.framework</groupId>
+ <artifactId>pom</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>project</artifactId>
+ <name>projet Dico</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>server</module>
+ <module>ui</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>dico-server</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Added: trunk/framework/fudaa-dico/server/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/framework/fudaa-dico/server/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/framework/fudaa-dico/server/.settings/org.eclipse.core.resources.prefs 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,3 @@
+#Tue Jul 21 11:46:37 CEST 2009
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-15
Added: trunk/framework/fudaa-dico/server/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/framework/fudaa-dico/server/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/framework/fudaa-dico/server/.settings/org.eclipse.jdt.core.prefs 2009-10-14 21:52:02 UTC (rev 5263)
@@ -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/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml (rev 0)
+++ trunk/framework/fudaa-dico/server/pom.xml 2009-10-14 21:52:02 UTC (rev 5263)
@@ -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.framework.dico</groupId>
+ <artifactId>project</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.framework.dico</groupId>
+ <artifactId>dico-server</artifactId>
+ <name>Server Dico</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAbstract.java.tpl
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAbstract.java.tpl (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAbstract.java.tpl 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,51 @@
+/*
+ *File generated by fudaa
+ */
+
+package
+${getPackage}
+
+import org.fudaa.dodico.dico.*;
+/**
+ * @author deniger
+ */
+
+public class
+${getClassName}
+ extends DicoModelAbstract
+{
+ public
+${getClassName}
+ ()
+ {
+ super();
+ }
+ public
+${getClassName}
+(int _l)
+ {
+ super(_l);
+ }
+ public
+${getClassName}
+(String _l)
+ {
+ super(_l);
+ }
+ public final String getCodeName()
+ {
+${getCodeName}
+ }
+ public final String getVersion()
+ {
+${getVersion}
+ }
+ protected String[] createNoms()
+ {
+${createNoms}
+ }
+ protected final DicoEntite[] createEntites()
+ {
+${createEntites}
+ }
+}
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAnalyzer.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAnalyzer.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoAnalyzer.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,802 @@
+/*
+ * @file DicoAnalyzer.java
+ * @creation 4 avr. 2003
+ * @modification $Date: 2007-11-20 11:42:57 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import gnu.trove.TObjectIntHashMap;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.memoire.fu.FuLog;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.CtuluLibMessage;
+import org.fudaa.ctulu.CtuluLibString;
+
+/**
+ * @author deniger
+ * @version $Id: DicoAnalyzer.java,v 1.27 2007-11-20 11:42:57 bmarchan Exp $
+ */
+public class DicoAnalyzer // extends FileOpReaderWriterSimpleAbstract
+{
+
+ /**
+ * Permet d'obtenir a partir d'un nom du type telemac3dv4p3 le nom (telemac3d) et la version (v4p3). La version doit
+ * avoir une longueur de 4.
+ *
+ * @return le nom + la version
+ * @param _s la chaine a analyser
+ */
+ public final static String[] getNameAndVersion(final String _s) {
+ return getNameAndVersion(_s, _s.length());
+ }
+
+ /**
+ * Recupere a partir du nom de fichier dico <code>_s</code> le nom et la version du code correspondant. Il est suppose
+ * que la version est codee sur 4 caractere. Par exemple pour le fichier Telemac2dv2p5, la methode renvoie
+ * [telemac2d,v5p3] (nom en minuscule et version telle quelle).
+ *
+ * @param _s la chaine a analyser
+ * @param _endIndex le dernier index de la chaine a considerer
+ * @return le nom + version
+ */
+ public final static String[] getNameAndVersion(final String _s, final int _endIndex) {
+ final int versionLength = 4;
+ if (_endIndex > (versionLength + 1)) {
+ final String[] r = new String[2];
+ r[1] = _s.substring(_endIndex - versionLength, _endIndex - versionLength + 4);
+ r[0] = _s.substring(0, _endIndex - versionLength).toLowerCase();
+ return r;
+ }
+ return null;
+ }
+
+ CtuluAnalyze analyze_;
+
+ private boolean dicoDynamique_;
+
+ final private File dicoFile_;
+
+ // stocke les COMPORT
+ Map entiteComport_ = new HashMap();
+
+ private DicoEntiteGenerate[] entites_;
+
+ private DicoKeyword kw_;
+
+ private String name_;
+
+ private int nbLanguage_;
+
+ private LineNumberReader reader_;
+
+ private String version_;
+
+ /**
+ * @param _f le fichier dico
+ */
+ public DicoAnalyzer(final File _f) {
+ dicoFile_ = _f;
+ findNameAndVersion();
+ kw_ = new DicoKeyword();
+ }
+
+ /**
+ * @return le fichier dico
+ */
+ public File getDicoFile() {
+ return dicoFile_;
+ }
+
+ private boolean computeChoice(final DicoDataTypeGenerate _type, final String[] _choiceByLanguage, final int _index) {
+ if (_choiceByLanguage == null) { throw new IllegalArgumentException("argument _choice nul"); }
+ final int t = _choiceByLanguage.length;
+ String[] choiceList = CtuluLibString.parseString(_choiceByLanguage[0], DicoKeyword.getChoiceSep());
+ int nbChoix = choiceList.length;
+ String[] keys = new String[nbChoix];
+ String[][] values = new String[t][nbChoix];
+ final String[] stemp = new String[2];
+ boolean b;
+ boolean nokeys = false;
+ boolean orUsed = false;
+ for (int i = 0; i < nbChoix; i++) {
+ b = computeChoiceItem(choiceList[i], stemp);
+ if (!b) {
+ FuLog.warning("Errors while analyzing keywords " + choiceList[i]);
+ return false;
+ }
+ keys[i] = stemp[0];
+ if (stemp[0] == null) {
+ nokeys = true;
+ } else if (stemp[0].indexOf(getOuTxt()) >= 0) {
+ orUsed = true;
+ }
+ values[0][i] = stemp[1];
+ }
+ if (orUsed) {
+ final List newKeys = new ArrayList(nbChoix + 5);
+ final List newValues = new ArrayList(nbChoix + 5);
+ for (int i = 0; i < nbChoix; i++) {
+ /* b = */computeChoiceItem(choiceList[i], stemp);
+ StringTokenizer tk = null;
+ if (stemp[0].indexOf(getOuTxt()) >= 0) {
+ tk = new StringTokenizer(stemp[0], getOuTxt());
+ } else if (stemp[0].indexOf(getOrTxt()) >= 0) {
+ tk = new StringTokenizer(stemp[0], getOrTxt());
+ }
+ if (tk == null) {
+ newKeys.add(stemp[0]);
+ newValues.add(stemp[1]);
+ } else {
+ while (tk.hasMoreTokens()) {
+ final String s = tk.nextToken().trim();
+ newKeys.add(s);
+ newValues.add(stemp[1]);
+ }
+ }
+ }
+ keys = new String[newKeys.size()];
+ newKeys.toArray(keys);
+ values = new String[t][newKeys.size()];
+ newValues.toArray(values[0]);
+ nbChoix = keys.length;
+ }
+ for (int i = 1; i < t; i++) {
+ choiceList = CtuluLibString.parseString(_choiceByLanguage[i], DicoKeyword.getChoiceSep());
+ for (int j = 0; j < nbChoix; j++) {
+ b = computeChoiceItem(choiceList[j], stemp);
+ if (!b) {
+ analyze_.addFatalError("Error while analyzing " + choiceList[j], _index);
+ return false;
+ }
+ if (nokeys) {
+ values[i][j] = stemp[1];
+ } else {
+ if ((orUsed) && (stemp[0].indexOf(getOrTxt()) >= 0)) {
+ final StringTokenizer tk = new StringTokenizer(stemp[0], getOrTxt());
+ while (tk.hasMoreTokens()) {
+ final String k = tk.nextToken();
+ if (k.equals(keys[j])) {
+ values[i][j] = stemp[1];
+ } else {
+ System.out.println("keywords in bad order with or !!");
+ final int index = CtuluLibArray.findObject(keys, k);
+ if (index >= 0) {
+ values[i][index] = k;
+ } else {
+ analyze_.addFatalError("OR keywords not found" + k, _index);
+ return false;
+ }
+ }
+ j++;
+ }
+ } else {
+ if (stemp[0].equals(keys[j])) {
+ values[i][j] = stemp[1];
+ } else {
+ System.out.println("keywords in bad order");
+ final int index = CtuluLibArray.findObject(keys, stemp[0]);
+ if (index >= 0) {
+ values[i][index] = stemp[1];
+ } else {
+ analyze_.addFatalError(DicoResource.getS("Cl\xE9 \"{0}\" non trouv\xE9es", choiceList[j]), _index);
+ return false;
+ }
+ }
+ }
+ }
+ }
+ }
+ if (values.length != nbLanguage_) {
+ analyze_.addFatalError(DicoResource.getS("Les choix propos\xE9s ne sont pas suffisants"), _index);
+ }
+ String s = null;
+ if (nokeys) {
+ s = _type.setChoix(null, values);
+ } else {
+ s = _type.setChoix(keys, values);
+ }
+ if (s != null) {
+ analyze_.addFatalError(s, _index);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * @return ou
+ */
+ private String getOuTxt() {
+ return " ou ";
+ }
+
+ /**
+ * @return or
+ */
+ private String getOrTxt() {
+ return " or ";
+ }
+
+ private boolean computeChoiceItem(final String _choice, final String[] _destArray) {
+ final String stemp = DicoKeyword.computeValue(_choice);
+ final int index = stemp.indexOf('=');
+ String value = null;
+ if (index < 1) {
+ _destArray[0] = null;
+ value = stemp;
+ } else {
+ String key = stemp.substring(0, index).trim();
+ if (key.startsWith(getQuoteString())) {
+ if (!key.endsWith(getQuoteString())) { return false; }
+ key = key.substring(1, key.length() - 1);
+ }
+ _destArray[0] = key.trim();
+ value = stemp.substring(index + 1).trim();
+ }
+ if (value == null) { return false; }
+ if (value.startsWith(getQuoteString())) {
+ if (!value.endsWith(getQuoteString())) { return false; }
+ _destArray[1] = value.substring(1, value.length() - 1).trim();
+ } else {
+ _destArray[1] = value.trim();
+ }
+ _destArray[1] = _destArray[1].replace('\xC9', '\xE8');
+ return true;
+ }
+
+ /**
+ * @return
+ */
+ private String getQuoteString() {
+ return "'";
+ }
+
+ private void computeConditionAffichage() {
+ final int n = entites_.length;
+ for (int i = 0; i < n; i++) {
+ final List m = (List) entiteComport_.get(entites_[i]);
+ if (m != null) {
+ entites_[i].computeActionAffichage(kw_, entites_, m, analyze_);
+ }
+ }
+ }
+
+ private String[] computeDefautValues(final String[] _initValues, final boolean _isMulti, final String _sep,
+ final int _indexEntite) {
+ if (_initValues == null) { return null; }
+ if (_initValues.length == 0) { return _initValues; }
+ final StringBuffer b = new StringBuffer(_initValues[0].length());
+ final int t = _initValues.length;
+ final String[] r = new String[t];
+ StringTokenizer st;
+ // String q= kw_.getQuotedString();
+ for (int i = t - 1; i >= 0; i--) {
+ b.setLength(0);
+ st = new StringTokenizer(_initValues[i], "\n");
+ while (st.hasMoreTokens()) {
+ b.append(st.nextToken().trim());
+ }
+ if (_isMulti) {
+ final String[] rTemp = DicoEntite.Vecteur.getValues(b.toString(), _sep, false);
+ if (rTemp == null) {
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("Erreur avec la valeur par d\xE9faut") + CtuluLibString.ESPACE + b.toString(),
+ _indexEntite);
+ }
+ r[i] = DicoEntite.Vecteur.getStringValuesArray(rTemp, _sep);
+ if (r[i] == null) {
+ r[i] = CtuluLibString.EMPTY_STRING;
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("Erreur avec la valeur par d\xE9faut") + CtuluLibString.ESPACE + b.toString(),
+ _indexEntite);
+ }
+ } else {
+ r[i] = DicoKeyword.computeValue(b.toString());
+ }
+ }
+ return r;
+ }
+
+ /**
+ * A partir du nom du fichier dico trouve la version.
+ */
+ private void findNameAndVersion() {
+ final String t = dicoFile_.getName();
+ final int pointIndex = t.lastIndexOf('.');
+ final int versionLength = 4;
+ if (pointIndex > versionLength + 1) {
+ final String[] nameVersion = getNameAndVersion(t, pointIndex);
+ version_ = nameVersion[1];
+ name_ = nameVersion[0];
+ if (name_ != null && name_.length() > 2 && name_.endsWith("_")) {
+ name_ = name_.substring(0, name_.length() - 1);
+ }
+ } else {
+ version_ = DicoResource.getS("Inconnu");
+ name_ = DicoResource.getS("Inconnu");
+ }
+ }
+
+ /**
+ * Retrouve dans les champ _keys celles qui commencent par le prefixe _prefixKey (par exemples "RUBRIQUE"). Ensuite,
+ * recupere dans la table _map les valeurs pour ces champ dans l'ordre des langage (RUBRIQUE,RUBRIQUE1,...). Si
+ * _compute, les valeurs sont trait\xE9es avec la methode computeValue de DicoKeyword.
+ */
+ private String[] findValues(final String _prefixKey, final Set _keys, final Map _map, final boolean _compute) {
+ String stemp;
+ int t = 0;
+ for (final Iterator iter = _keys.iterator(); iter.hasNext();) {
+ stemp = (String) iter.next();
+ if (stemp.startsWith(_prefixKey)) {
+ t++;
+ }
+ }
+ if (t == 0) { return null; }
+ String[] noms = new String[t];
+ stemp = (String) _map.get(_prefixKey);
+ if ((stemp == null) || (stemp.trim().length() == 0)) { return null; }
+ if (_compute) {
+ noms[0] = DicoKeyword.computeValue(stemp);
+ } else {
+ noms[0] = stemp;
+ }
+ for (int j = 1; j < t; j++) {
+ if (_compute) {
+ noms[j] = DicoKeyword.computeValue((String) _map.get(_prefixKey + j));
+ } else {
+ noms[j] = (String) _map.get(_prefixKey + j);
+ }
+ }
+ if (nbLanguage_ == 0) {
+ nbLanguage_ = t;
+ } else {
+ if (t > nbLanguage_) {
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("Le mot-cl\xE9 {0} propose trop de traduction", (String) _map.get(getNomId())));
+ final String[] temp = new String[nbLanguage_];
+ System.arraycopy(noms, 0, temp, 0, nbLanguage_);
+ noms = temp;
+ } else if (t < nbLanguage_) {
+ final String copie = (t > 1) ? noms[1] : noms[0];
+ final String[] temp = new String[nbLanguage_];
+ System.arraycopy(noms, 0, temp, 0, t);
+ Arrays.fill(temp, t, nbLanguage_, copie);
+ noms = temp;
+ }
+ // t = nbLanguage_;
+ }
+ return noms;
+ }
+
+ /**
+ * @return
+ */
+ private String getNomId() {
+ return "NOM";
+ }
+
+ public DicoEntiteGenerate[] getEntites() {
+ return entites_;
+ }
+
+ public DicoKeyword getKw() {
+ return kw_;
+ }
+
+ /**
+ * @return le nom du code
+ */
+ public String getName() {
+ return name_;
+ }
+
+ /**
+ * @return l'indice du langage utilise
+ */
+ public int getNbLanguage() {
+ return nbLanguage_;
+ }
+
+ /**
+ * @return la version
+ */
+ public String getVersion() {
+ return version_;
+ }
+
+ Set knownFileName_ = null;
+
+ public static boolean isKnownFile(final String _frNom) {
+ return _frNom.startsWith("FICHIER ");
+
+ }
+
+ private void parseProprietes(final List _props, final TObjectIntHashMap _nomLigne) {
+ final int nProp = _props.size();
+ final Map[] maps = new Map[nProp];
+ _props.toArray(maps);
+ _props.clear();
+ entites_ = new DicoEntiteGenerate[nProp];
+ Map mapEncours;
+ Set keys;
+ String stemp;
+ DicoEntiteGenerate entite;
+ DicoDataTypeGenerate type;
+ for (int i = 0; i < nProp; i++) {
+ mapEncours = maps[i];
+ keys = mapEncours.keySet();
+ // recherche des noms.
+ final String[] noms = findValues(kw_.getNom(), keys, mapEncours, true);
+ if ((noms == null) || (noms.length == 0) || noms[0] == null) {
+ analyze_.addFatalError(DicoResource.getS("Noms nuls ou pas de version anglaise"));
+ return;
+ }
+ final int ligne = _nomLigne.get(noms[0]);
+ /**
+ * Type de donnee reel,entier,caractere,logique
+ */
+ type = kw_.getMatchingType((String) (mapEncours.get(kw_.getType())));
+ if (type == null) {
+ analyze_.addFatalError(DicoResource.getS("Type non reconnu"), ligne);
+ analyze_.getInfoCanal().addMessage(noms[0], ligne);
+ return;
+ }
+ // Si type chaine et represente un fichier
+ stemp = (String) mapEncours.get(kw_.getApparence());
+ if (isKnownFile(noms[0]) || ((stemp != null) && (stemp.indexOf("LISTE IS FICHIER") > 0))) {
+ if (!type.setFic(true)) {
+ analyze_.addWarn(DicoResource.getS("Le mot-cl\xE9 {0} ne peut pas \xEAtre de type fichier", noms[0]), ligne);
+ }
+ }
+ // certains choix sont editable: on recherche un champ dans apparence
+ type.setChoiceEditable((stemp != null) && (stemp.indexOf("LISTE IS EDITABLE") > 0));
+ final boolean uniqueValueInTab = (stemp != null) && stemp.indexOf("packing IS XmPACK_COLUMN") > 0;
+ // MARK: Choix
+ stemp = (String) mapEncours.get(kw_.getChoix());
+ if (stemp != null) {
+ if (!computeChoice(type, findValues(kw_.getChoix(), keys, mapEncours, false), ligne)) {
+ analyze_.addFatalError(DicoResource.getS("Erreur lors de l'analyse des choix"), ligne);
+ analyze_.getInfoCanal().addMessage(noms[0], ligne);
+ return;
+ }
+ }
+
+ // MARK: Controle
+ stemp = (String) mapEncours.get(kw_.getControle());
+ String[] arraytemp;
+ if (stemp != null) {
+ arraytemp = CtuluLibString.parseString(stemp, DicoKeyword.getChoiceSep());
+ if (arraytemp.length > 2) {
+ analyze_.addFatalError(DicoResource.getS("champ CONTROLE invalide"), ligne);
+ analyze_.getInfoCanal().addMessage(noms[0], ligne);
+ return;
+ }
+ boolean b = true;
+ if (arraytemp.length == 1) {
+ b = type.setControle(arraytemp[0]);
+ } else {
+ b = type.setControle(arraytemp[0], arraytemp[1]);
+ }
+ if (!b) {
+ analyze_.getInfoCanal().addMessage(noms[0] + " " + DicoResource.getS("CONTROLE non support\xE9"), ligne);
+ }
+ }
+ /**
+ * MARK: entite simple,tableau, vecteur
+ */
+ stemp = (String) mapEncours.get(kw_.getTaille());
+ boolean isMulti = false;
+
+ int temp = 0;
+ if (stemp != null) {
+ temp = Integer.parseInt(stemp);
+ }
+ final String compose = DicoKeyword.computeValue((String) mapEncours.get(kw_.getCompose()));
+
+ boolean isComposedVect = (compose != null) && (compose.length() > 0);
+ final String sepChar = isComposedVect ? compose : DicoKeyword.SEPARATEUR_TABLEAU;
+ // String sep=isComposedVect
+ // Correction du 7 mai 2007
+ // les mot-cl\xE9s qui ont une taille de 2 sont \xE9galement consid\xE9r\xE9s comme \xE9tant a taille variable
+ boolean isVect = (temp == 2);
+ // if(temp==2 || )
+ // si une taille est donnee et est differente de 2, c'est un tableau
+ if (temp > 0 && !isVect) {
+ final DicoEntiteGenerate.Tableau tab = new DicoEntiteGenerate.Tableau(type);
+ tab.setTaille(temp);
+ if (dicoDynamique_) {
+ tab.setDynamique(true);
+ }
+ tab.setDataColumn(uniqueValueInTab);
+ entite = tab;
+ isMulti = true;
+ // sepChar = DicoKeyword.SEPARATEUR_TABLEAU;
+ // vecteur si taille vaut 2 ou si un separateur est donne
+ } else if (isComposedVect || isVect) {
+ entite = new DicoEntiteGenerate.Vecteur(type, compose);
+ ((DicoEntiteGenerate.Vecteur) entite).setDataColumn(uniqueValueInTab);
+ isMulti = true;
+ // sepChar = compose;
+ } else {
+ entite = new DicoEntiteGenerate.Simple(type);
+ }
+ entites_[i] = entite;
+ entite.setNoms(noms);
+ // recherche des valeurs par defaut.
+ arraytemp = findValues(kw_.getDefaut(), keys, mapEncours, false);
+ arraytemp = computeDefautValues(arraytemp, isMulti, sepChar, ligne);
+ // MARK: valeurs par defaut.
+ if (arraytemp != null) {
+ boolean emptyStringCanBeDefaut = false;
+ if (type.isChoiceEnable()) {
+ String[] keysChoice = type.getKeys();
+ if (keysChoice == null) {
+ keysChoice = type.getValues()[0];
+ }
+ if (keysChoice == null) {
+ analyze_.getErrorCanal().addMessage("les choix sont nuls", ligne);
+ return;
+ }
+ for (int j = 0; j < keysChoice.length; j++) {
+ if (keysChoice[j].trim().length() == 0) {
+ emptyStringCanBeDefaut = true;
+ }
+ }
+ }
+ if ((emptyStringCanBeDefaut) || (arraytemp[0].trim().length() > 0)) {
+ entite.setDefautValues(arraytemp);
+ }
+ }
+ // recherche de l'aide.
+ arraytemp = findValues(kw_.getAide(), keys, mapEncours, true);
+ if (arraytemp == null) {
+ analyze_.getInfoCanal().addMessage(DicoResource.getS("Aide non trouv\xE9e"), ligne);
+ } else {
+ entite.setAides(arraytemp);
+ }
+ // index
+ String s = (String) mapEncours.get(kw_.getIndex());
+ if (s == null) {
+ entite.setIndex(0);
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("INDEX mis \xE0 0 pour") + CtuluLibString.ESPACE + entite.getNoms()[0], ligne);
+ } else {
+ entite.setIndex(Integer.parseInt(s));
+ }
+ s = (String) mapEncours.get(kw_.getNiveau());
+ if (s == null) {
+ entite.setNiveau(0);
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("NIVEAU mis \xE0 0 pour") + CtuluLibString.ESPACE + entite.getNoms()[0], ligne);
+ } else {
+ entite.setNiveau(Integer.parseInt(s));
+ }
+ // MARK: Comport (definition du comportement)
+ stemp = (String) mapEncours.get(kw_.getComport());
+ if ((stemp != null)) {
+ // les comports sont s\xE9par\xE9s par des du style '....';'.....'
+ // mais des ; peuvent appartenir au champ dans on parse sur les '
+ // et on vire les champs vide ou contenant les ;
+ // FRED 10/05/2007 les ; servent r\xE9ellement de s\xE9parateurs
+ arraytemp = CtuluLibString.parseString(stemp, ";");
+ if (arraytemp != null) {
+ final List validToken = new ArrayList();
+ for (int tokI = 0; tokI < arraytemp.length; tokI++) {
+ final String tk = arraytemp[tokI].trim();
+ // on evite les blancs et les ; separant les donn\xE9es
+ if (tk.length() > 1) {
+ validToken.add(tk);
+ }
+ }
+ arraytemp = new String[validToken.size()];
+ validToken.toArray(arraytemp);
+ }
+
+ final int l = arraytemp == null ? 0 : arraytemp.length;
+ // La cle represente l'affichage voulue (cela peut etre une
+ // rubrique ou un mot-cl\xE9) et la valeur represente la condition
+ // qui declenche cette affichage.
+ final List actionAffCondition = new ArrayList(5);
+ final String pref = kw_.getComportAffichageChamp();
+
+ for (int j = l - 1; j >= 0; j--) {
+ if (arraytemp != null) {
+ stemp = DicoKeyword.computeValue(arraytemp[j]);
+ } else {
+ stemp = null;
+ }
+ /*
+ * if (stemp == null) { System.err.println("ligne " + ligne); }
+ */
+ if (stemp != null && stemp.startsWith(pref)) {
+ actionAffCondition.add(stemp);
+ }
+ }
+ if (actionAffCondition.size() > 0) {
+ entiteComport_.put(entite, actionAffCondition);
+ }
+ }
+ // MARK: rubrique
+ arraytemp = findValues(kw_.getRubrique(), keys, mapEncours, false);
+ if (arraytemp == null) {
+ analyze_.getInfoCanal().addMessage(DicoResource.getS("Rubrique non trouv\xE9e"), ligne);
+ } else {
+ // int l= arraytemp.length;
+ // for (int j= 0; j < l; j++) {
+ // arraytemp[j]=
+ // kw_.computeValue(
+ // DodicoLib.parseString(arraytemp[j], kw_.getChoiceSep())[0]);
+ //
+ // }
+ entite.setRubriques(arraytemp);
+ }
+ stemp = entite.isDefautValuesValides();
+ final String app = (String) mapEncours.get(kw_.getApparence());
+
+ if (stemp != null && ((app == null) || (app.indexOf("IS REQUIRED") < 0))) {
+ analyze_.addFatalError(getQuoteString() + noms[0] + "': "
+ + DicoResource.getS("Les valeurs par d\xE9faut sont invalides"), ligne);
+ analyze_.getInfoCanal().addMessage(stemp, ligne);
+ return;
+ }
+ stemp = type.isChoicesValides();
+
+ if (stemp != null) {
+ analyze_.addFatalError(getQuoteString() + noms[0] + "': "
+ + DicoResource.getS("Les valeurs CHOIX sont invalides"), ligne);
+ analyze_.getInfoCanal().addMessage(stemp, ligne);
+ return;
+ }
+ if (entites_[i] == null) {
+ analyze_.addFatalError(getQuoteString() + noms[0] + "': " + DicoResource.getS("Donn\xE9es invalide"), ligne);
+ }
+ }
+ }
+
+ /**
+ * Stocke dans une structure interne les proprietes du fichier dico.
+ */
+ protected CtuluAnalyze read() {
+ analyze_ = new CtuluAnalyze();
+ final List props = new ArrayList(200);
+ final TObjectIntHashMap nomLigne = new TObjectIntHashMap(200);
+ try {
+ reader_ = new LineNumberReader(new FileReader(dicoFile_));
+ String line;
+ String trimLine;
+ final char commentaire = kw_.getCommentChar();
+ final char commande = kw_.getCommandChar();
+ final String nom = kw_.getNom();
+ final char eq = '=';
+ Map map = null;
+ int egalIndex = -1;
+ String currentKey = null;
+ final StringBuffer currentValue = new StringBuffer(200);
+ while ((line = reader_.readLine()) != null) {
+ trimLine = line.trim();
+ if (trimLine.length() == 0) {
+ continue;
+ }
+ if (trimLine.indexOf(commentaire) == 0) {
+ continue;
+ }
+ if (trimLine.indexOf(commande) == 0) {
+ if (kw_.getDynamique().equals(trimLine)) {
+ dicoDynamique_ = true;
+ }
+ continue;
+ }
+ egalIndex = trimLine.indexOf(eq);
+ // C'est une cle
+ if ((egalIndex > 0) && (kw_.isKey(trimLine.substring(0, egalIndex).trim()))) {
+ if (currentKey != null) {
+ // il se peut que le fichier dico soit mal decrit ( 2 fois aide) au
+ // lieu de aide et aide1
+ if (map != null && map.get(currentKey) != null) {
+ analyze_.getInfoCanal().addMessage(
+ DicoResource.getS("Le champ {0} est pr\xE9sent plusieurs fois", currentKey), reader_);
+ if (currentKey.endsWith("1")) {
+ analyze_
+ .addFatalError(DicoResource.getS("Ce type d'erreur n'est pas corrig\xE9"), reader_.getLineNumber());
+ analyze_.getInfoCanal().addMessage((String) map.get(getNomId()), reader_.getLineNumber());
+ return analyze_;
+ }
+ currentKey += "1";
+ if (map.get(currentKey) != null) {
+ analyze_.getErrorCanal().addMessage(DicoResource.getS("Ce type d'erreur n'est pas corrig\xE9"), reader_);
+ analyze_.getInfoCanal().addMessage((String) map.get(getNomId()), reader_.getLineNumber());
+ return analyze_;
+ }
+ }
+ if (map != null) {
+ map.put(currentKey, currentValue.toString().trim());
+ }
+ if (currentKey.equals(getNomId())) {
+ nomLigne.put(DicoKeyword.computeValue(currentValue.toString().trim()), reader_.getLineNumber());
+ }
+ currentValue.setLength(0);
+ }
+ currentKey = trimLine.substring(0, egalIndex).trim();
+ if (currentKey.equals(nom)) {
+ /*
+ * if (map != null) { props.add(map); }
+ */
+ map = new HashMap();
+ props.add(map);
+ }
+ if (trimLine.length() > egalIndex + 1) {
+ currentValue.append(trimLine.substring(egalIndex + 1).trim());
+ }
+ } else {
+ currentValue.append('\n').append(line);
+ }
+ }
+ } catch (final FileNotFoundException e) {
+ analyze_.getErrorCanal().addMessage(DicoResource.getS("Fichier non trouv\xE9") + ": " + dicoFile_.getAbsolutePath());
+ if (CtuluLibMessage.DEBUG) {
+ e.printStackTrace();
+ }
+ } catch (final IOException e1) {
+ analyze_.manageException(e1);
+ return analyze_;
+ } finally {
+ if (reader_ != null) {
+ try {
+ reader_.close();
+ } catch (final IOException _e) {
+ analyze_.manageException(_e);
+ }
+ }
+ }
+ if (analyze_.containsFatalError()) { return analyze_; }
+ // A partir des proprietes lues construit les entites utiles
+ // a la generation.
+ parseProprietes(props, nomLigne);
+ if (analyze_.containsFatalError() || analyze_.containsErrors()) {
+ entites_ = null;
+ return analyze_;
+ }
+ // Certains mots-cles dependent des autres : on gere cette dependance.
+ computeConditionAffichage();
+ return analyze_;
+ }
+
+ /**
+ * @return true si vide
+ */
+ public boolean isEmpty() {
+ return entites_ == null;
+ }
+
+ /**
+ * @param _kw le conteneur des identifiants utilises
+ */
+ public void setDicoKeyword(final DicoKeyword _kw) {
+ kw_ = _kw;
+ }
+
+ /**
+ * @return le comportement de certains mot-cles.
+ */
+ public Map getEntiteComportement() {
+ return entiteComport_;
+ }
+}
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormat.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormat.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormat.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,89 @@
+/**
+ * @creation 14 avr. 2003
+ * @modification $Date: 2007-06-29 15:10:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import java.io.File;
+
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+
+/**
+ * @author deniger
+ * @version $Id: DicoCasFileFormat.java,v 1.18 2007-06-29 15:10:27 deniger Exp $
+ */
+public abstract class DicoCasFileFormat extends DicoCasFileFormatAbstract {
+ /**
+ * @param _nom le nom du fichier dico lu ( telemac2d, ...\xB0
+ */
+ public DicoCasFileFormat(final String _nom) {
+ super(_nom);
+ }
+
+ /**
+ * @return le manager des dictionnaires
+ */
+ public abstract DicoManager getDicoManager();
+
+ public String getLastVersion() {
+ return getDicoManager().getLastVersion(this);
+ }
+
+ /**
+ * @param _language le langage voulu
+ * @return la version dans le langage demande
+ * @see DicoLanguage
+ */
+ public DicoCasFileFormatVersion getLastVersionImpl(final int _language) {
+ return getDicoManager().createLastVersionImpl(this, _language);
+ }
+
+ public FileFormatVersionInterface getLastVersionInstance(File _f) {
+ return getLastVersionImpl();
+ }
+
+ public FileFormatVersionInterface getLastVersionInstance() {
+ return getLastVersionImpl();
+ }
+
+ /**
+ * @return version
+ */
+ public DicoCasFileFormatVersion getLastVersionImpl() {
+ return getDicoManager().createLastVersionImpl(this, DicoLanguage.getCurrentID());
+ }
+
+ /**
+ *
+ */
+ public int getVersionNb() {
+ return getDicoManager().getVersionsNb(this);
+ }
+
+ /**
+ *
+ */
+ public String[] getVersions() {
+ return getDicoManager().getVersions(this);
+ }
+
+ /**
+ * @param _version
+ * @return la version
+ */
+ public DicoCasFileFormatVersion getVersionImpl(final String _version) {
+ return getDicoManager().createVersionImpl(this, _version);
+ }
+
+ /**
+ * @param _version
+ * @param _language
+ * @return la version
+ */
+ public DicoCasFileFormatVersion getVersionImpl(final String _version, final int _language) {
+ return getDicoManager().createVersionImpl(this, _version, _language);
+ }
+}
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,25 @@
+/**
+ * @creation 29 sept. 2003
+ * @modification $Date: 2007-07-16 13:40:26 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+* @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import org.fudaa.ctulu.fileformat.FileFormat;
+/**
+ * @author deniger
+ * @version $Id: DicoCasFileFormatAbstract.java,v 1.9 2007-07-16 13:40:26 bmarchan Exp $
+ */
+public abstract class DicoCasFileFormatAbstract extends FileFormat {
+ /**
+ * @param _nom le nom du code
+ */
+ public DicoCasFileFormatAbstract(final String _nom) {
+ super(1);
+ nom_= _nom;
+ id_= nom_.toUpperCase();
+ }
+
+}
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatDefault.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatDefault.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatDefault.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,41 @@
+/**
+ * @creation 7 janv. 2005
+ * @modification $Date: 2007-06-29 15:10:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import java.io.File;
+
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: DicoCasFileFormatDefault.java,v 1.6 2007-06-29 15:10:27 deniger Exp $
+ */
+public class DicoCasFileFormatDefault extends DicoCasFileFormatAbstract {
+
+ DicoCasFileFormatVersion version_;
+
+ /**
+ * @param _version la version a utiliser
+ */
+ public DicoCasFileFormatDefault(final DicoModelAbstract _version) {
+ super(_version.getCodeName());
+ version_ = new DicoCasFileFormatVersion(this, _version);
+ }
+
+ public String getLastVersion() {
+ return version_.getVersionName();
+ }
+
+ public FileFormatVersionInterface getLastVersionInstance() {
+ return version_;
+ }
+
+ public FileFormatVersionInterface getLastVersionInstance(File _f) {
+ return version_;
+ }
+}
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersion.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersion.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersion.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,99 @@
+/**
+ * @creation 14 ao\xFBt 2003
+ * @modification $Date: 2006-09-19 14:42:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+* @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
+import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+
+import org.fudaa.dodico.fichiers.FileFormatSoftware;
+
+/**
+ * @author deniger
+ * @version $Id: DicoCasFileFormatVersion.java,v 1.17 2006-09-19 14:42:27 deniger Exp $
+ */
+public class DicoCasFileFormatVersion extends DicoCasFileFormatVersionAbstract {
+
+ /**
+ * @param _ft le format correspondant
+ * @param _dico le model contenant tous les mot-cles
+ */
+ public DicoCasFileFormatVersion(final DicoCasFileFormatAbstract _ft, final DicoModelAbstract _dico) {
+ super(_ft, _dico);
+ }
+
+ public FileFormatSoftware getSoftVersion(){
+ final FileFormatSoftware r = new FileFormatSoftware();
+ r.system_ = "LNHE";
+ r.soft_ = getCodeName();
+ r.language_ = super.getDico().getLanguage();
+ r.version_ = getDico().getVersion();
+ return r;
+ }
+
+ /**
+ * @return le nombre de caractere max par ligne
+ */
+ public int getMaxCharPerLine(){
+ return 72;
+ }
+
+ public DicoEntite getTitreEntite(){
+ return getEntiteFor(new String[] { "TITRE", "TITLE"});
+ }
+
+ public DicoEntite getFichierPrincipalEntite(){
+ return getEntiteFor(new String[] { "FICHIER DES PARAMETRES", "STEERING FILE"});
+ }
+
+ /**
+ * @return le lecteur pour un fichier cas
+ */
+ public DicoCasReader createDicoCasReader(){
+ return new DicoCasReader(this);
+ }
+
+ /**
+ * @return un writer pour un fichier cas.
+ */
+ public DicoCasWriter createDicoCasWriter(){
+ return new DicoCasWriter(this);
+ }
+
+ /**
+ * return lecteur fichier cas.
+ */
+ public FileReadOperationAbstract createReader(){
+ return createDicoCasReader();
+ }
+
+ public FileWriteOperationAbstract createWriter(){
+ return createDicoCasWriter();
+ }
+
+ /**
+ * @param _f le fichier a ecrire
+ * @param _source l'inteface contenant les donnees
+ * @param _prog la barre de progression
+ * @return la synthese de l'operation
+ */
+ public CtuluIOOperationSynthese write(final File _f,final DicoCasInterface _source,final ProgressionInterface _prog){
+ final DicoCasWriter i = createDicoCasWriter();
+ if (i == null) {
+ return super.write(_f, _source, _prog);
+ }
+ i.setFile(_f);
+ i.setProgressReceiver(_prog);
+ final CtuluIOOperationSynthese r = i.write(_source);
+ i.setProgressReceiver(null);
+ return r;
+ }
+}
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,252 @@
+/**
+ * @creation 29 sept. 2003
+ * @modification $Date: 2007-06-28 09:25:08 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.dico;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.fileformat.FileFormatVersion;
+
+import org.fudaa.dodico.fichiers.FileFormatSoftware;
+
+/**
+ * @author deniger
+ * @version $Id: DicoCasFileFormatVersionAbstract.java,v 1.20 2007-06-28 09:25:08 deniger Exp $
+ */
+public abstract class DicoCasFileFormatVersionAbstract extends FileFormatVersion {
+
+ DicoModelAbstract dico_;
+
+ /**
+ * @param _ft le format
+ * @param _dico le modele contenant tous les mots-cles
+ */
+ public DicoCasFileFormatVersionAbstract(final FileFormat _ft, final DicoModelAbstract _dico) {
+ super(_ft, _dico.getVersion());
+ dico_ = _dico;
+ }
+
+ public abstract FileFormatSoftware getSoftVersion();
+
+ public final int getOtherLanguageIndex() {
+ return dico_.getOtherLanguageIndex();
+ }
+
+ public final int getLanguageIndex() {
+ return dico_.getLanguageIndex();
+ }
+
+ public String toString() {
+ return dico_.getCodeName() + CtuluLibString.ESPACE + dico_.getVersion();
+ }
+
+ /**
+ * @return le nom du code utilise
+ */
+ public String getCodeName() {
+ return dico_.getCodeName();
+ }
+
+ /**
+ * @return le mot-cle donne le nom du fichier cas
+ */
+ public abstract DicoEntite getFichierPrincipalEntite();
+
+ /**
+ * @return le mot-cle donnant le titre de l'etude
+ */
+ public abstract DicoEntite getTitreEntite();
+
+ /**
+ * @param _i le conteneur des mot-cl
+ * @param _l la collection a remplir avec les mots-cle requis mais non initialises.
+ */
+ public void fillListWithNotSetRequiredEntite(final DicoParamsInterface _i, final Set _l) {}
+
+ /**
+ * @return le model dico
+ */
+ public DicoModelAbstract getDico() {
+ return dico_;
+ }
+
+ /**
+ * @param _noms les noms possible (francai-anglais) du mots-cle a rechercher
+ * @return le mot-cle ayant le nom donnee dans le tableau
+ */
+ public final DicoEntite getEntiteFor(final String[] _noms) {
+ DicoEntite r = null;
+ if (_noms.length > dico_.getLanguageIndex()) {
+ r = dico_.getEntite(_noms[dico_.getLanguageIndex()]);
+ }
+ if (r != null) {
+ return r;
+ }
+ final int n = _noms.length;
+ for (int i = 0; i < n; i++) {
+ r = dico_.getEntite(_noms[i]);
+ if (r != null) {
+ return r;
+ }
+ }
+ return null;
+ }
+
+ public final DicoEntite getEntiteFor(final String _nomFr, final String _nomEn) {
+ DicoEntite r = null;
+ // on teste selon le langage
+ final int i = dico_.getLanguageIndex();
+ if (i == 0) {
+ r = dico_.getEntite(_nomFr);
+ if (r != null) {
+ return r;
+ }
+ } else if (i == 1) {
+ r = dico_.getEntite(_nomEn);
+ if (r != null) {
+ return r;
+ }
+ }
+ r = dico_.getEntite(_nomFr);
+ if (r != null) {
+ return r;
+ }
+ r = dico_.getEntite(_nomEn);
+ if (r != null) {
+ return r;
+ }
+ return r;
+ }
+
+ /**
+ * Search in the dict list, the keyword which heading is _r.
+ *
+ * @param _r la rubrique cherchee
+ * @return les mot-cles ayant comme rubrique _r
+ */
+ public DicoEntite[] getEntitesForHeading(final String _r) {
+ if (_r == null) {
+ return null;
+ }
+ final List r = new ArrayList();
+ for (final Iterator it = dico_.getList().iterator(); it.hasNext();) {
+ final DicoEntite ent = (DicoEntite) it.next();
+ if (_r.equals(ent.getRubrique())) {
+ r.add(ent);
+ }
+ }
+ return DicoParams.enTableau(r);
+ }
+
+ /**
+ * Search in the dict list, the keyword which heading is _rInLanguage in the right language.
+ *
+ * @param _rInlanguage les rubriques en francais/anglais
+ * @return les mot-cles du dico ayant comme rubrique rInLanguage
+ */
+ public DicoEntite[] getEntitesForHeading(final String[] _rInlanguage) {
+ if ((_rInlanguage == null) || (_rInlanguage.length != 2)) {
+ return null;
+ }
+ if (DicoLanguage.FRENCH_ID == dico_.getLanguageIndex()) {
+ return getEntitesForHeading(_rInlanguage[0]);
+ }
+ return getEntitesForHeading(_rInlanguage[1]);
+ }
+
+ /**
+ * Search whith the Iterator it, the keyword which heading is _r.
+ *
+ * @param _r la rubrique a considerer
+ * @param _it un iterateur sur les mot-cles
+ * @return les mot-cles ayant comme rubrique _r.
+ */
+ public DicoEntite[] getEntitesForHeading(final String _r, final Iterator _it) {
+ if (_r == null) {
+ return null;
+ }
+ final List r = new ArrayList();
+ while (_it.hasNext()) {
+ final DicoEntite ent = (DicoEntite) _it.next();
+ if (_r.equals(ent.getRubrique())) {
+ r.add(ent);
+ }
+ }
+ return DicoParams.enTableau(r);
+ }
+
+ /**
+ * Search whith the Iterator it, the keyword which heading is _rInLanguage in the right language.
+ *
+ * @param _rInlanguage le tableau contenant les donnees en francais/anglais
+ * @param _it un iterateur sur des mot-cles
+ * @return les mot-cles ayant comme rubrique rInLanguage
+ */
+ public DicoEntite[] getEntitesForHeading(final String[] _rInlanguage, final Iterator _it) {
+ if ((_rInlanguage == null) || (_rInlanguage.length != 2)) {
+ return null;
+ }
+ if (DicoLanguage.FRENCH_ID == dico_.getLanguageIndex()) {
+ return getEntitesForHeading(_rInlanguage[0], _it);
+ }
+ return getEntitesForHeading(_rInlanguage[1], _it);
+ }
+
+ /**
+ * @return le caractere identifiant un commentaire
+ */
+ public char getCommentChar() {
+ return '/';
+ }
+
+ /**
+ * @return le caractere identifiant un commentaire
+ */
+ public String getCommentString() {
+ return "/";
+ }
+
+ /**
+ * @return la chaine decrivant la fin d'un fichier cas.
+ */
+ public String getCommandStop() {
+ return "&FIN";
+ }
+
+ /**
+ * @return la chaine pour stopper le programme
+ */
+ public String getCommandStopProgram() {
+ return "&STO";
+ }
+
+ /**
+ * @return la chaine pour ecrire les mot-cles
+ */
+ public String getCommandPrintKeys() {
+ return "&LIS";
+ }
+
+ /**
+ * @return la chaine pour ecrire les mot-cles en version longue
+ */
+ public String getCommandPrintLongKeys() {
+ return "&IND";
+ }
+
+ /**
+ * @return chaine pour ecrire les valeurs des mot-cles
+ */
+ public String getCommandPrintKeysValues() {
+ return "&ETA";
+ }
+}
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasInterface.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasInterface.java (rev 0)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoCasInterface.java 2009-10-14 21:52:02 UTC (rev 5263)
@@ -0,0 +1,80 @@
+/**
+ * @creation 15 avr. 2003
+ * @modification $Date: 2006-04-07 09:23:04 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-6...
[truncated message content] |
|
From: <de...@us...> - 2009-10-15 20:27:14
|
Revision: 5301
http://fudaa.svn.sourceforge.net/fudaa/?rev=5301&view=rev
Author: deniger
Date: 2009-10-15 20:27:08 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release pom-1.0
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,10 +1,9 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/dodico-common/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-common/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,11 +1,10 @@
<?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>
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-15 20:16:16 UTC (rev 5300)
+++ trunk/framework/pom.xml 2009-10-15 20:27:08 UTC (rev 5301)
@@ -1,6 +1,5 @@
<?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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.pom</groupId>
@@ -9,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/pom-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/pom-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/pom-1.0</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-15 20:29:54
|
Revision: 5303
http://fudaa.svn.sourceforge.net/fudaa/?rev=5303&view=rev
Author: deniger
Date: 2009-10-15 20:29:47 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/dodico-common/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-common/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-15 20:28:03 UTC (rev 5302)
+++ trunk/framework/pom.xml 2009-10-15 20:29:47 UTC (rev 5303)
@@ -8,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/pom-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/pom-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/pom-1.0</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
</scm>
<modules>
<module>ctulu-fu</module>
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:03:03
|
Revision: 5309
http://fudaa.svn.sourceforge.net/fudaa/?rev=5309&view=rev
Author: deniger
Date: 2009-10-16 20:02:51 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -2,8 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/fudaa-dico/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
+ <artifactId>fudaa-fmk</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dico</groupId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 20:01:28 UTC (rev 5308)
+++ trunk/framework/pom.xml 2009-10-16 20:02:51 UTC (rev 5309)
@@ -4,11 +4,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>0.3</version>
+ <version>0.4</version>
</parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-fmk</artifactId>
+ <version>1.0-SNAPSHOT</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
@@ -348,7 +348,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <tagBase>https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags</tagBase>
+ <tagBase>https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework</tagBase>
</configuration>
</plugin>
</plugins>
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:30:49
|
Revision: 5327
http://fudaa.svn.sourceforge.net/fudaa/?rev=5327&view=rev
Author: deniger
Date: 2009-10-16 20:30:34 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-fmk-1.0
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 20:30:25 UTC (rev 5326)
+++ trunk/framework/pom.xml 2009-10-16 20:30:34 UTC (rev 5327)
@@ -8,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</url>
</scm>
<modules>
<module>ctulu-fu</module>
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:32:06
|
Revision: 5331
http://fudaa.svn.sourceforge.net/fudaa/?rev=5331&view=rev
Author: deniger
Date: 2009-10-16 20:31:56 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 20:31:44 UTC (rev 5330)
+++ trunk/framework/pom.xml 2009-10-16 20:31:56 UTC (rev 5331)
@@ -8,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-fmk</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/framework/fudaa-fmk-1.0</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-16 21:14:30
|
Revision: 5346
http://fudaa.svn.sourceforge.net/fudaa/?rev=5346&view=rev
Author: deniger
Date: 2009-10-16 21:14:23 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/pom.xml
Removed Paths:
-------------
trunk/framework/ebli-3d/test.txt
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -2,8 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Deleted: trunk/framework/ebli-3d/test.txt
===================================================================
--- trunk/framework/ebli-3d/test.txt 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-3d/test.txt 2009-10-16 21:14:23 UTC (rev 5346)
@@ -1,426 +0,0 @@
-[INFO] Scanning for projects...
-[INFO] ------------------------------------------------------------------------
-[INFO] Building ebli-3d
-[INFO] task-segment: [clean, install]
-[INFO] ------------------------------------------------------------------------
-[INFO] [clean:clean {execution: default-clean}]
-[INFO] Deleting directory C:\devel\fudaa\fudaa-fmk\ebli-3d\target
-[INFO] [resources:resources {execution: default-resources}]
-[INFO] Using 'ISO-8859-15' encoding to copy filtered resources.
-[INFO] Copying 0 resource
-[INFO] snapshot org.fudaa.framework.ebli:ebli-common:1.1-SNAPSHOT: checking for updates from NotUsed
-[WARNING] repository metadata for: 'snapshot org.fudaa.framework.ebli:ebli-common:1.1-SNAPSHOT' could not be retrieved from repository: NotUsed due to an error: Error transferring file: www.fudaa.fr
-[INFO] Repository 'NotUsed' will be blacklisted
-Downloading: http://www.fudaa.fr:80/artifactory/repo/java3d/j3d-core/1.3.1/j3d-core-1.3.1.pom
-[WARNING] Unable to get resource 'java3d:j3d-core:pom:1.3.1' from repository central (http://repo1.maven.org/maven2): Error transferring file: www.fudaa.fr
-Downloading: http://www.fudaa.fr:80/artifactory/repo/java3d/j3d-core-utils/1.3.1/j3d-core-utils-1.3.1.pom
-[WARNING] Unable to get resource 'java3d:j3d-core-utils:pom:1.3.1' from repository central (http://repo1.maven.org/maven2): Error transferring file: www.fudaa.fr
-[INFO] [compiler:compile {execution: default-compile}]
-[INFO] Compiling 22 source files to C:\devel\fudaa\fudaa-fmk\ebli-3d\target\classes
-[INFO] ------------------------------------------------------------------------
-[ERROR] BUILD FAILURE
-[INFO] ------------------------------------------------------------------------
-[INFO] Compilation failure
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[42,29] cannot find symbol
-symbol: class BVolume
-public class BGrille extends BVolume implements BGrilleAbstract, BPalettePlageTarget, BControleAffichageTarget {
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[25,36] cannot find symbol
-symbol: class BLumiere
-public class BGroupeLumiere extends BLumiere implements GroupeInterface {
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[28,35] cannot find symbol
-symbol: class BVolume
-public class BGroupeVolume extends BVolume implements GroupeInterface {
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCanvas3D.java:[109,16] cannot find symbol
-symbol : class BLumiereDirectionnelle
-location: class org.fudaa.ebli.volume.BCanvas3D
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[27,32] cannot find symbol
-symbol: class BObjet2D
-public class BCartouche extends BObjet2D {
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[17,38] package org.fudaa.ebli.volume.controles does not exist
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[25,91] package ZControleEchelle does not exist
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BEtiquette.java:[31,32] cannot find symbol
-symbol: class BVolume
-public class BEtiquette extends BVolume {
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[42,7] org.fudaa.ebli.volume.BGrille is not abstract and does not override abstract method removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener) in org.fudaa.ebli.palette.BPalettePlageTarget
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[59,11] cannot find symbol
-symbol : method getName()
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[81,11] cannot find symbol
-symbol : variable super
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[90,4] cannot find symbol
-symbol : variable super
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[112,4] cannot find symbol
-symbol : variable tg_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[209,4] cannot find symbol
-symbol : method setName(java.lang.String)
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[218,4] cannot find symbol
-symbol : variable rapide_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[219,8] cannot find symbol
-symbol : method isRapide()
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[407,11] cannot find symbol
-symbol : method getName()
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[464,4] cannot find symbol
-symbol : variable support_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[492,4] cannot find symbol
-symbol : variable tg_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[559,4] cannot find symbol
-symbol : variable tg_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGrille.java:[588,4] cannot find symbol
-symbol : variable tg_
-location: class org.fudaa.ebli.volume.BGrille
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[27,4] cannot find symbol
-symbol : method setCapability(int)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[28,4] cannot find symbol
-symbol : method setCapability(int)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[29,4] cannot find symbol
-symbol : method setCapability(int)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[30,18] cannot find symbol
-symbol : variable ALLOW_DETACH
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[53,32] cannot find symbol
-symbol : method getAllChildren()
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[56,29] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[58,17] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[59,35] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[71,26] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[72,12] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[72,32] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[77,24] cannot find symbol
-symbol : method numChildren()
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[90,4] cannot find symbol
-symbol : method removeChild(int)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[106,8] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeLumiere.java:[108,4] cannot find symbol
-symbol : variable visible_
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCanvas3D.java:[102,6] cannot find symbol
-symbol : method setName(java.lang.String)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCanvas3D.java:[103,10] cannot find symbol
-symbol : class BLumiereDirectionnelle
-location: class org.fudaa.ebli.volume.BCanvas3D
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCanvas3D.java:[115,10] cannot find symbol
-symbol : class BLumiereDirectionnelle
-location: class org.fudaa.ebli.volume.BCanvas3D
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCanvas3D.java:[115,42] cannot find symbol
-symbol : class BLumiereDirectionnelle
-location: class org.fudaa.ebli.volume.BCanvas3D
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[41,26] cannot find symbol
-symbol : variable ALLOW_DETACH
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[42,4] cannot find symbol
-symbol : variable tg_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[51,26] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[52,12] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[52,30] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[59,6] cannot find symbol
-symbol : method setBoite(org.fudaa.ebli.geometrie.GrBoite)
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[83,29] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[84,14] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[84,33] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[120,29] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[122,17] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[123,34] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[170,8] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[172,4] cannot find symbol
-symbol : variable rapide_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[183,8] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[185,4] cannot find symbol
-symbol : variable visible_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[186,8] cannot find symbol
-symbol : variable pere_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[187,44] cannot find symbol
-symbol : variable index_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeVolume.java:[187,23] cannot find symbol
-symbol : variable pere_
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[39,4] cannot find symbol
-symbol : method setRapide(boolean)
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[49,14] cannot find symbol
-symbol : method createImage(int,int)
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[51,22] cannot find symbol
-symbol : method getForeground()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[52,22] cannot find symbol
-symbol : method getBackground()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[53,23] cannot find symbol
-symbol : method getFont()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[58,25] cannot find symbol
-symbol : method getSize()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[66,10] cannot find symbol
-symbol : method isRapide()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[110,14] cannot find symbol
-symbol : method paintIcon(org.fudaa.ebli.volume.BCartouche,java.awt.Graphics,int,int)
-location: class com.memoire.bu.BuIcon
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[116,8] cannot find symbol
-symbol : method isVisible()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[116,24] cannot find symbol
-symbol : method isRapide()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[117,23] cannot find symbol
-symbol : method getX()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[118,23] cannot find symbol
-symbol : method getY()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[119,8] cannot find symbol
-symbol : method drawImage(java.awt.Image,int,int,org.fudaa.ebli.volume.BCartouche)
-location: class java.awt.Graphics
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[149,6] cannot find symbol
-symbol : method firePropertyChange(java.lang.String,com.memoire.bu.BuInformationsDocument,com.memoire.bu.BuInformationsDocument)
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[150,43] cannot find symbol
-symbol : method getFont()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[174,6] cannot find symbol
-symbol : method setSize(java.awt.Dimension)
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[175,6] cannot find symbol
-symbol : method repaint()
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCartouche.java:[183,6] cannot find symbol
-symbol : method setRapide(boolean)
-location: class org.fudaa.ebli.volume.BCartouche
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[57,23] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeStandard
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[58,10] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeStandard
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[67,22] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[73,9] cannot find symbol
-symbol : method setPere(org.fudaa.ebli.volume.BGroupeStandard)
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[77,34] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[80,7] cannot find symbol
-symbol : method setName(java.lang.String)
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[81,7] cannot find symbol
-symbol : method setPere(org.fudaa.ebli.volume.BGroupeStandard)
-location: class org.fudaa.ebli.volume.BGroupeVolume
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[83,15] cannot find symbol
-symbol : class BVolume
-location: class org.fudaa.ebli.volume.BGroupeStandard
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[91,22] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[97,9] cannot find symbol
-symbol : method setPere(org.fudaa.ebli.volume.BGroupeStandard)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[101,35] inconvertible types
-found : java.lang.Object
-required: org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[104,7] cannot find symbol
-symbol : method setName(java.lang.String)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[105,7] cannot find symbol
-symbol : method setPere(org.fudaa.ebli.volume.BGroupeStandard)
-location: class org.fudaa.ebli.volume.BGroupeLumiere
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[107,15] cannot find symbol
-symbol : class BLumiere
-location: class org.fudaa.ebli.volume.BGroupeStandard
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BGroupeStandard.java:[217,11] cannot find symbol
-symbol : variable BVolume
-location: class org.fudaa.ebli.volume.BGroupeStandard
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[61,24] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[62,26] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[62,44] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[63,26] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[63,44] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[64,26] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[64,44] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-C:\devel\fudaa\fudaa-fmk\ebli-3d\src\main\java\org\fudaa\ebli\volume\BCalqueBoite.java:[65,26] cannot find symbol
-symbol : variable boite_
-location: class org.fudaa.ebli.volume.BCalqueBoite
-
-
-[INFO] ------------------------------------------------------------------------
-[INFO] For more information, run Maven with the -e switch
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 46 seconds
-[INFO] Finished at: Fri Oct 09 19:08:31 CEST 2009
-[INFO] Final Memory: 15M/33M
-[INFO] ------------------------------------------------------------------------
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/fudaa-dico/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
+ <artifactId>fudaa-framework</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dico</groupId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 21:12:57 UTC (rev 5345)
+++ trunk/framework/pom.xml 2009-10-16 21:14:23 UTC (rev 5346)
@@ -7,8 +7,8 @@
<version>0.4</version>
</parent>
<groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-fmk</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.0-SNAPSHOT</version>
<url>http://www.fudaa.fr/site/fudaa-framework/</url>
<packaging>pom</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-16 22:28:05
|
Revision: 5349
http://fudaa.svn.sourceforge.net/fudaa/?rev=5349&view=rev
Author: deniger
Date: 2009-10-16 22:27:55 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-framework-1.0
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 21:47:16 UTC (rev 5348)
+++ trunk/framework/pom.xml 2009-10-16 22:27:55 UTC (rev 5349)
@@ -8,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-framework-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-framework-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/framework/fudaa-framework-1.0</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-16 22:29:37
|
Revision: 5351
http://fudaa.svn.sourceforge.net/fudaa/?rev=5351&view=rev
Author: deniger
Date: 2009-10-16 22:29:29 +0000 (Fri, 16 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/dodico-common/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-common/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-16 22:28:27 UTC (rev 5350)
+++ trunk/framework/pom.xml 2009-10-16 22:29:29 UTC (rev 5351)
@@ -8,16 +8,16 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<packaging>pom</packaging>
<name>Fudaa common</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-framework-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/framework/fudaa-framework-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/framework/fudaa-framework-1.0</url>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/framework</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/trunk/framework</url>
</scm>
<modules>
<module>ctulu-fu</module>
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:38:08
|
Revision: 5295
http://fudaa.svn.sourceforge.net/fudaa/?rev=5295&view=rev
Author: deniger
Date: 2009-10-15 19:37:57 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
trunk/framework/pom.xml
Added Paths:
-----------
trunk/framework/fudaa-dico/.project
trunk/framework/fudaa-dico/server/.classpath
trunk/framework/fudaa-dico/server/.project
trunk/framework/fudaa-dico/server/target/
trunk/framework/fudaa-dico/server/target/classes/
trunk/framework/fudaa-dico/server/target/classes/org/
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAbstract.java.tpl
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAnalyzer.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormat.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatDefault.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersion.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasInterface.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader$1.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasResult.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasWriter.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComponentVisitor.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComportValues.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Binaire.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Chaine.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ChoixType.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Entier.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableChaine.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableEntier.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableReel.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Reel.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Binaire.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Chaine.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$ChoixType.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Entier.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Reel.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDynamiqueGenerator.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableSimple.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableTableau.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableVecteur.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Simple.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Tableau.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Vecteur.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$ComparatorValueInterface.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Entite.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Index.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Rubrique.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$TypeDescription.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Value.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteFileState.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$ComportData.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$IndexComparator.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Simple.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Tableau.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Vecteur.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteList.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoExec.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoFactory.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator$DicoWriter.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoKeyword.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage$LanguageComboBoxModel.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager$1.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstract.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstractDyn.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$1.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$2.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$3.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$4.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeState.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateInterface.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateListener.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsInterface.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsLinkedSource.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsListener.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsPrevalid.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoResource.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoVersionManager.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/TelemacExec.class
trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/dico_en.fr_txt
trunk/framework/fudaa-dico/server/target/dico-server-1.1-SNAPSHOT-sources.jar
trunk/framework/fudaa-dico/server/target/dico-server-1.1-SNAPSHOT-tests.jar
trunk/framework/fudaa-dico/server/target/dico-server-1.1-SNAPSHOT.jar
trunk/framework/fudaa-dico/server/target/maven-archiver/
trunk/framework/fudaa-dico/server/target/maven-archiver/pom.properties
trunk/framework/fudaa-dico/server/target/test-classes/
trunk/framework/fudaa-dico/ui/.classpath
trunk/framework/fudaa-dico/ui/.project
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/dodico-common/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-common/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Added: trunk/framework/fudaa-dico/.project
===================================================================
--- trunk/framework/fudaa-dico/.project (rev 0)
+++ trunk/framework/fudaa-dico/.project 2009-10-15 19:37:57 UTC (rev 5295)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Fudaa-Curvi</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/fudaa-dico/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>pom</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dico</groupId>
<artifactId>project</artifactId>
Added: trunk/framework/fudaa-dico/server/.classpath
===================================================================
--- trunk/framework/fudaa-dico/server/.classpath (rev 0)
+++ trunk/framework/fudaa-dico/server/.classpath 2009-10-15 19:37:57 UTC (rev 5295)
@@ -0,0 +1,21 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/dodico/dodico-common/1.1-SNAPSHOT/dodico-common-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/dodico/dodico-common/1.1-SNAPSHOT/dodico-common-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-common/1.1-SNAPSHOT/ctulu-common-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-common/1.1-SNAPSHOT/ctulu-common-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-bu/1.1-SNAPSHOT/ctulu-bu-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-bu/1.1-SNAPSHOT/ctulu-bu-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-fu/1.1-SNAPSHOT/ctulu-fu-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-fu/1.1-SNAPSHOT/ctulu-fu-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jep/jep/2.4.0/jep-2.4.0.jar" sourcepath="M2_REPO/jep/jep/2.4.0/jep-2.4.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.0.4/trove-2.0.4.jar" sourcepath="M2_REPO/trove/trove/2.0.4/trove-2.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/jexcelapi/jxl/2.6.3/jxl-2.6.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/log4j-over-slf4j/1.5.8/log4j-over-slf4j-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/log4j-over-slf4j/1.5.8/log4j-over-slf4j-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/PDFRenderer/PDFRenderer/1.0/PDFRenderer-1.0.jar" sourcepath="M2_REPO/PDFRenderer/PDFRenderer/1.0/PDFRenderer-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7.jar" sourcepath="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/measure/jsr-275/0.9.1/jsr-275-0.9.1.jar" sourcepath="M2_REPO/javax/measure/jsr-275/0.9.1/jsr-275-0.9.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/db4o/db4o-java5/5.5/db4o-java5-5.5.jar" sourcepath="M2_REPO/com/db4o/db4o-java5/5.5/db4o-java5-5.5-sources.jar"/>
+</classpath>
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/.project
===================================================================
--- trunk/framework/fudaa-dico/server/.project (rev 0)
+++ trunk/framework/fudaa-dico/server/.project 2009-10-15 19:37:57 UTC (rev 5295)
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>dico-server</name>
+ <comment>La partie commune du framework fudaa</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2009-10-15 19:27:19 UTC (rev 5294)
+++ trunk/framework/fudaa-dico/server/pom.xml 2009-10-15 19:37:57 UTC (rev 5295)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.framework.dico</groupId>
<artifactId>project</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dico</groupId>
<artifactId>dico-server</artifactId>
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAbstract.java.tpl
===================================================================
--- trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAbstract.java.tpl (rev 0)
+++ trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAbstract.java.tpl 2009-10-15 19:37:57 UTC (rev 5295)
@@ -0,0 +1,51 @@
+/*
+ *File generated by fudaa
+ */
+
+package
+${getPackage}
+
+import org.fudaa.dodico.dico.*;
+/**
+ * @author deniger
+ */
+
+public class
+${getClassName}
+ extends DicoModelAbstract
+{
+ public
+${getClassName}
+ ()
+ {
+ super();
+ }
+ public
+${getClassName}
+(int _l)
+ {
+ super(_l);
+ }
+ public
+${getClassName}
+(String _l)
+ {
+ super(_l);
+ }
+ public final String getCodeName()
+ {
+${getCodeName}
+ }
+ public final String getVersion()
+ {
+${getVersion}
+ }
+ protected String[] createNoms()
+ {
+${createNoms}
+ }
+ protected final DicoEntite[] createEntites()
+ {
+${createEntites}
+ }
+}
\ No newline at end of file
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAnalyzer.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoAnalyzer.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormat.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormat.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatDefault.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatDefault.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersion.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersion.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasInterface.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasInterface.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader$1.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader$1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasReader.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasResult.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasResult.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasWriter.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoCasWriter.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComponentVisitor.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComponentVisitor.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComportValues.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoComportValues.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Binaire.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Binaire.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Chaine.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Chaine.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ChoixType.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ChoixType.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Entier.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Entier.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableChaine.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableChaine.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableEntier.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableEntier.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableReel.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$ImmutableReel.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Reel.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType$Reel.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataType.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Binaire.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Binaire.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Chaine.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Chaine.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$ChoixType.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$ChoixType.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Entier.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Entier.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Reel.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate$Reel.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDataTypeGenerate.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDynamiqueGenerator.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoDynamiqueGenerator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableSimple.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableSimple.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableTableau.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableTableau.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableVecteur.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$ImmutableVecteur.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Simple.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Simple.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Tableau.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Tableau.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Vecteur.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite$Vecteur.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$ComparatorValueInterface.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$ComparatorValueInterface.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Entite.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Entite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Index.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Index.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Rubrique.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Rubrique.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$TypeDescription.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$TypeDescription.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Value.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator$Value.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteComparator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteFileState.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteFileState.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$ComportData.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$ComportData.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$IndexComparator.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$IndexComparator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Simple.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Simple.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Tableau.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Tableau.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Vecteur.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate$Vecteur.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteGenerate.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteList.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoEntiteList.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoExec.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoExec.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoFactory.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoFactory.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator$DicoWriter.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator$DicoWriter.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoGenerator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoKeyword.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoKeyword.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage$LanguageComboBoxModel.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage$LanguageComboBoxModel.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoLanguage.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager$1.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager$1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoManager.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstract.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstract.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstractDyn.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoModelAbstractDyn.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$1.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$2.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$3.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$3.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$4.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams$4.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParams.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeState.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeState.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateInterface.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateInterface.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateListener.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsChangeStateListener.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsInterface.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsInterface.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsLinkedSource.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsLinkedSource.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsListener.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsListener.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsPrevalid.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoParamsPrevalid.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoResource.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoResource.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoVersionManager.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/DicoVersionManager.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/TelemacExec.class
===================================================================
(Binary files differ)
Property changes on: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/TelemacExec.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/dico_en.fr_txt
===================================================================
--- trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/dico_en.fr_txt (rev 0)
+++ trunk/framework/fudaa-dico/server/target/classes/org/fudaa/dodico/dico/dico_en.fr_txt 2009-10-15 19:37:57 UTC (rev 5295)
@@ -0,0 +1,84 @@
+Cl\xE9 \"{0}\" non trouv\xE9es=\"{0}\" keyword not found
+Les choix propos\xE9s ne sont pas suffisants=Proposed choices are not enough
+Erreur avec la valeur par d\xE9faut=Error while processing default value
+Le mot-cl\xE9 {0} propose trop de traduction=The keyword {0} has got too many translations
+Noms nuls ou pas de version anglaise=Names are null or english translation is missing
+Type non reconnu=Unknown type
+Le mot-cl\xE9 {0} ne peut pas \xEAtre de type fichier=The keyword {0} can't be managed as a file
+Erreur lors de l'analyse des choix=Error while processing choices
+champ CONTROLE invalide=CONTROL field is invalid
+CONTROLE non support\xE9=CONTROL not supported
+les choix sont nuls=Choices are not found
+Aide non trouv\xE9e=HELP is not found
+INDEX mis \xE0 0 pour=INDEX set to 0 for
+NIVEAU mis \xE0 0 pour=LEVEL set to 0 for
+Rubrique non trouv\xE9e=Heading not found
+Les valeurs par d\xE9faut sont invalides=Default values are invalid
+Les valeurs CHOIX sont invalides=The values CHOIX are invalid
+Le champ {0} est pr\xE9sent plusieurs fois=The {0} field must appear once time
+Ce type d'erreur n'est pas corrig\xE9=This kind of mistake can't be corrected
+fichier cas=steering file
+le mot-cl\xE9 {0} est d\xE9fini plusieurs fois=The {0} keyword is defined several times
+La valeur {0} est invalide pour le mot-cl\xE9 {1}={1} keyword : the val...
[truncated message content] |
|
From: <de...@us...> - 2009-10-22 18:42:07
|
Revision: 5415
http://fudaa.svn.sourceforge.net/fudaa/?rev=5415&view=rev
Author: deniger
Date: 2009-10-22 18:41:58 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
retour 1.0 pour fudaa-dico
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/dodico-common/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-common/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-22 18:28:45 UTC (rev 5414)
+++ trunk/framework/pom.xml 2009-10-22 18:41:58 UTC (rev 5415)
@@ -9,7 +9,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<distributionManagement>
<site>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-22 20:28:10
|
Revision: 5432
http://fudaa.svn.sourceforge.net/fudaa/?rev=5432&view=rev
Author: deniger
Date: 2009-10-22 20:27:55 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-bu/pom.xml
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-fu/pom.xml
trunk/framework/ctulu-gis/pom.xml
trunk/framework/ctulu-ui/pom.xml
trunk/framework/ctulu-video/pom.xml
trunk/framework/dodico-common/pom.xml
trunk/framework/ebli-1d/pom.xml
trunk/framework/ebli-2d/pom.xml
trunk/framework/ebli-3d/pom.xml
trunk/framework/ebli-common/pom.xml
trunk/framework/ebli-graphe/pom.xml
trunk/framework/ebli-visuallibrary/pom.xml
trunk/framework/fudaa-common/pom.xml
trunk/framework/fudaa-common-courbe/pom.xml
trunk/framework/fudaa-common-save/pom.xml
trunk/framework/fudaa-dico/pom.xml
trunk/framework/fudaa-dico/server/pom.xml
trunk/framework/fudaa-dico/ui/pom.xml
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-bu/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-bu</artifactId>
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-common/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-common</artifactId>
Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-fu/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-fu</artifactId>
Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-gis/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-gis</artifactId>
Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-ui/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-ui</artifactId>
Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ctulu-video/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ctulu</groupId>
<artifactId>ctulu-video</artifactId>
Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/dodico-common/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-1d/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-2d/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-2d</artifactId>
Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-3d/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-3d</artifactId>
Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-common/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-common</artifactId>
Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-graphe/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-visuallibrary</artifactId>
Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-common/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-courbe</artifactId>
Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-common-save/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common-save</artifactId>
Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-dico/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-dico/server/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>dico-server</artifactId>
Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2009-10-22 20:20:41 UTC (rev 5431)
+++ trunk/framework/pom.xml 2009-10-22 20:27:55 UTC (rev 5432)
@@ -9,7 +9,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<distributionManagement>
<site>
@@ -204,7 +204,7 @@
<dependency>
<groupId>PDFRenderer</groupId>
<artifactId>PDFRenderer</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-12-08 00:50:21
|
Revision: 5540
http://fudaa.svn.sourceforge.net/fudaa/?rev=5540&view=rev
Author: deniger
Date: 2009-12-08 00:50:10 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGConfigureActionPalette.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheTreeModel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGroup.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliAtomicsEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/find/CalqueFindCourbeTreeModel.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurableComposite.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/find/EbliFindDialog.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliScene.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/actions/CommandSupprimer.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDelete.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGrapheLegende.java
Removed Paths:
-------------
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManagerOLD.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2009-12-08 00:48:39 UTC (rev 5539)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2009-12-08 00:50:10 UTC (rev 5540)
@@ -764,19 +764,19 @@
return false;
}
-public boolean isTraceGrille_() {
+public boolean isTraceGrille() {
return traceGrille_;
}
-public void setTraceGrille_(boolean traceGrille_) {
+public void setTraceGrille(boolean traceGrille_) {
this.traceGrille_ = traceGrille_;
}
-public boolean isTraceSousGrille_() {
+public boolean isTraceSousGrille() {
return traceSousGrille_;
}
-public void setTraceSousGrille_(boolean traceSousGrille_) {
+public void setTraceSousGrille(boolean traceSousGrille_) {
this.traceSousGrille_ = traceSousGrille_;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java 2009-12-08 00:48:39 UTC (rev 5539)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java 2009-12-08 00:50:10 UTC (rev 5540)
@@ -1,9 +1,13 @@
/*
- * @creation 26 janv. 2005
- * @modification $Date: 2007-05-04 13:49:41 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
+ * @creation 26 janv. 2005
+ *
+ * @modification $Date: 2007-05-04 13:49:41 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail de...@fu...
*/
package org.fudaa.ebli.courbe;
@@ -18,9 +22,26 @@
import java.util.Map;
import java.util.Set;
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
-import com.memoire.bu.*;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuButtonLayout;
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuComboBox;
+import com.memoire.bu.BuGridLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuValueValidator;
+import com.memoire.bu.BuVerticalLayout;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibArray;
@@ -43,1155 +64,1055 @@
* @author Fred Deniger
* @version $Id: EGAxeRepereConfigurator.java,v 1.12 2007-05-04 13:49:41 deniger Exp $
*/
-public class EGAxeRepereConfigurator extends BuPanel implements ActionListener, BuBorders, KeyListener, BSelecteurTargetInterface{
+public class EGAxeRepereConfigurator extends BuPanel implements ActionListener, BuBorders, KeyListener,
+ BSelecteurTargetInterface {
- private final EGAxeHorizontal axeH_;
+ private final EGAxeHorizontal axeH_;
- private EGAxeVertical[] axes_;
+ private EGAxeVertical[] axes_;
- private BuCheckBox boxChooseUserLimitX_;
- private BuCheckBox boxChooserUserLimitY;
-
- private BuCheckBox cbInitialConf_;
- //private BuCheckBox cbUnblockBlockHView_;
- private BuCheckBox cbUseSameAxe_;
- private final EGGraphe graphe_;
+ private BuCheckBox boxChooseUserLimitX_;
+ private BuCheckBox boxChooserUserLimitY;
- private final BuPanel pnAxeV_;
- private final BuPanel pnAxeH_;
- private final static CtuluValueEditorI DEFAULT_EDITOR = CtuluValueEditorDefaults.DOUBLE_EDITOR;
- private CtuluValueEditorI editorH_;
- private CtuluValueEditorI editorV_;
- private JComponent tfHorMax_;
- private JComponent tfHorMin_;
-
- private BuTextField tfHorPas_;
+ private BuCheckBox cbInitialConf_;
+ // private BuCheckBox cbUnblockBlockHView_;
+ private BuCheckBox cbUseSameAxe_;
+ private final EGGraphe graphe_;
- private BuTextField tfHorSousPas_;
+ private final BuPanel pnAxeV_;
+ private final BuPanel pnAxeH_;
+ private final static CtuluValueEditorI DEFAULT_EDITOR = CtuluValueEditorDefaults.DOUBLE_EDITOR;
+ private CtuluValueEditorI editorH_;
+ private CtuluValueEditorI editorV_;
+ private JComponent tfHorMax_;
+ private JComponent tfHorMin_;
-
- private BuTextField titreAxeHorizontal_;
- private BuTextField titreAxeVertical_;
- private BuTextField uniteAxeHorizontal_;
- private BuTextField uniteAxeVertical_;
-
- BuCheckBox afficheTitreX;
- BuCheckBox afficheTitreY;
- BuCheckBox afficheUniteX;
- BuCheckBox afficheUniteY;
-
- private JComponent tfVertMax_;
- private JComponent tfVertMin_;
- private BuTextField tfVertPas_;
- private BuTextField tfVertSousPas_;
- EGObject[] targets_;
+ private BuTextField tfHorPas_;
-
- private Map mapRangesY_=null;
-
- public EGAxeRepereConfigurator(final EGGraphe _m) {
- graphe_ = _m;
- //-- on recupere les valeurs des y --//
- mapRangesY_=graphe_.restoreAllYAxe();
-
- // si pas configur\xE9 comme attendu
- if (graphe_.getTransformer().getXAxe() == null) {
- pnAxeV_ = null;
- pnAxeH_ = null;
- axeH_ = null;
- return;
- }
- axeH_ = _m.getTransformer().getXAxe();
- // initialisation des editeurs par defaut
- editorH_ = getEditorFor(axeH_);
- editorV_ = DEFAULT_EDITOR;
- setLayout(new BuVerticalLayout(5, true, true));
- // le panneau pour l'axe horizontal
- pnAxeH_ = new BuPanel();
- EGAxeRepereConfigurator.initPanel(pnAxeH_, EbliLib.getS("Axe horizontal"));
- pnAxeH_.setLayout(new BuGridLayout(2, 5, 5));
- buildHPanel(false);
- // vertical
- pnAxeV_ = new BuPanel();
- pnAxeV_.setLayout(new BuGridLayout(2, 5, 5));
- EGAxeRepereConfigurator.initPanel(pnAxeV_, EbliLib.getS("Axes verticaux"));
- buildVPanel(false);
- add(pnAxeH_);
- add(pnAxeV_);
- final BuPanel bt = new BuPanel();
- bt.setLayout(new BuButtonLayout(2, SwingConstants.RIGHT));
- final BuButton btValid = new BuButton(BuResource.BU.getString("Appliquer"));
- btValid.setToolTipText(BuResource.BU.getString("Appliquer"));
- btValid.setIcon(BuResource.BU.getIcon("appliquer"));
- btValid.setActionCommand("APPLY");
- btValid.setMnemonic(KeyEvent.VK_A);
- btValid.addActionListener(this);
+ private BuTextField tfHorSousPas_;
- add(bt);
+ private BuTextField titreAxeHorizontal_;
+ private BuTextField titreAxeVertical_;
+ private BuTextField uniteAxeHorizontal_;
+ private BuTextField uniteAxeVertical_;
- EbliActionAbstract s = new EbliActionSimple(EbliResource.EBLI.getString("Restaurer"), EbliResource.EBLI
- .getIcon("restore"), "RESTORE") {
- public void actionPerformed(ActionEvent _e) {
- //-- on reinitialise les mioin/max saisi par l'user --//
- _m.setUserXRange(null);
- _m.restore();
-
-
- updateAxeHorValue();
- }
- };
- s.putValue(Action.SHORT_DESCRIPTION, EbliResource.EBLI.getString("Restaurer la vue globale"));
- s.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
- s.putValue(EbliActionInterface.SECOND_KEYSTROKE, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
- bt.add(s.buildButton(EbliComponentFactory.INSTANCE));
- bt.add(btValid);
- setTargets(null);
- EGAxeRepereConfigurator.updateLabelWidth(this);
+ BuCheckBox afficheTitreX;
+ BuCheckBox afficheTitreY;
+ BuCheckBox afficheUniteX;
+ BuCheckBox afficheUniteY;
-
- }
+ private JComponent tfVertMax_;
+ private JComponent tfVertMin_;
+ private BuTextField tfVertPas_;
+ private BuTextField tfVertSousPas_;
+ EGObject[] targets_;
- private void buildVPanel(final boolean _removeAll) {
- if (_removeAll) {
- pnAxeV_.removeAll();
- }
-
-// setTargets(graphe_.getModel().getSelectedObjects());
-// updateAxesValue();
-
- final String minTxt = EbliLib.getS("Min:");
- final String maxTxt = EbliLib.getS("Max:");
- final String pasTxt = EbliLib.getS("Graduation:");
- final String tooltipPas = EbliLib.getS("Nombre maximal de graduations principales");
- final String tooltipTxt = "<html>"
- + EbliLib.getS("Si plusieurs axes sont s\xE9lectionn\xE9s, ce champ est vide si les valeurs ne sont pas identiques")
- + "<br>" + EbliLib.getS("Utiliser une valeur vide pour garder la valeur initiale") + "</html>";
- // les textes fields
- if (editorV_ == null) {
- tfVertMax_ = new BuLabel(EbliLib.getS("Non \xE9ditable"));
- tfVertMin_ = new BuLabel(EbliLib.getS("Non \xE9ditable"));
- } else {
- tfVertMax_ = editorV_.createEditorComponent();
- tfVertMin_ = editorV_.createEditorComponent();
- tfVertMax_.addKeyListener(this);
- tfVertMin_.addKeyListener(this);
- }
- tfVertMax_.setToolTipText(tooltipTxt);
- tfVertMin_.setToolTipText(tooltipTxt);
- if (tfVertPas_ == null) {
- tfVertPas_ = BuTextField.createDoubleField();
- tfVertPas_.setToolTipText(tooltipPas);
- tfVertPas_.setValueValidator(tfHorPas_.getValueValidator());
- tfVertPas_.setColumns(10);
- tfVertPas_.addKeyListener(this);
- }
-
- if (tfVertSousPas_ == null) {
- tfVertSousPas_ = BuTextField.createIntegerField();
- tfVertSousPas_.setToolTipText(tooltipPas);
- tfVertSousPas_.setValueValidator(BuValueValidator.INTEGER);
- tfVertSousPas_.setColumns(10);
- tfVertSousPas_.addKeyListener(this);
- }
-
-
- //-- titre axe horizontal --//
- EGAxe axeChoisi=null;
- if(graphe_.getSelectedComponent()!=null)
- axeChoisi=graphe_.getSelectedComponent().getAxeY();
-
-
-
- if(afficheTitreY==null){
- afficheTitreY=new BuCheckBox(EbliResource.EBLI.getString("Titre"));
- afficheTitreY.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- EGAxe axeChoisi=null;
- if(graphe_.getSelectedComponent()!=null)
- axeChoisi=graphe_.getSelectedComponent().getAxeY();
- axeChoisi.titreVisible_=afficheTitreY.isSelected();
- graphe_.axeUpdated();
- }
-
- });
- }
- if(axeChoisi!=null)
- afficheTitreY.setSelected(axeChoisi.titreVisible_);
- if(afficheUniteY==null){
- afficheUniteY=new BuCheckBox(EbliResource.EBLI.getString("Unit\xE9"));
- afficheUniteY.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- EGAxe axeChoisi=null;
- if(graphe_.getSelectedComponent()!=null)
- axeChoisi=graphe_.getSelectedComponent().getAxeY();
- axeChoisi.uniteVisible_=afficheUniteY.isSelected();
- graphe_.axeUpdated();
- }
-
- });
- }
- if(axeChoisi!=null)
- afficheUniteY.setSelected(axeChoisi.uniteVisible_);
- if(titreAxeVertical_==null)
- titreAxeVertical_=new BuTextField();
- if(uniteAxeVertical_==null)
- uniteAxeVertical_=new BuTextField();
- if(axeH_.titre_!=null)
- if(axeChoisi!=null)
- titreAxeVertical_.setText(axeChoisi.titre_);
- pnAxeV_.add(afficheTitreY);
- pnAxeV_.add(titreAxeVertical_);
- if(axeH_.unite_!=null)
- if(axeChoisi!=null)
- uniteAxeVertical_.setText(axeChoisi.unite_);
- pnAxeV_.add(afficheUniteY);
- pnAxeV_.add(uniteAxeVertical_);
-
-
- // vertical min
- BuLabel lb = new BuLabel(minTxt);
- lb.setToolTipText(EbliLib.getS("Borne inf\xE9rieure des axes verticaux"));
- pnAxeV_.add(lb);
- pnAxeV_.add(tfVertMin_);
- // vertical max
- lb = new BuLabel(maxTxt);
- lb.setToolTipText(EbliLib.getS("Borne sup\xE9rieure des axes verticaux"));
- pnAxeV_.add(lb);
- pnAxeV_.add(tfVertMax_);
-
- //--prendre en compte les limites max --//
- pnAxeV_.add(new BuLabel());
- if (boxChooserUserLimitY == null) {
- boxChooserUserLimitY = new BuCheckBox(EbliLib.getS("Affiche uniquement jusqu'aux limites"));
- boxChooserUserLimitY.setToolTipText(EbliLib
- .getS("Si s\xE9lectionn\xE9, les donn\xE9es de la courbe ne pourront d\xE9passer les valeurs pr\xE9c\xE9dentes"));
- }
- pnAxeV_.add(boxChooserUserLimitY);
- boxChooserUserLimitY.setSelected(true);
- boxChooserUserLimitY.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- apply();
- }
- });
-
- // vertical pas
- lb = new BuLabel(pasTxt);
- lb.setToolTipText(tooltipPas);
- //pnAxeV_.add(lb);
-
-
- //-- selection du type de graduations
- comboVertical_ = new BuComboBox(new String[] { EbliLib.getS("Manuel: Nombre de graduations"),
- EbliLib.getS("Manuel: longueur des pas"), EbliLib.getS("Automatique: Nombre de graduations"),
- EbliLib.getS("Automatique: Longueur des pas"),EbliLib.getS("Logarithmique") });
-
-
- pnAxeV_.add(comboVertical_);
- pnAxeV_.add(tfVertPas_);
-
- pnAxeV_.add(new JLabel(EbliResource.EBLI.getString("Sous graduations:")));
- pnAxeV_.add(tfVertSousPas_);
- //-- listener de la combo --//
- comboVertical_.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- modeGraduationY_=comboVertical_.getSelectedIndex();
-
- if(modeGraduationY_==EGAxe.AUTO_GRADUATIONS|| modeGraduationY_==EGAxe.AUTO_LONGUEURPAS)
- tfVertSousPas_.setEnabled(false);
- else
- tfVertSousPas_.setEnabled(true);
-
- EGAxe axeChoisi=null;
- if(graphe_.getSelectedComponent()!=null)
- axeChoisi=graphe_.getSelectedComponent().getAxeY();
- if(axeChoisi==null && axes_!=null && axes_.length>0)
- axeChoisi=axes_[0];
- if(axeChoisi!=null){
- if(axeChoisi.modeGraduations_==EGAxe.AUTO_GRADUATIONS || axeChoisi.modeGraduations_==EGAxe.MANUEL_GRADUATIONS|| axeChoisi.modeGraduations_==EGAxe.LOGARITHMIQUE)
- tfVertPas_.setText(""+axeChoisi.nbPas_);
- else
- if(axeChoisi.modeGraduations_==EGAxe.AUTO_LONGUEURPAS || axeChoisi.modeGraduations_==EGAxe.MANUEL_LONGUEURPAS)
- tfVertPas_.setText(""+axeChoisi.longueurPas_);
-
- axeChoisi.modeGraduations_=modeGraduationY_;
-
- }
- graphe_.axeUpdated();
- }
+ private Map mapRangesY_ = null;
- });
+ public EGAxeRepereConfigurator(final EGGraphe _m) {
+ graphe_ = _m;
+ // -- on recupere les valeurs des y --//
+ mapRangesY_ = graphe_.restoreAllYAxe();
-
-
- if(axeChoisi==null && axes_!=null && axes_.length>0)
- axeChoisi=axes_[0];
-
- if(axeChoisi!=null)
- if(axeChoisi.modeGraduations_==EGAxe.AUTO_GRADUATIONS || axeChoisi.modeGraduations_==EGAxe.MANUEL_GRADUATIONS || axeChoisi.modeGraduations_==EGAxe.LOGARITHMIQUE)
- tfVertPas_.setText(""+axeChoisi.nbPas_);
- else
- if(axeChoisi.modeGraduations_==EGAxe.AUTO_LONGUEURPAS || axeChoisi.modeGraduations_==EGAxe.MANUEL_LONGUEURPAS)
- tfVertPas_.setText(""+axeChoisi.longueurPas_);
-
-
- //-- affichage ou non des checkbox --//
- if(axeChoisi!=null)
- boxAfficheGraduationsY_.setSelected(axeChoisi.traceGrille_);
- boxAfficheGraduationsY_.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
+ // si pas configur\xE9 comme attendu
+ if (graphe_.getTransformer().getXAxe() == null) {
+ pnAxeV_ = null;
+ pnAxeH_ = null;
+ axeH_ = null;
+ return;
+ }
+ axeH_ = _m.getTransformer().getXAxe();
+ // initialisation des editeurs par defaut
+ editorH_ = getEditorFor(axeH_);
+ editorV_ = DEFAULT_EDITOR;
+ setLayout(new BuVerticalLayout(5, true, true));
+ // le panneau pour l'axe horizontal
+ pnAxeH_ = new BuPanel();
+ EGAxeRepereConfigurator.initPanel(pnAxeH_, EbliLib.getS("Axe horizontal"));
+ pnAxeH_.setLayout(new BuGridLayout(2, 5, 5));
+ buildHPanel(false);
+ // vertical
+ pnAxeV_ = new BuPanel();
+ pnAxeV_.setLayout(new BuGridLayout(2, 5, 5));
+ EGAxeRepereConfigurator.initPanel(pnAxeV_, EbliLib.getS("Axes verticaux"));
+ buildVPanel(false);
+ add(pnAxeH_);
+ add(pnAxeV_);
+ final BuPanel bt = new BuPanel();
+ bt.setLayout(new BuButtonLayout(2, SwingConstants.RIGHT));
+ final BuButton btValid = new BuButton(BuResource.BU.getString("Appliquer"));
+ btValid.setToolTipText(BuResource.BU.getString("Appliquer"));
+ btValid.setIcon(BuResource.BU.getIcon("appliquer"));
+ btValid.setActionCommand("APPLY");
+ btValid.setMnemonic(KeyEvent.VK_A);
+ btValid.addActionListener(this);
- apply();
- }
- });
- if(axeChoisi!=null)
- boxAfficheSousGraduationsY_.setSelected(axeChoisi.traceSousGrille_);
- boxAfficheSousGraduationsY_.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
+ add(bt);
- apply();
- }
- });
- if(axeChoisi!=null)
- modelGraduationsY_ = new BSelecteurLineModel(GRILLE_AXE_Y,axeChoisi.traceGraduations_);
- else
- modelGraduationsY_ = new BSelecteurLineModel(GRILLE_AXE_Y);
- modelGraduationsY_.setSelecteurTarget(this);
- pnAxeV_.add(boxAfficheGraduationsY_);
+ EbliActionAbstract s = new EbliActionSimple(EbliResource.EBLI.getString("Restaurer"), EbliResource.EBLI
+ .getIcon("restore"), "RESTORE") {
+ public void actionPerformed(ActionEvent _e) {
+ // -- on reinitialise les mioin/max saisi par l'user --//
+ _m.setUserXRange(null);
+ _m.restore();
+ updateAxeHorValue();
+ }
+ };
+ s.putValue(Action.SHORT_DESCRIPTION, EbliResource.EBLI.getString("Restaurer la vue globale"));
+ s.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
+ s.putValue(EbliActionInterface.SECOND_KEYSTROKE, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
+ bt.add(s.buildButton(EbliComponentFactory.INSTANCE));
+ bt.add(btValid);
+ setTargets(null);
+ EGAxeRepereConfigurator.updateLabelWidth(this);
- pnAxeV_.add(modelGraduationsY_.buildPanel());
+ }
- //-- sous graduations --//
- if(axeChoisi!=null)
- modelSousGraduationsY_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_Y,axeChoisi.traceSousGraduations_);
- else
- modelSousGraduationsY_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_Y);
-
- modelSousGraduationsY_.setSelecteurTarget(this);
- pnAxeV_.add(boxAfficheSousGraduationsY_);
- pnAxeV_.add(modelSousGraduationsY_.buildPanel());
+ private void buildVPanel(final boolean _removeAll) {
+ if (_removeAll) {
+ pnAxeV_.removeAll();
+ }
-
-
-
- // same axis
- if (cbUseSameAxe_ == null) {
- cbUseSameAxe_ = new BuCheckBox(EbliLib.getS("Utiliser le m\xEAme axe"));
- cbUseSameAxe_
- .setToolTipText(EbliLib.getS("Si s\xE9lectionn\xE9, toutes courbes s\xE9lectionn\xE9es utiliseront le m\xEAme axe"));
- // cbUseSameAxe_.addItemListener(this);
- }
- //pnAxeV_.add(new BuLabel());
- //pnAxeV_.add(cbUseSameAxe_);
- // configuration initiale
- if (cbInitialConf_ == null) {
- cbInitialConf_ = new BuCheckBox(EbliLib.getS("Axes: configuration intiale"));
- cbInitialConf_.setToolTipText(EbliLib
- .getS("Si s\xE9lectionn\xE9, la configuration initiale des axes s\xE9lectionn\xE9s sera r\xE9tablie"));
- // cbInitialConf_.addItemListener(this);
- }
- //pnAxeV_.add(new BuLabel());
- //pnAxeV_.add(cbInitialConf_);
- }
+ // setTargets(graphe_.getModel().getSelectedObjects());
+ // updateAxesValue();
+ final String minTxt = EbliLib.getS("Min:");
+ final String maxTxt = EbliLib.getS("Max:");
+ final String pasTxt = EbliLib.getS("Graduation:");
+ final String tooltipPas = EbliLib.getS("Nombre maximal de graduations principales");
+ final String tooltipTxt = "<html>"
+ + EbliLib.getS("Si plusieurs axes sont s\xE9lectionn\xE9s, ce champ est vide si les valeurs ne sont pas identiques")
+ + "<br>" + EbliLib.getS("Utiliser une valeur vide pour garder la valeur initiale") + "</html>";
+ // les textes fields
+ if (editorV_ == null) {
+ tfVertMax_ = new BuLabel(EbliLib.getS("Non \xE9ditable"));
+ tfVertMin_ = new BuLabel(EbliLib.getS("Non \xE9ditable"));
+ } else {
+ tfVertMax_ = editorV_.createEditorComponent();
+ tfVertMin_ = editorV_.createEditorComponent();
+ // tfVertMax_.addKeyListener(this);
+ // tfVertMin_.addKeyListener(this);
+ }
+ tfVertMax_.setToolTipText(tooltipTxt);
+ tfVertMin_.setToolTipText(tooltipTxt);
+ if (tfVertPas_ == null) {
+ tfVertPas_ = BuTextField.createDoubleField();
+ tfVertPas_.setToolTipText(tooltipPas);
+ tfVertPas_.setValueValidator(tfHorPas_.getValueValidator());
+ tfVertPas_.setColumns(10);
+ // tfVertPas_.addKeyListener(this);
+ }
- /**
- * 4 mode pour les graduations:
- * 0: mode manuel graduations
- * 1: mode manuel longueurs de pas
- * 2: mode automatique graduations
- * 3: mode automatique longueurs de pas
- */
- public int modeGraduationY_=EGAxe.AUTO_GRADUATIONS;
- /**
- * 4 mode pour les graduations:
- * 0: mode manuel graduations
- * 1: mode manuel longueurs de pas
- * 2: mode automatique graduations
- * 3: mode automatique longueurs de pas
- */
- public int modeGraduationX_=EGAxe.AUTO_GRADUATIONS;
+ if (tfVertSousPas_ == null) {
+ tfVertSousPas_ = BuTextField.createIntegerField();
+ tfVertSousPas_.setToolTipText(tooltipPas);
+ tfVertSousPas_.setValueValidator(BuValueValidator.INTEGER);
+ tfVertSousPas_.setColumns(10);
+ // tfVertSousPas_.addKeyListener(this);
+ }
- BSelecteurLineModel modelSousGraduationsX_;
- BSelecteurLineModel modelGraduationsX_;
- BuCheckBox boxAfficheGraduationsX_=new BuCheckBox(EbliLib.getS("Afficher la grille"));
- BuCheckBox boxAfficheSousGraduationsX_=new BuCheckBox(EbliLib.getS("Afficher la sous grille"));
+ // -- titre axe horizontal --//
+ EGAxe axeChoisi = null;
+ if (axes_ != null && axes_.length == 1) axeChoisi = axes_[0];
+ if (afficheTitreY == null) {
+ afficheTitreY = new BuCheckBox(EbliResource.EBLI.getString("Titre"));
+ // afficheTitreY.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // EGAxe axeChoisi = null;
+ // if (graphe_.getSelectedComponent() != null) axeChoisi = graphe_.getSelectedComponent().getAxeY();
+ // axeChoisi.titreVisible_ = afficheTitreY.isSelected();
+ // graphe_.axeUpdated();
+ // }
+ //
+ // });
+ }
- BSelecteurLineModel modelSousGraduationsY_;
- BSelecteurLineModel modelGraduationsY_;
- BuCheckBox boxAfficheGraduationsY_=new BuCheckBox(EbliLib.getS("Afficher la grille"));
- BuCheckBox boxAfficheSousGraduationsY_=new BuCheckBox(EbliLib.getS("Afficher la sous grille"));
+ if (axeChoisi != null) afficheTitreY.setSelected(axeChoisi.titreVisible_);
+ if (afficheUniteY == null) {
+ afficheUniteY = new BuCheckBox(EbliResource.EBLI.getString("Unit\xE9"));
+ // afficheUniteY.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // EGAxe axeChoisi = null;
+ // if (graphe_.getSelectedComponent() != null) axeChoisi = graphe_.getSelectedComponent().getAxeY();
+ // axeChoisi.uniteVisible_ = afficheUniteY.isSelected();
+ // graphe_.axeUpdated();
+ // }
+ //
+ // });
+ }
+ if (axeChoisi != null) afficheUniteY.setSelected(axeChoisi.uniteVisible_);
+ if (titreAxeVertical_ == null) titreAxeVertical_ = new BuTextField();
+ if (uniteAxeVertical_ == null) uniteAxeVertical_ = new BuTextField();
+ titreAxeVertical_.setText(CtuluLibString.EMPTY_STRING);
+ uniteAxeVertical_.setText(CtuluLibString.EMPTY_STRING);
+ if (axeH_.titre_ != null) if (axeChoisi != null) titreAxeVertical_.setText(axeChoisi.titre_);
+ pnAxeV_.add(afficheTitreY);
+ pnAxeV_.add(titreAxeVertical_);
+ if (axeH_.unite_ != null) if (axeChoisi != null) uniteAxeVertical_.setText(axeChoisi.unite_);
+ pnAxeV_.add(afficheUniteY);
+ pnAxeV_.add(uniteAxeVertical_);
-
- public static String GRILLE_AXE_X="GRILLE_AXE_X";
- public static String GRILLE_AXE_Y="GRILLE_AXE_Y";
+ // vertical min
+ BuLabel lb = new BuLabel(minTxt);
+ lb.setToolTipText(EbliLib.getS("Borne inf\xE9rieure des axes verticaux"));
+ pnAxeV_.add(lb);
+ pnAxeV_.add(tfVertMin_);
+ // vertical max
+ lb = new BuLabel(maxTxt);
+ lb.setToolTipText(EbliLib.getS("Borne sup\xE9rieure des axes verticaux"));
+ pnAxeV_.add(lb);
+ pnAxeV_.add(tfVertMax_);
- public static String SOUS_GRILLE_AXE_X="SOUS_GRILLE_AXE_X";
- public static String SOUS_GRILLE_AXE_Y="SOUS_GRILLE_AXE_Y";
+ // --prendre en compte les limites max --//
+ pnAxeV_.add(new BuLabel());
+ if (boxChooserUserLimitY == null) {
+ boxChooserUserLimitY = new BuCheckBox(EbliLib.getS("Affiche uniquement jusqu'aux limites"));
+ boxChooserUserLimitY.setToolTipText(EbliLib
+ .getS("Si s\xE9lectionn\xE9, les donn\xE9es de la courbe ne pourront d\xE9passer les valeurs pr\xE9c\xE9dentes"));
+ }
+ pnAxeV_.add(boxChooserUserLimitY);
+ boxChooserUserLimitY.setSelected(true);
+ // boxChooserUserLimitY.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // apply();
+ // }
+ // });
-
- BuComboBox comboHorizontal_=null;
- BuComboBox comboVertical_=null;
-
+ // vertical pas
+ lb = new BuLabel(pasTxt);
+ lb.setToolTipText(tooltipPas);
+ // pnAxeV_.add(lb);
- private void buildHPanel(final boolean _removeAll) {
-
- double max= graphe_.getXMax();
- double min= graphe_.getXMin();
-
- final String minTxt = EbliLib.getS("Min:")+"(>"+min+")";
- final String maxTxt = EbliLib.getS("Max:")+"(<"+max+")";
- final String pasTxtGraduation = EbliLib.getS("Nb Graduation:");
- final String pasTxtLongueur = EbliLib.getS("Longueur pas:");
- final String typePasTxt = EbliLib.getS("Type Graduation:");
- final BuLabel choixType = new BuLabel(pasTxtGraduation);
- if (_removeAll) {
- pnAxeH_.removeAll();
- }
- // tooltip commun
- final String tooltipTxt = EbliLib.getS("Utiliser une valeur vide pour garder la valeur initiale");
- final String tooltipPas = EbliLib.getS("Nombre maximal de graduations principales");
- // les text field
- tfHorMax_ = editorH_.createEditorComponent();
- tfHorMax_.setToolTipText(tooltipTxt);
- tfHorMin_ = editorH_.createEditorComponent();
- tfHorMin_.setToolTipText(tooltipTxt);
+ // -- selection du type de graduations
+ comboVertical_ = new BuComboBox(new String[] { EbliLib.getS("Manuel: Nombre de graduations"),
+ EbliLib.getS("Manuel: longueur des pas"), EbliLib.getS("Automatique: Nombre de graduations"),
+ EbliLib.getS("Automatique: Longueur des pas"), EbliLib.getS("Logarithmique") });
- if (tfHorPas_ == null) {
- tfHorPas_ = BuTextField.createDoubleField();
- tfHorPas_.setValueValidator(BuValueValidator.MIN(0));
- tfHorPas_.setColumns(10);
- tfHorPas_.setToolTipText(tooltipPas);
- tfHorPas_.addKeyListener(this);
-
- if(axeH_.modeGraduations_==EGAxe.AUTO_GRADUATIONS || modeGraduationX_==EGAxe.MANUEL_GRADUATIONS || modeGraduationX_==EGAxe.LOGARITHMIQUE)
- tfHorPas_.setText(""+axeH_.nbPas_);
- else
- if(axeH_.modeGraduations_==EGAxe.AUTO_LONGUEURPAS || modeGraduationX_==EGAxe.MANUEL_LONGUEURPAS)
- tfHorPas_.setText(""+axeH_.longueurPas_);
+ pnAxeV_.add(comboVertical_);
+ pnAxeV_.add(tfVertPas_);
- }
-
- if (tfHorSousPas_ == null) {
- tfHorSousPas_ = BuTextField.createIntegerField();
- tfHorSousPas_.setValueValidator(BuValueValidator.INTEGER);
- tfHorSousPas_.setColumns(10);
- tfHorSousPas_.setToolTipText(tooltipPas);
- tfHorSousPas_.addKeyListener(this);
-
- }
-
- tfHorMax_.addKeyListener(this);
- tfHorMin_.addKeyListener(this);
+ pnAxeV_.add(new JLabel(EbliResource.EBLI.getString("Sous graduations:")));
+ pnAxeV_.add(tfVertSousPas_);
+ // -- listener de la combo --//
+ comboVertical_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ updateModeGraduationForY();
+ // graphe_.axeUpdated();
+ }
-
- if(afficheTitreX==null){
- afficheTitreX=new BuCheckBox(EbliResource.EBLI.getString("Titre"));
- afficheTitreX.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- axeH_.titreVisible_=afficheTitreX.isSelected();
- graphe_.axeUpdated();
- }
-
- });
- }
- afficheTitreX.setSelected(axeH_.titreVisible_);
-
- if(afficheUniteX==null){
- afficheUniteX=new BuCheckBox(EbliResource.EBLI.getString("Unit\xE9"));
- afficheUniteX.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- axeH_.uniteVisible_=afficheUniteX.isSelected();
- graphe_.axeUpdated();
- }
-
- });
- }
- afficheUniteX.setSelected(axeH_.uniteVisible_);
-
- //-- titre axe horizontal --//
- if(titreAxeHorizontal_==null)
- titreAxeHorizontal_=new BuTextField();
- if(uniteAxeHorizontal_==null)
- uniteAxeHorizontal_=new BuTextField();
- if(axeH_.titre_!=null)
- titreAxeHorizontal_.setText(axeH_.titre_);
- pnAxeH_.add(afficheTitreX);
- pnAxeH_.add(titreAxeHorizontal_);
- if(axeH_.unite_!=null)
- uniteAxeHorizontal_.setText(axeH_.unite_);
- pnAxeH_.add(afficheUniteX);
- pnAxeH_.add(uniteAxeHorizontal_);
-
- // borne inf
- BuLabel lb = new BuLabel(minTxt);
- lb.setToolTipText(EbliLib.getS("Borne inf\xE9rieure de l'axe horizontal"));
- pnAxeH_.add(lb);
- pnAxeH_.add(tfHorMin_);
- // borne sup
- lb = new BuLabel(maxTxt);
- lb.setToolTipText(EbliLib.getS("Borne sup\xE9rieure de l'axe horizontal"));
- pnAxeH_.add(lb);
- pnAxeH_.add(tfHorMax_);
-
- //--prendre en compte les limites max --//
- pnAxeH_.add(new BuLabel());
- if (boxChooseUserLimitX_ == null) {
- boxChooseUserLimitX_ = new BuCheckBox(EbliLib.getS("Affiche uniquement jusqu'aux limites"));
- boxChooseUserLimitX_.setToolTipText(EbliLib
- .getS("Si s\xE9lectionn\xE9, les donn\xE9es de la courbe ne pourront d\xE9passer les valeurs pr\xE9c\xE9dentes"));
- }
- pnAxeH_.add(boxChooseUserLimitX_);
- boxChooseUserLimitX_.setSelected(true);
- boxChooseUserLimitX_.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- apply();
- }
- });
- // pas
+ });
+ updateModeGraduationForY();
+ if (axeChoisi == null && axes_ != null && axes_.length > 0) axeChoisi = axes_[0];
- //-- selection du type de graduations
- if(comboHorizontal_==null){
- comboHorizontal_= new BuComboBox(new String[] { EbliLib.getS("Manuel: Nombre de graduations"),
- EbliLib.getS("Manuel: longueur des pas"), EbliLib.getS("Automatique: Nombre de graduations"),
- EbliLib.getS("Automatique: Longueur des pas"),EbliLib.getS("Logarithmique") });
- lb = new BuLabel(typePasTxt);
- //pnAxeH_.add(lb);
- //-- listener de la combo --//
- comboHorizontal_.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- modeGraduationX_=comboHorizontal_.getSelectedIndex();
-
- if(modeGraduationX_==EGAxe.AUTO_GRADUATIONS ||modeGraduationX_==EGAxe.AUTO_LONGUEURPAS ||modeGraduationX_==EGAxe.LOGARITHMIQUE)
- tfHorSousPas_.setEnabled(false);
- else
- tfHorSousPas_.setEnabled(true);
-
- if(modeGraduationX_==EGAxe.AUTO_GRADUATIONS || modeGraduationX_==EGAxe.MANUEL_GRADUATIONS)
- tfHorPas_.setText(""+axeH_.nbPas_);
- else
- if(modeGraduationX_==EGAxe.AUTO_LONGUEURPAS || modeGraduationX_==EGAxe.MANUEL_LONGUEURPAS)
- tfHorPas_.setText(""+axeH_.longueurPas_);
- int mode=modeGraduationX_;
- axeH_.modeGraduations_=modeGraduationX_;
-
- graphe_.axeUpdated();
- }
+ if (axeChoisi != null) if (axeChoisi.modeGraduations_ == EGAxe.AUTO_GRADUATIONS
+ || axeChoisi.modeGraduations_ == EGAxe.MANUEL_GRADUATIONS || axeChoisi.modeGraduations_ == EGAxe.LOGARITHMIQUE) tfVertPas_
+ .setText("" + axeChoisi.nbPas_);
+ else if (axeChoisi.modeGraduations_ == EGAxe.AUTO_LONGUEURPAS
+ || axeChoisi.modeGraduations_ == EGAxe.MANUEL_LONGUEURPAS) tfVertPas_.setText("" + axeChoisi.longueurPas_);
- });
- }
-
- pnAxeH_.add(comboHorizontal_);
- //-- affichage ou non des checkbox --//
+ // -- affichage ou non des checkbox --//
+ if (axeChoisi != null) boxAfficheGraduationsY_.setSelected(axeChoisi.traceGrille_);
+ if (axeChoisi != null) boxAfficheSousGraduationsY_.setSelected(axeChoisi.traceSousGrille_);
+ if (axeChoisi != null) modelGraduationsY_ = new BSelecteurLineModel(GRILLE_AXE_Y, axeChoisi.traceGraduations_);
+ else modelGraduationsY_ = new BSelecteurLineModel(GRILLE_AXE_Y);
+ modelGraduationsY_.setSelecteurTarget(this);
+ pnAxeV_.add(boxAfficheGraduationsY_);
+ pnAxeV_.add(modelGraduationsY_.buildPanel());
- boxAfficheGraduationsX_.setSelected(axeH_.traceGrille_);
- boxAfficheGraduationsX_.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- modeGraduationX_=comboHorizontal_.getSelectedIndex();
- apply();
- }
- });
- boxAfficheSousGraduationsX_.setSelected(axeH_.traceSousGrille_);
- boxAfficheSousGraduationsX_.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
+ // -- sous graduations --//
+ if (axeChoisi != null) modelSousGraduationsY_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_Y,
+ axeChoisi.traceSousGraduations_);
+ else modelSousGraduationsY_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_Y);
- apply();
- }
- });
- // pnAxeH_.add(choixType);
- pnAxeH_.add(tfHorPas_);
+ // modelSousGraduationsY_.setSelecteurTarget(this);
+ pnAxeV_.add(boxAfficheSousGraduationsY_);
+ pnAxeV_.add(modelSousGraduationsY_.buildPanel());
-
- pnAxeH_.add(new JLabel(EbliResource.EBLI.getString("Sous graduations:")));
- pnAxeH_.add(tfHorSousPas_);
-
- //-- graduations --//
+ // same axis
+ if (cbUseSameAxe_ == null) {
+ cbUseSameAxe_ = new BuCheckBox(EbliLib.getS("Utiliser le m\xEAme axe"));
+ cbUseSameAxe_
+ .setToolTipText(EbliLib.getS("Si s\xE9lectionn\xE9, toutes courbes s\xE9lectionn\xE9es utiliseront le m\xEAme axe"));
+ // cbUseSameAxe_.addItemListener(this);
+ }
+ pnAxeV_.add(new BuLabel());
+ pnAxeV_.add(cbUseSameAxe_);
+ // configuration initiale
+ if (cbInitialConf_ == null) {
+ cbInitialConf_ = new BuCheckBox(EbliLib.getS("Axes: configuration intiale"));
+ cbInitialConf_.setToolTipText(EbliLib
+ .getS("Si s\xE9lectionn\xE9, la configuration initiale des axes s\xE9lectionn\xE9s sera r\xE9tablie"));
+ // cbInitialConf_.addItemListener(this);
+ }
+ pnAxeV_.add(new BuLabel());
+ pnAxeV_.add(cbInitialConf_);
+ }
- modelGraduationsX_ = new BSelecteurLineModel(GRILLE_AXE_X,axeH_.traceGraduations_);
- modelGraduationsX_.setSelecteurTarget(this);
- pnAxeH_.add(boxAfficheGraduationsX_);
+ /**
+ * 4 mode pour les graduations: 0: mode manuel graduations 1: mode manuel longueurs de pas 2: mode automatique
+ * graduations 3: mode automatique longueurs de pas
+ */
+ public int modeGraduationY_ = EGAxe.AUTO_GRADUATIONS;
+ /**
+ * 4 mode pour les graduations: 0: mode manuel graduations 1: mode manuel longueurs de pas 2: mode automatique
+ * graduations 3: mode automatique longueurs de pas
+ */
+ public int modeGraduationX_ = EGAxe.AUTO_GRADUATIONS;
- pnAxeH_.add(modelGraduationsX_.buildPanel());
+ BSelecteurLineModel modelSousGraduationsX_;
+ BSelecteurLineModel modelGraduationsX_;
+ BuCheckBox boxAfficheGraduationsX_ = new BuCheckBox(EbliLib.getS("Afficher la grille"));
+ BuCheckBox boxAfficheSousGraduationsX_ = new BuCheckBox(EbliLib.getS("Afficher la sous grille"));
- //-- sous graduations --//
- modelSousGraduationsX_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_X,axeH_.traceSousGraduations_);
- modelSousGraduationsX_.setSelecteurTarget(this);
- pnAxeH_.add(boxAfficheSousGraduationsX_);
- pnAxeH_.add(modelSousGraduationsX_.buildPanel());
+ BSelecteurLineModel modelSousGraduationsY_;
+ BSelecteurLineModel modelGraduationsY_;
+ BuCheckBox boxAfficheGraduationsY_ = new BuCheckBox(EbliLib.getS("Afficher la grille"));
+ BuCheckBox boxAfficheSousGraduationsY_ = new BuCheckBox(EbliLib.getS("Afficher la sous grille"));
+ public static String GRILLE_AXE_X = "GRILLE_AXE_X";
+ public static String GRILLE_AXE_Y = "GRILLE_AXE_Y";
+ public static String SOUS_GRILLE_AXE_X = "SOUS_GRILLE_AXE_X";
+ public static String SOUS_GRILLE_AXE_Y = "SOUS_GRILLE_AXE_Y";
+ BuComboBox comboHorizontal_ = null;
+ BuComboBox comboVertical_ = null;
-
- //pnAxeH_.add(new BuLabel());
- // d\xE9bloquer l'echelle horizontal
-// if (cbUnblockBlockHView_ == null) {
-// cbUnblockBlockHView_ = new BuCheckBox(EbliLib.getS("Ignorer les limites maximales"));
-// cbUnblockBlockHView_.setToolTipText(EbliLib
-// .getS("Si s\xE9lectionn\xE9, les limites maximales ne seront plus prises en compte"));
-// }
- //pnAxeH_.add(cbUnblockBlockHView_);
+ private void buildHPanel(final boolean _removeAll) {
- }
+ double max = graphe_.getXMax();
+ double min = graphe_.getXMin();
- private boolean applyHorizontal() {
- final String pas = tfHorPas_.getText().trim();
- final String Souspas = tfHorSousPas_.getText().trim();
-
- final boolean maxEdited = editorH_.isValueValidFromComponent(tfHorMax_) && boxChooseUserLimitX_.isSelected();
- final boolean minEdited = editorH_.isValueValidFromComponent(tfHorMin_) && boxChooseUserLimitX_.isSelected();
- boolean pasEdited = pas.length() > 0;
- if(!pasEdited)
- pasEdited=Souspas.length()>0;
-
- double maxVal = maxEdited ? Double.parseDouble(editorH_.getStringValue(tfHorMax_)) : axeH_.getMaximum();
- double minVal = minEdited ? Double.parseDouble(editorH_.getStringValue(tfHorMin_)) : axeH_.getMinimum();
- final double pasVal = pasEdited ? Double.parseDouble(pas) : 0;
- final int souspasVal = (Souspas.length()>0) ? Integer.parseInt(Souspas) : 0;
-
-
-
-
- boolean r = false;
- if(comboHorizontal_.getSelectedIndex()!=-1)
- axeH_.modeGraduations_=comboHorizontal_.getSelectedIndex();
+ final String minTxt = EbliLib.getS("Min:") + "(>" + min + ")";
+ final String maxTxt = EbliLib.getS("Max:") + "(<" + max + ")";
+ final String pasTxtGraduation = EbliLib.getS("Nb Graduation:");
+ // final String pasTxtLongueur = EbliLib.getS("Longueur pas:");
+ final String typePasTxt = EbliLib.getS("Type Graduation:");
+ // final BuLabel choixType = new BuLabel(pasTxtGraduation);
+ if (_removeAll) {
+ pnAxeH_.removeAll();
+ }
+ // tooltip commun
+ final String tooltipTxt = EbliLib.getS("Utiliser une valeur vide pour garder la valeur initiale");
+ final String tooltipPas = EbliLib.getS("Nombre maximal de graduations principales");
+ // les text field
+ tfHorMax_ = editorH_.createEditorComponent();
+ tfHorMax_.setToolTipText(tooltipTxt);
+ tfHorMin_ = editorH_.createEditorComponent();
+ tfHorMin_.setToolTipText(tooltipTxt);
- if (maxEdited || minEdited || pasEdited || !boxChooseUserLimitX_.isSelected()) {
-
- //-- si on d\xE9passe le min et max on recadre --//
- double maxValueX=graphe_.getXMax();
-// if(maxValueX<maxVal)
-// maxVal=maxValueX;
-//
- double minValueX=graphe_.getXMin();
-// if(minValueX>minVal)
-// minVal=minValueX;
-
- //-- si les limites ne sont plus selectionnes il faut de nouveau tout prendre --//
- if(!boxChooseUserLimitX_.isSelected()){
- maxVal=maxValueX;
- minVal=minValueX;
- tfHorMax_.setEnabled(false);
- tfHorMin_.setEnabled(false);
-
- }else{
- //-- on libere la saisie des min et max --//
- tfHorMax_.setEnabled(true);
- tfHorMin_.setEnabled(true);
- }
-
-
- if (pasEdited) {
- if(modeGraduationX_==EGAxe.MANUEL_GRADUATIONS || modeGraduationX_==EGAxe.AUTO_GRADUATIONS ||modeGraduationX_==EGAxe.LOGARITHMIQUE)
- r = axeH_.setBounds(minVal, maxVal, (int)pasVal,modeGraduationX_);
- else
- if(modeGraduationX_==EGAxe.MANUEL_LONGUEURPAS || modeGraduationX_==EGAxe.AUTO_LONGUEURPAS)
- r = axeH_.setBounds(minVal, maxVal,pasVal,modeGraduationX_);
- } else {
- r = axeH_.setBounds(minVal, maxVal,-1,modeGraduationX_);
- }
+ if (tfHorPas_ == null) {
+ tfHorPas_ = BuTextField.createDoubleField();
+ tfHorPas_.setValueValidator(BuValueValidator.MIN(0));
+ tfHorPas_.setColumns(10);
+ tfHorPas_.setToolTipText(tooltipPas);
+ tfHorPas_.addKeyListener(this);
- if(Souspas.length()>0){
- if(souspasVal!=axeH_.nbSousGraduations_)
- r=true;
- axeH_.nbSousGraduations_=souspasVal;
-
- }
+ if (axeH_.modeGraduations_ == EGAxe.AUTO_GRADUATIONS || modeGraduationX_ == EGAxe.MANUEL_GRADUATIONS
+ || modeGraduationX_ == EGAxe.LOGARITHMIQUE) tfHorPas_.setText("" + axeH_.nbPas_);
+ else if (axeH_.modeGraduations_ == EGAxe.AUTO_LONGUEURPAS || modeGraduationX_ == EGAxe.MANUEL_LONGUEURPAS) tfHorPas_
+ .setText("" + axeH_.longueurPas_);
- }
- TraceLigneModel model=modelGraduationsX_.getNewData();
- if(!axeH_.traceGraduations_.equals(model)){
- axeH_.traceGraduations_=model;
- r=true;
- }
- model=modelSousGraduationsX_.getNewData();
- if(!axeH_.traceSousGraduations_.equals(model)){
- axeH_.traceSousGraduations_=model;
- r=true;
- }
+ }
- if(axeH_.isTraceGrille_()!=boxAfficheGraduationsX_.isSelected()){
- axeH_.setTraceGrille_(boxAfficheGraduationsX_.isSelected());
- r=true;
- }
- if(axeH_.isTraceSousGrille_()!=boxAfficheSousGraduationsX_.isSelected()){
- axeH_.setTraceSousGrille_(boxAfficheSousGraduationsX_.isSelected());
- r=true;
- }
+ if (tfHorSousPas_ == null) {
+ tfHorSousPas_ = BuTextField.createIntegerField();
+ tfHorSousPas_.setValueValidator(BuValueValidator.INTEGER);
+ tfHorSousPas_.setColumns(10);
+ tfHorSousPas_.setToolTipText(tooltipPas);
+ tfHorSousPas_.addKeyListener(this);
+ }
- if ( (maxEdited && minEdited) || !boxChooseUserLimitX_.isSelected()) {
- final CtuluRange range = new CtuluRange();
- range.max_ = maxVal;
- range.min_ = minVal;
- graphe_.setUserXRange(range);
- r = true;
- }
-// if (cbUnblockBlockHView_.isEnabled() && cbUnblockBlockHView_.isSelected()) {
-// graphe_.setUserXRange(null);
-// r = true;
-// }
+ tfHorMax_.addKeyListener(this);
+ tfHorMin_.addKeyListener(this);
+ if (afficheTitreX == null) {
+ afficheTitreX = new BuCheckBox(EbliResource.EBLI.getString("Titre"));
+ // afficheTitreX.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // axeH_.titreVisible_ = afficheTitreX.isSelected();
+ // graphe_.axeUpdated();
+ // }
+ //
+ // });
+ }
+ afficheTitreX.setSelected(axeH_.titreVisible_);
- String titre=titreAxeHorizontal_.getText();
- if(titre!=null){
- if(axeH_.titre_!=null && !titre.equals(axeH_.titre_)){
- axeH_.titre_=titre;
- r=true;
- }
- }
- String unite=uniteAxeHorizontal_.getText();
- if(unite!=null){
- if(axeH_.unite_!=null && !unite.equals(axeH_.unite_)){
- axeH_.unite_=unite;
- r=true;
- }
- }
-
-
-
-
-
+ if (afficheUniteX == null) {
+ afficheUniteX = new BuCheckBox(EbliResource.EBLI.getString("Unit\xE9"));
+ // afficheUniteX.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // axeH_.uniteVisible_ = afficheUniteX.isSelected();
+ // graphe_.axeUpdated();
+ // }
- return r;
- }
+ // });
+ }
+ afficheUniteX.setSelected(axeH_.uniteVisible_);
- private boolean applyVertical() {
- boolean r = false;
- if (CtuluLibArray.isEmpty(axes_)) {
- return false;
- }
- double maxVal = 0;
- double minVal = 0;
- boolean minEdited = false;
- boolean maxEdited = false;
- if (editorV_ != null) {
- minEdited = editorV_.isValueValidFromComponent(tfVertMin_) && boxChooserUserLimitY.isSelected();
- if (minEdited) {
- minVal = Double.parseDouble(editorV_.getStringValue(tfVertMin_));
- }
- maxEdited = editorV_.isValueValidFromComponent(tfVertMax_) && boxChooserUserLimitY.isSelected();
- if (maxEdited) {
- maxVal = Double.parseDouble(editorV_.getStringValue(tfVertMax_));
- }
- }
- final String pas = tfVertPas_.getText().trim();
- final String Souspas = tfVertSousPas_.getText().trim();
-
- boolean pasModif = pas.length() > 0;
+ // -- titre axe horizontal --//
+ if (titreAxeHorizontal_ == null) titreAxeHorizontal_ = new BuTextField();
+ if (uniteAxeHorizontal_ == null) uniteAxeHorizontal_ = new BuTextField();
+ if (axeH_.titre_ != null) titreAxeHorizontal_.setText(axeH_.titre_);
+ pnAxeH_.add(afficheTitreX);
+ pnAxeH_.add(titreAxeHorizontal_);
+ if (axeH_.unite_ != null) uniteAxeHorizontal_.setText(axeH_.unite_);
+ pnAxeH_.add(afficheUniteX);
+ pnAxeH_.add(uniteAxeHorizontal_);
- if(!pasModif)
- pasModif=Souspas.length()>0;
-
- if (maxEdited || minEdited || pasModif) {
-
- //-- si le choix des max pas selectionn\xE9 il faut r\xE9initialiser les y
- if(!boxChooserUserLimitY.isSelected()){
- tfVertMax_.setEnabled(false);
- tfVertMin_.setEnabled(false);
- graphe_.restoreAllYAxe();
- return true;
-
- }else{
- tfVertMax_.setEnabled(true);
- tfVertMin_.setEnabled(true);
- }
-
-
- final double pasVal = pasModif ? Double.parseDouble(pas) : 0;
- for (int i = 0; i < axes_.length; i++) {
-
- if(comboVertical_.getSelectedIndex()!=-1)
- axes_[i].modeGraduations_=comboVertical_.getSelectedIndex();
-
- final int pasSousVal = (Souspas.length()>0) ? Integer.parseInt(Souspas) : 0;
-
-
-
- double min = minVal;
- double max = maxVal;
- if (!minEdited || !boxChooserUserLimitY.isSelected()) {
- min = axes_[i].getMinimum();
- }else{
-
- }
- if (!maxEdited || !boxChooserUserLimitY.isSelected()) {
- max = axes_[i].getMaximum();
- }
-
- //-- on verifie avec le max que cela ne depasse pas--//
- if(mapRangesY_!=null){
- Object value=mapRangesY_.get(axes_[i]);
- if(value!=null && value instanceof CtuluRange){
- double maxR=((CtuluRange)value).max_;
- double minR=((CtuluRange)value).min_;
-
-// if(min<minR)
-// min=minR;
-// if(max>maxR)
-// max=maxR;
-
- }
- }
-
-
- if (pasModif) {
- if(modeGraduationY_==EGAxe.MANUEL_GRADUATIONS || modeGraduationY_==EGAxe.AUTO_GRADUATIONS ||modeGraduationY_==EGAxe.LOGARITHMIQUE)
- r |= axes_[i].setBounds(min, max, (int)pasVal,modeGraduationY_);
- else
- if(modeGraduationY_==EGAxe.MANUEL_LONGUEURPAS || modeGraduationY_==EGAxe.AUTO_LONGUEURPAS)
- r |= axes_[i].setBounds(min, max,pasVal,modeGraduationY_);
- } else {
- r |= axes_[i].setBounds(min, max,-1,modeGraduationY_);
- }
-
- TraceLigneModel model=modelGraduationsY_.getNewData();
- if(!axes_[i].traceGraduations_.equals(model)){
- axes_[i].traceGraduations_=model;
- r=true;
- }
- model=modelSousGraduationsY_.getNewData();
- if(!axes_[i].traceSousGraduations_.equals(model)){
- axes_[i].traceSousGraduations_=model;
- r=true;
- }
+ // borne inf
+ BuLabel lb = new BuLabel(minTxt);
+ lb.setToolTipText(EbliLib.getS("Borne inf\xE9rieure de l'axe horizontal"));
+ pnAxeH_.add(lb);
+ pnAxeH_.add(tfHorMin_);
+ // borne sup
+ lb = new BuLabel(maxTxt);
+ lb.setToolTipText(EbliLib.getS("Borne sup\xE9rieure de l'axe horizontal"));
+ pnAxeH_.add(lb);
+ pnAxeH_.add(tfHorMax_);
- if(axes_[i].isTraceGrille_()!=boxAfficheGraduationsY_.isSelected()){
- axes_[i].setTraceGrille_(boxAfficheGraduationsY_.isSelected());
- r=true;
- }
- if(axes_[i].isTraceSousGrille_()!=boxAfficheSousGraduationsY_.isSelected()){
- axes_[i].setTraceSousGrille_(boxAfficheSousGraduationsY_.isSelected());
- r=true;
- }
+ // --prendre en compte les limites max --//
+ pnAxeH_.add(new BuLabel());
+ if (boxChooseUserLimitX_ == null) {
+ boxChooseUserLimitX_ = new BuCheckBox(EbliLib.getS("Affiche uniquement jusqu'aux limites"));
+ boxChooseUserLimitX_.setToolTipText(EbliLib
+ .getS("Si s\xE9lectionn\xE9, les donn\xE9es de la courbe ne pourront d\xE9passer les valeurs pr\xE9c\xE9dentes"));
+ }
+ pnAxeH_.add(boxChooseUserLimitX_);
+ boxChooseUserLimitX_.setSelected(true);
+ // boxChooseUserLimitX_.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // apply();
+ // }
+ // });
+ // pas
- if((Souspas.length()>0)){
- if(axes_[i].nbSousGraduations_!=pasSousVal)
- r=true;
- axes_[i].nbSousGraduations_=pasSousVal;
-
- }
-
- }
- }
- if (cbUseSameAxe_.isEnabled() && cbUseSameAxe_.isSelected()) {
- CtuluRange range = null;
- r = true;
- if (maxEdited && minEdited) {
- range = new CtuluRange();
- range.max_ = maxVal;
- range.min_ = minVal;
- }
- graphe_.useOneAxe(axes_, null, range);
- }
- if (cbInitialConf_.isEnabled() && cbInitialConf_.isSelected()) {
- if (graphe_.useVerticalAxisInitialConf(targets_)) {
- r = true;
- }
- }
-
- //-- modif des titres et unites--//
- EGAxe axeChoisi=null;
- if(graphe_.getSelectedComponent()!=null)
- axeChoisi=graphe_.getSelectedComponent().getAxeY();
- if(axeChoisi!=null){
- String titre=titreAxeVertical_.getText();
- if(titre!=null){
- if(axeChoisi.titre_!=null && !titre.equals(axeChoisi.titre_)){
- axeChoisi.titre_=titre;
- r=true;
- }
- }
- String unite=uniteAxeVertical_.getText();
- if(unite!=null){
- if(axeChoisi.unite_!=null && !unite.equals(axeChoisi.unite_)){
- axeChoisi.unite_=unite;
-
- r=true;
- }
- }
- }
- return r;
- }
+ // -- selection du type de graduations
+ if (comboHorizontal_ == null) {
+ comboHorizontal_ = new BuComboBox(new String[] { EbliLib.getS("Manuel: Nombre de graduations"),
+ EbliLib.getS("Manuel: longueur des pas"), EbliLib.getS("Automatique: Nombre de graduations"),
+ EbliLib.getS("Automatique: Longueur des pas"), EbliLib.getS("Logarithmique") });
+ lb = new BuLabel(typePasTxt);
+ // pnAxeH_.add(lb);
+ // -- listener de la combo --//
+ comboHorizontal_.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ modeGraduationX_ = comboHorizontal_.getSelectedIndex();
- private void setAxeTargets() {
- this.updateAxesValue();
- final boolean enable = axes_ != null;
- for (int i = pnAxeV_.getComponentCount() - 1; i >= 0; i--) {
- final JComponent c = (JComponent) pnAxeV_.getComponent(i);
- for (int j = c.getComponentCount() - 1; j >= 0; j--) {
- c.getComponent(j).setEnabled(enable);
- }
- }
- }
+ if (modeGraduationX_ == EGAxe.AUTO_GRADUATIONS || modeGraduationX_ == EGAxe.AUTO_LONGUEURPAS
+ || modeGraduationX_ == EGAxe.LOGARITHMIQUE) tfHorSousPas_.setEnabled(false);
+ else tfHorSousPas_.setEnabled(true);
- private CtuluValueEditorI getEditorFor(final EGAxe _a) {
- CtuluValueEditorI r = _a.getValueEditor();
- if (r == null) {
- r = DEFAULT_EDITOR;
- }
- return r;
- }
+ if (modeGraduationX_ == EGAxe.AUTO_GRADUATIONS || modeGraduationX_ == EGAxe.MANUEL_GRADUATIONS) tfHorPas_
+ .setText("" + axeH_.nbPas_);
+ else if (modeGraduationX_ == EGAxe.AUTO_LONGUEURPAS || modeGraduationX_ == EGAxe.MANUEL_LONGUEURPAS) tfHorPas_
+ .setText("" + axeH_.longueurPas_);
+ // int mode = modeGraduationX_;
+ // axeH_.modeGraduations_ = modeGraduationX_;
- private void updateAxesFromObject() {
- axes_ = null;
- final Set s = new HashSet();
- if (targets_ != null) {
- for (int i = targets_.length - 1; i >= 0; i--) {
- s.add(targets_[i].getAxeY());
- }
- }
- if (s.size() > 0) {
- axes_ = new EGAxeVertical[s.size()];
- s.toArray(axes_);
- }
- final int nb = axes_ == null ? 0 : axes_.length;
- // on cherche l'editor commun
- final CtuluValueEditorI oldEditor = editorV_;
- if (nb > 0) {
- // on initialise l'editeur avec une valeur non nulle.
- editorV_ = getEditorFor(axes_[0]);
- // si l'ancien editeur est compatible avec le nouveau on le garde
- if (oldEditor != null && oldEditor.getClass().equals(editorV_.getClass())) {
- editorV_ = oldEditor;
- }
- for (int i = 1; i < nb && editorV_ != null; i++) {
- final CtuluValueEditorI vi = getEditorFor(axes_[i]);
- if (!vi.getClass().equals(editorV_.getClass())) {
- editorV_ = null;
- }
- }
- }
- if (oldEditor != editorV_) {
- CtuluLibMessage.debug("panel V rebuilt");
- buildVPanel(true);
- revalidate();
- }
- pnAxeV_.setToolTipText(EbliLib.getS("Nombre d'axes: {0}", CtuluLibString.getString(nb)));
+ // graphe_.axeUpdated();
+ }
- }
+ });
+ }
- public void forceRebuildPanel() {
- updateAxesValue();
- editorH_ = getEditorFor(axeH_);
- buildHPanel(true);
- buildVPanel(true);
- revalidate();
- }
+ pnAxeH_.add(comboHorizontal_);
+ // -- affichage ou non des checkbox --//
- protected void apply() {
- if ((axes_ == null && axeH_ == null)) {
- return;
- }
- // un seul | pour forcer l'appel aux deux methodes
- //normal ....
- if (applyVertical() | applyHorizontal()) {
- graphe_.axeUpdated();
- }
- pnAxeH_.requestFocus();
- }
+ boxAfficheGraduationsX_.setSelected(axeH_.traceGrille_);
+ // boxAfficheGraduationsX_.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ // modeGraduationX_ = comboHorizontal_.getSelectedIndex();
+ // apply();
+ // }
+ // });
+ boxAfficheSousGraduationsX_.setSelected(axeH_.traceSousGrille_);
+ // boxAfficheSousGraduationsX_.addActionListener(new ActionListener() {
+ // public void actionPerformed(ActionEvent e) {
+ //
+ // apply();
+ // }
+ // });
+ // pnAxeH_.add(choixType);
+ pnAxeH_.add(tfHorPas_);
- void updateAxeHorValue() {
- double max=axeH_.getMaximum();
- double min=axeH_.getMinimum();
- editorH_.setValue(CtuluLib.getDouble(max), tfHorMax_);
- editorH_.setValue(CtuluLib.getDouble(min), tfHorMin_);
- if(axeH_.modeGraduations_==EGAxe.AUTO_GRADUATIONS|| axeH_.modeGraduations_==EGAxe.MANUEL_GRADUATIONS|| axeH_.modeGraduations_==EGAxe.LOGARITHMIQUE)
- tfHorPas_.setText(CtuluLibString.getString(axeH_.getNbPas()));
- else
- tfHorPas_.setText(""+axeH_.longueurPas_);
-
- tfHorSousPas_.setText(""+axeH_.nbSousGraduations_);
-
- //cbBlockHView_.setSelected(true);
-// cbUnblockBlockHView_.setSelected(false);
-// cbUnblockBlockHView_.setEnabled(graphe_.isUserXRangeSet());
-// cbBlockHView_.setEnabled(!cbUnblockBlockHView_.isEnabled());
- }
+ pnAxeH_.add(new JLabel(EbliResource.EBLI.getString("Sous graduations:")));
+ pnAxeH_.add(tfHorSousPas_);
- void updateAxesValue() {
- updateAxesFromObject();
- String min = CtuluLibString.EMPTY_STRING;
- String max = min;
- String pas = min;
- String longueurPas="";
- if (axes_ != null && axes_.length > 0) {
- boolean minIsCommon = true;
- boolean maxIsCommon = true;
- boolean pasIsCommon = true;
-
-
- final double commonMin = axes_[0].getMinimum();
- final double commonMax = axes_[0].getMaximum();
- final int commonPas = axes_[0].getNbPas();
- final double commonLongueurPas=axes_[0].longueurPas_;
- for (int i = 1; i < axes_.length && (minIsCommon || maxIsCommon || pasIsCommon); i++) {
- if (axes_[i].getMinimum() != commonMin) {
- minIsCommon = false;
- }
- if (axes_[i].getMaximum() != commonMax) {
- maxIsCommon = false;
- }
- if (axes_[i].getNbPas() != commonPas) {
- pasIsCommon = false;
- }
- if (axes_[i].getNbPas() != commonPas) {
- pasIsCommon = false;
- }
- }
- if (minIsCommon) {
- min = Double.toString(commonMin);
- }
- if (maxIsCommon) {
- max = Double.toString(commonMax);
- }
- if (pasIsCommon) {
- longueurPas=""+commonLongueurPas;
- pas = CtuluLibString.getString(commonPas);
- }
- if(axes_[0].modeGraduations_==EGAxe.AUTO_GRADUATIONS|| axes_[0].modeGraduations_==EGAxe.MANUEL_GRADUATIONS)
- tfVertPas_.setText(pas);
- else
- tfVertPas_.setText(longueurPas);
- tfVertSousPas_.setText(""+axes_[0].nbSousGraduations_);
- }
- if (editorV_ != null) {
- editorV_.setValue(max, tfVertMax_);
- editorV_.setValue(min, tfVertMin_);
- }
-
-
-
-
- updateAxeHorValue();
- cbUseSameAxe_.setEnabled(axes_ != null && axes_.length > 1);
- cbUseSameAxe_.setSelected(false);
- cbInitialConf_.setEnabled(graphe_.isVerticalAxisConfigurationMod(targets_));
- cbInitialConf_.setSelected(false);
- }
+ // -- graduations --//
- public void actionPerformed(final ActionEvent _e) {
- apply();
- }
+ modelGraduationsX_ = new BSelecteurLineModel(GRILLE_AXE_X, axeH_.traceGraduations_);
+ // modelGraduationsX_.setSelecteurTarget(this);
+ pnAxeH_.add(boxAfficheGraduationsX_);
- public void keyPressed(final KeyEvent _e) {}
+ pnAxeH_.add(modelGraduationsX_.buildPanel());
- public void keyReleased(final KeyEvent _e) {
- if (_e.getKeyCode() == KeyEvent.VK_ENTER) {
- apply();
- }
- }
+ // -- sous graduations --//
+ modelSousGraduationsX_ = new BSelecteurLineModel(SOUS_GRILLE_AXE_X, axeH_.traceSousGraduations_);
+ // modelSousGraduationsX_.setSelecteurTarget(this);
+ pnAxeH_.add(boxAfficheSousGraduationsX_);
+ pnAxeH_.add(modelSousGraduationsX_.buildPanel());
- public void keyTyped(final KeyEvent _e) {}
+ // pnAxeH_.add(new BuLabel());
+ // d\xE9bloquer l'echelle horizontal
+ // if (cbUnblockBlockHView_ == null) {
+ // cbUnblockBlockHView_ = new BuCheckBox(EbliLib.getS("Ignorer les limites maximales"));
+ // cbUnblockBlockHView_.setToolTipText(EbliLib
+ // .getS("Si s\xE9lectionn\xE9, les limites maximales ne seront plus prises en compte"));
+ // }
+ // pnAxeH_.add(cbUnblockBlockHView_);
- public final void setTargets(final EGObject[] _a) {
- targets_ = _a;
- // updateAxesFromObject();
- setAxeTargets();
- }
+ }
- protected static void initPanel(final JPanel _p, final String _title) {
- _p.setLayout(new BuGridLayout(2, 5, 5));
- _p.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(
- BorderFactory.createEtchedBorder(), _title), EMPTY2222));
- }
+ private boolean applyHorizontal() {
+ final String pas = tfHorPas_.getText().trim();
+ final String Souspas = tfHorSousPas_.getText().trim();
- /**
- * Rend les largeurs des labels homog\xE8nes.
- *
- * @param _p un panneau contenant des panneaux contenant des labels en premiere ligne
- */
- public static void updateLabelWidth(final JPanel _p) {
- fi...
[truncated message content] |
|
From: <de...@us...> - 2010-09-18 01:02:28
|
Revision: 5951
http://fudaa.svn.sourceforge.net/fudaa/?rev=5951&view=rev
Author: deniger
Date: 2010-09-18 01:02:22 +0000 (Sat, 18 Sep 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoExec.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2010-09-18 01:01:58 UTC (rev 5950)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2010-09-18 01:02:22 UTC (rev 5951)
@@ -10,13 +10,13 @@
package org.fudaa.ebli.commun;
import javax.swing.AbstractButton;
+import javax.swing.JCheckBox;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JToggleButton;
import com.memoire.bu.BuButton;
-import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuCheckBoxMenuItem;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuToggleButton;
@@ -102,9 +102,10 @@
}
public AbstractButton buildCheckBox(final EbliActionChangeState _a) {
- final AbstractButton r = new BuCheckBox();
+ final AbstractButton r = new JCheckBox();
decoreStateButton(r, _a);
decoreToolBarButton(r);
+ r.setText(_a.getTitle());
return r;
}
Modified: trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoExec.java
===================================================================
--- trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoExec.java 2010-09-18 01:01:58 UTC (rev 5950)
+++ trunk/framework/fudaa-dico/server/src/main/java/org/fudaa/dodico/dico/DicoExec.java 2010-09-18 01:02:22 UTC (rev 5951)
@@ -54,7 +54,6 @@
setLauchInNewTerm(true);
setStartCmdUse(true);
execName_ = _execName;
- // setEnv(CtuluSystemEnv.transfEnvVarForProcess(CtuluSystemEnv.getEnvVars()));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-09-24 08:55:19
|
Revision: 5953
http://fudaa.svn.sourceforge.net/fudaa/?rev=5953&view=rev
Author: deniger
Date: 2010-09-24 08:55:13 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/.classpath
trunk/framework/.directory
trunk/framework/ctulu-ui/.settings/org.maven.ide.eclipse.prefs
Property Changed:
----------------
trunk/framework/
Property changes on: trunk/framework
___________________________________________________________________
Modified: svn:ignore
- .project
target
+ .project
target
.settings
Added: trunk/framework/.classpath
===================================================================
--- trunk/framework/.classpath (rev 0)
+++ trunk/framework/.classpath 2010-09-24 08:55:13 UTC (rev 5953)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/framework/.directory
===================================================================
--- trunk/framework/.directory (rev 0)
+++ trunk/framework/.directory 2010-09-24 08:55:13 UTC (rev 5953)
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2010,5,11,11,47,19
+ViewMode=1
+
+[Settings]
+ShowDotFiles=true
Added: trunk/framework/ctulu-ui/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- trunk/framework/ctulu-ui/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ trunk/framework/ctulu-ui/.settings/org.maven.ide.eclipse.prefs 2010-09-24 08:55:13 UTC (rev 5953)
@@ -0,0 +1,9 @@
+#Fri Aug 06 17:42:00 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-09-24 21:21:16
|
Revision: 5957
http://fudaa.svn.sourceforge.net/fudaa/?rev=5957&view=rev
Author: deniger
Date: 2010-09-24 21:21:09 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/impression/EbliPageFormat.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliLookFeel.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliScene.java
trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliWidget.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -3,6 +3,7 @@
import java.awt.Color;
import java.awt.Font;
+
import org.fudaa.ctulu.CtuluRange;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphePersist.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -15,14 +15,13 @@
import java.util.List;
import java.util.Map;
-import org.fudaa.ctulu.CtuluRange;
-import org.fudaa.ebli.commun.EbliLib;
-
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.thoughtworks.xstream.persistence.FileStreamStrategy;
import com.thoughtworks.xstream.persistence.XmlArrayList;
+import org.fudaa.ebli.commun.EbliLib;
+
/**
* Classe qui se charge de rendre persistant les donn\xE9es des graphes en xml.
*
@@ -278,9 +277,12 @@
EGGraphe graphe = null;
String mainfile = getMainFilePath();
File fichierCourbes = getDirectoryCurves();
+ XStream parser = getParser();
+
+ EGGraphePersist.addEGAxeHorizontalPersistCompatibilityConfiguration(parser);
if (fichierCourbes.isDirectory()) {
// -- outputstream du xstream pour chargement des diff\xE9rents groupes--//
- ObjectInputStream in = EbliLib.createObjectInpuStream(new File(mainfile), getParser());
+ ObjectInputStream in = EbliLib.createObjectInpuStream(new File(mainfile), parser);
// --lecture biddon --//
in.readObject();
in.readObject();
@@ -383,7 +385,7 @@
ObjectInputStream in = null;
try {
// -- inputstream du xstream pour chargement des diff\xE9rents groupes--//
- in = getParser().createObjectInputStream(new FileReader(new File(getSpecifiqueDataFilePath())));
+ in = parser.createObjectInputStream(new FileReader(new File(getSpecifiqueDataFilePath())));
// -- lecture des donn\xE9es specifiques --//
Object specifiquesDatas = in.readObject();
@@ -392,17 +394,19 @@
graphe.getModel().setSpecificPersitDatas(specifiquesDatas, parameters);
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} finally {
try {
in.close();
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
return graphe;
}
+
+ public static void addEGAxeHorizontalPersistCompatibilityConfiguration(XStream parser) {
+ parser.aliasAttribute(EGAxeHorizontalPersist.class, "range", "minMax");
+ }
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/impression/EbliPageFormat.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/impression/EbliPageFormat.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/impression/EbliPageFormat.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -18,6 +18,10 @@
import java.awt.print.Paper;
import java.awt.print.PrinterJob;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.MediaSizeName;
+
import com.memoire.bu.BuInformationsDocument;
import com.memoire.bu.BuInformationsSoftware;
@@ -109,13 +113,17 @@
* Construit un format de page correspondant a une feuille A4 Portrait avec des marges de 1cm.
*/
public static final PageFormat construireFormatA4Portrait(){
- final Paper paper = new Paper();
- paper.setSize(cmVersPixel(21D), cmVersPixel(29.7));
- paper.setImageableArea(cmVersPixel(1D), cmVersPixel(1D), cmVersPixel(19D), cmVersPixel(27.7D));
- final PageFormat r = new PageFormat();
- r.setPaper(paper);
- r.setOrientation(PageFormat.PORTRAIT);
- return PrinterJob.getPrinterJob().validatePage(r);
+ PrintRequestAttributeSet set=new HashPrintRequestAttributeSet(MediaSizeName.ISO_A4);
+ PageFormat validatePage = PrinterJob.getPrinterJob().validatePage(PrinterJob.getPrinterJob().getPageFormat(set));
+ double marge=cmVersPixel(1.5);
+ Paper paper = validatePage.getPaper();
+ double x=paper.getImageableX()+marge;
+ double y=paper.getImageableY()+marge;
+ double w=validatePage.getImageableWidth()-2*marge;
+ double h=validatePage.getImageableHeight()-2*marge;
+ paper.setImageableArea(x, y, w, h);
+ validatePage.setPaper(paper);
+ return validatePage;
}
/**
@@ -476,7 +484,7 @@
p.setImageableArea(iyPF, ixPF, ihPF, iwPF);
}
r.setPaper(p);
- return r;
+ return PrinterJob.getPrinterJob().validatePage(r);
}
/**
Modified: trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliLookFeel.java
===================================================================
--- trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliLookFeel.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliLookFeel.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -26,8 +26,8 @@
private static final Border RESIZE_BORDER_SELECTED = BorderFactory.createCompositeBorder(ROUNDED_BORDER,
RESIZE_BORDER);
private static final Border RESIZE_BORDER_PROP = new ProportionnalResizeBorder(MINI_THICKNESS, COLOR_HOVERED, true);
- private static final Border RESIZE_BORDER_SELECTED_PROP = BorderFactory.createCompositeBorder(ROUNDED_BORDER,
- RESIZE_BORDER_PROP);
+// private static final Border RESIZE_BORDER_SELECTED_PROP = BorderFactory.createCompositeBorder(ROUNDED_BORDER,
+// RESIZE_BORDER_PROP);
private static final Border DEFAULT_BORDER = BorderFactory.createEmptyBorder(MINI_THICKNESS);
private static final Border NON_RESIZE_BORDER_SELECTED = BorderFactory.createCompositeBorder(ROUNDED_BORDER,
DEFAULT_BORDER);
@@ -68,4 +68,11 @@
return DEFAULT_BORDER;
}
+
+ /**
+ * @return the defaultBorder
+ */
+ public static Border getDefaultBorder() {
+ return DEFAULT_BORDER;
+ }
}
Modified: trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliScene.java
===================================================================
--- trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliScene.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliScene.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -3,6 +3,7 @@
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
@@ -17,6 +18,7 @@
import org.fudaa.ctulu.CtuluCommand;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluCommandManager;
+import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibGenerator;
import org.fudaa.ctulu.CtuluLibImage;
import org.fudaa.ctulu.CtuluUI;
@@ -27,6 +29,7 @@
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.action.WidgetAction.Chain;
import org.netbeans.api.visual.graph.GraphScene;
+import org.netbeans.api.visual.model.ObjectState;
import org.netbeans.api.visual.widget.LayerWidget;
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
@@ -115,7 +118,7 @@
final Set obj = getObjects();
for (final Iterator it = obj.iterator(); it.hasNext();) {
final EbliNode w = (EbliNode) it.next();
- if (w.getWidget()!=null && w.getWidget().getIntern().getId().equals(_id)) { return w; }
+ if (w.getWidget() != null && w.getWidget().getIntern().getId().equals(_id)) { return w; }
}
return null;
}
@@ -214,7 +217,7 @@
}
public Dimension getDefaultImageDimension() {
- final Rectangle rec = getBounds();
+ final Rectangle rec = visu_.getBounds();
final Dimension d = new Dimension();
d.height = rec.height;
d.width = rec.width;
@@ -226,7 +229,43 @@
return produceImage(d.width, d.height, _params);
}
+ private boolean isProducingImage;
+
+ public void produceImage(Graphics2D g, final int _w, final int _h, final Map _params) {
+ isProducingImage = true;
+ final Dimension d = getDefaultImageDimension();
+ CtuluLibImage.setBestQuality(g);
+ AffineTransform old=g.getTransform();
+ if (_w != d.width || _h != d.height) {
+ g.scale(CtuluLibImage.getRatio(_w, d.width), CtuluLibImage.getRatio(_h, d.height));
+ }
+ if (CtuluLibImage.mustFillBackground(_params)) {
+ g.setPaint(getBackground());
+ g.fillRect(0, 0, d.width, d.height);
+ }
+ stopEditing();
+ Set<?> selectedObjects = getSelectedObjects();
+
+ if (!CtuluLibArray.isEmpty(selectedObjects)) {
+ selectedObjects = new HashSet(selectedObjects);
+ for (Object object : selectedObjects) {
+ Widget widget = findWidget(object);
+ if(widget!=null){
+ widget.setState(ObjectState.createNormal());
+ }
+ }
+ }
+ setSelectedObjects(Collections.EMPTY_SET);
+ getView().printAll(g);
+// paint(g);
+ isProducingImage = false;
+ setSelectedObjects(selectedObjects);
+ g.setTransform(old);
+
+ }
+
public BufferedImage produceImage(final int _w, final int _h, final Map _params) {
+ isProducingImage = true;
final Dimension d = getDefaultImageDimension();
final BufferedImage i = CtuluLibImage.createImage(_w, _h, _params);
final Graphics2D g = i.createGraphics();
@@ -238,7 +277,23 @@
g.setPaint(getBackground());
g.fillRect(0, 0, d.width, d.height);
}
- paint(g);
+ stopEditing();
+ Set<?> selectedObjects = getSelectedObjects();
+
+ if (!CtuluLibArray.isEmpty(selectedObjects)) {
+ selectedObjects = new HashSet(selectedObjects);
+ for (Object object : selectedObjects) {
+ Widget widget = findWidget(object);
+ if(widget!=null){
+ widget.setState(ObjectState.createNormal());
+ }
+ }
+ }
+ setSelectedObjects(Collections.EMPTY_SET);
+ getView().printAll(g);
+// paint(g);
+ isProducingImage = false;
+ setSelectedObjects(selectedObjects);
g.dispose();
i.flush();
return i;
@@ -274,9 +329,7 @@
// -- on ne cree la widget que si necessaire
node.getCreator().create(this);
widget = node.getWidget();
- if (widget == null) {
- return null;
- }
+ if (widget == null) { return null; }
if (node.getCreator().getInitPreferredLocation() != null) {
widget.setPreferredLocation(node.getCreator().getInitPreferredLocation());
}
@@ -617,4 +670,11 @@
}
+ /**
+ * @return the isProducingImage
+ */
+ public boolean isProducingImage() {
+ return isProducingImage;
+ }
+
}
Modified: trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliWidget.java 2010-09-24 21:20:39 UTC (rev 5956)
+++ trunk/framework/ebli-visuallibrary/src/main/java/org/fudaa/ebli/visuallibrary/EbliWidget.java 2010-09-24 21:21:09 UTC (rev 5957)
@@ -514,11 +514,10 @@
@Override
public void notifyStateChanged(final ObjectState _previousState, final ObjectState _newState) {
if (!useBorder_) { return; }
+
final EbliLookFeel lookFeel = (EbliLookFeel) getScene().getLookFeel();
-
final EbliWidget parent = getGroup();
if (parent != null) {
- // System.err.println("parent not null"+ toString());
setBorder(lookFeel.getBorderInGroup(_newState));
parent.setBorder(lookFeel.getBorder(_newState, parent.getController().canResize_, parent.getController()
.isProportional()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-18 21:36:46
|
Revision: 5986
http://fudaa.svn.sourceforge.net/fudaa/?rev=5986&view=rev
Author: deniger
Date: 2010-10-18 21:36:39 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -31,6 +31,10 @@
*/
public class CtuluAnalyze {
+ public static final Level ERROR = Level.SEVERE;
+
+ public static Level FATAL = Level.ALL;
+
/**
* Constructeur par d\xE9faut
*/
@@ -133,7 +137,7 @@
* @param _m le message
*/
public void addFatalError(final String _m) {
- addError(_m);
+ addRecord(FATAL, _m);
}
/**
@@ -143,7 +147,7 @@
* @param _index le num de ligne
*/
public void addFatalError(final String _m, final int _index) {
- addErrorFromFile(_m, _index);
+ addRecord(FATAL, _m, Integer.valueOf(_index));
}
/**
@@ -151,7 +155,7 @@
* @param arg
*/
public void addFatalError(final String _m, final Object... arg) {
- addError(_m, arg);
+ addRecord(FATAL, _m, arg);
}
/**
@@ -161,7 +165,7 @@
* @param _in pour recuperer le num de ligne
*/
public void addFatalError(final String _m, final LineNumberReader _in) {
- addErrorFromFile(_m, _in);
+ addFatalError(_m, _in == null ? -1 : _in.getLineNumber());
}
/**
@@ -275,6 +279,10 @@
logs.clear();
}
+ public boolean containsErrorOrFatalError() {
+ return containsErrors() || containsFatalError();
+ }
+
/**
* @return true si contient au moins une erreur
*/
@@ -286,7 +294,7 @@
* @return true si contient une erreur fatale
*/
public boolean containsFatalError() {
- return containsErrors();
+ return containsLevel(FATAL);
}
/**
@@ -308,17 +316,6 @@
}
/**
- * @param l le level a tester
- * @return true si au moins un message et de niveau l.
- */
- private LogRecord getFirstOfLevel(final Level l) {
- for (final LogRecord log : logs) {
- if (l.equals(log.getLevel())) { return log; }
- }
- return null;
- }
-
- /**
* @return true si contient au moins un avertissement
*/
public boolean containsWarnings() {
@@ -339,11 +336,6 @@
return desc;
}
- public String getDesci18n() {
- if (defaultResourceBundle == null) return desc;
- return defaultResourceBundle.getString(desc);
- }
-
/**
* @return l'ensemble des enregistrements de log
*/
@@ -362,12 +354,24 @@
* @return le resume de l'analyse
*/
public String getResume() {
- return getDesci18n() + "\n" + CtuluDefaultLogFormatter.format(logs);
+ return getDesc() + "\n" + CtuluDefaultLogFormatter.format(logs);
}
-
- public String getWarnResume() {
- return getDesci18n() + "\n" + CtuluDefaultLogFormatter.format(filter(Level.WARNING));
+
+ public String getFatalError() {
+ LogRecord log = getFirstOfLevel(Level.SEVERE);
+ return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log);
}
+
+ /**
+ * @param l le level a tester
+ * @return true si au moins un message et de niveau l.
+ */
+ private LogRecord getFirstOfLevel(final Level l) {
+ for (final LogRecord log : logs) {
+ if (l.equals(log.getLevel())) { return log; }
+ }
+ return null;
+ }
/**
* @return true si vide
@@ -376,6 +380,10 @@
return logs.isEmpty();
}
+ public boolean isNotEmpty() {
+ return !isEmpty();
+ }
+
/**
* @param _e l'exception a ajouter a l'anayse
*/
@@ -389,7 +397,7 @@
*/
public void manageException(final Exception _e, final String msg) {
addRecord(Level.SEVERE, msg).setThrown(_e);
- // _e.printStackTrace();
+ _e.printStackTrace();
}
/**
@@ -433,26 +441,13 @@
public void manageExceptionFromFile(final Exception _e, final String msg, final int line) {
addRecord(Level.SEVERE, msg, line).setThrown(_e);
}
+
- public String getFatalError() {
- LogRecord log = getFirstOfLevel(Level.SEVERE);
- return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log);
-
+ public String getDesci18n() {
+ if (defaultResourceBundle == null) return desc;
+ return defaultResourceBundle.getString(desc);
}
- private List<LogRecord> filter(Level l) {
- List<LogRecord> res = new ArrayList<LogRecord>();
- for (LogRecord logRecord : logs) {
- if (logRecord.getLevel().equals(l)) res.add(logRecord);
- }
- return res;
- }
-
- public String getErrorResume() {
- return CtuluDefaultLogFormatter.format(filter(Level.SEVERE));
-
- }
-
/**
* Ajoute tous les canaux de l'analyse passee en parametres. Les pointeurs sont copiees.
*
@@ -460,6 +455,7 @@
*/
public void merge(final CtuluAnalyze _analyze) {
setDesc(_analyze.getDesc());
+ setDefaultResourceBundle(_analyze.getDefaultResourceBundle());
setResource(_analyze.getResource());
logs.addAll(_analyze.logs);
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -218,7 +218,8 @@
axisIterator_.initExactFromDist(getMinimum(), getMaximum(), longueurPas_, nbSousGraduations_ + 1);
} else if (modeGraduations_ == AUTO_LONGUEURPAS) {
- axisIterator_.init(getMinimum(), getMaximum(), (int) ((getMaximum() - getMinimum()) / longueurPas_));
+ int nbIteration = (int) ((getMaximum() - getMinimum()) / longueurPas_);
+ axisIterator_.init(getMinimum(), getMaximum(), nbIteration);
} else if (modeGraduations_ == AUTO_GRADUATIONS) {
axisIterator_.init(getMinimum(), getMaximum(), nbPas_);
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -111,7 +111,7 @@
for (final TickIterator it = iterator; it.hasNext(); it.next()) {
final double s = it.currentValue();
- final int ye = _t.getYEcran(it.currentValue(), this);
+ final int ye = _t.getYEcran(s, this);
if (graduations_) {
if (it.isMajorTick()) {
if (traceGrille_) {
@@ -217,7 +217,7 @@
if (droite_) {
_g2d.drawString(t, xTxt, yf - fm.getDescent());
} else {
- _g2d.drawString(t, xTxt, yf - fm.getDescent() - maxStringwidth - 8);
+ _g2d.drawString(t, xTxt, yf - fm.getDescent() - maxStringwidth - 1);
}
}
@@ -261,8 +261,7 @@
final FontMetrics fm = _g2d.getFontMetrics(this.font_);
if (graduations_ || isGridPainted()) {
// la graduation
- r += 20;
-
+ r += 4;
int maxChaine = 0;
final TickIterator iterator = buildUpToDateMainTickIterator();
for (final TickIterator it = iterator; it.hasNext(); it.next()) {
@@ -279,16 +278,16 @@
}
}
}
- r += (maxChaine + 4);
+ r += maxChaine;
}
if (isUniteVisible() || isTitreVisible()) {
if (titreVertical_) {
- r += fm.getHeight() + 1;
+ r += fm.getHeight() + 6;
} else {
final String axeTexte = getAxeTexte();
// System.err.println("HYAYHAH: axeTexte=" + axeTexte);
final int wT = fm.stringWidth(axeTexte) + 4;
- r += wT / 2;
+ r = Math.max(r, wT);
}
}
return r;
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -1,8 +1,12 @@
/*
* @creation 24 juin 2004
+ *
* @modification $Date: 2007-05-22 14:19:04 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.ebli.courbe;
@@ -41,6 +45,7 @@
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluListSelectionListener;
import org.fudaa.ctulu.CtuluSelectionInterface;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ebli.commun.*;
import org.fudaa.ebli.palette.BPaletteInfoAbstractAction;
@@ -196,18 +201,18 @@
// actionForGroup.add(act);
}
- // r.add(new EGConfigureActionPalette(vue_.graphe_.getModel()));
+ // r.add(new EGConfigureActionPalette(vue_.graphe_.getModel()));
- r.add(new EbliActionSimple(EbliLib.getS("Configuration"), BuResource.BU.getToolIcon("configurer"), "CONFIGURE"){
- public void actionPerformed(ActionEvent _e) {
- EGPaletteLegendeGraphe palette =new EGPaletteLegendeGraphe(getGraphe());
- palette.setPreferredSize(new Dimension(500,600));
- palette.afficheModale(EGFillePanel.this.getParent());
-
- }
-
+ r.add(new EbliActionSimple(EbliLib.getS("Configuration"), BuResource.BU.getToolIcon("configurer"), "CONFIGURE") {
+ public void actionPerformed(ActionEvent _e) {
+ EGPaletteLegendeGraphe palette = new EGPaletteLegendeGraphe(getGraphe());
+ palette.setPreferredSize(new Dimension(500, 600));
+ palette.afficheModale(CtuluLibSwing.getFrameAncestor(EGFillePanel.this));
+
+ }
+
});
-
+
final BPaletteInfoAbstractAction info = new BPaletteInfoAbstractAction() {
public JComponent buildContentPane() {
@@ -232,7 +237,7 @@
}
// en dernier
- if (getModel().canAddCourbe()){
+ if (getModel().canAddCourbe()) {
r.add(null);
final EbliActionSimple addAction = new EbliActionSimple(EbliLib.getS("Ajouter une courbe"), BuResource.BU
.getToolIcon("creer"), "NEW_CURVE") {
@@ -387,8 +392,8 @@
public Dimension getDefaultImageDimension() {
return vue_.getDefaultImageDimension();
}
-
- public EGVue getView(){
+
+ public EGVue getView() {
return vue_;
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -213,7 +213,7 @@
}
protected void setZoomAdaptedFor(final EGObject _g) {
- if(_g==null) return;
+ if (_g == null) return;
CtuluRange x = _g.getXRange();
final EGAxeHorizontal h = transformer_.getXAxe();
h.setBounds(x.min_, x.max_);
@@ -283,7 +283,8 @@
final Set axeSet = new HashSet();
EGAxeVertical last = null;
EGAxeVertical lastRight = null;
- for (int i = model.getNbEGObject() - 1; i >= 0; i--) {
+ int nbEGObject = model.getNbEGObject();
+ for (int i = 0; i < nbEGObject; i++) {
final EGObject o = model.getEGObject(i);
if ((getObject(i).isVisible()) && (o.isSomethingToDisplay())) {
final EGAxeVertical axe = getObject(i).getAxeY();
@@ -293,11 +294,11 @@
if (axe.isDroite()) {
m.ajouteMargesDroite(axe.getWidthNeeded(_gr));
// on recupere le dernier pour enlever la partie qui sera dessin\xE9 dans le graphe
- /* if (lastRight == null) */lastRight = axe;
+ if (lastRight == null) lastRight = axe;
} else {
m.ajouteMargesGauche(axe.getWidthNeeded(_gr));
// meme combat
- /* if (last == null) */last = axe;
+ if (last == null) last = axe;
}
temp = o.getMargeHautNeeded(_gr);
if (temp > m.getHaut()) {
@@ -880,16 +881,16 @@
}
/**
- * @return the merge axis-> the objects using the merges axis.
+ * @return the merge axis-> the objects using the merges axis.
*/
public Map<EGAxeVertical, List<EGObject>> getMergeAxis() {
Map<EGAxeVertical, List<EGObject>> res = new HashMap<EGAxeVertical, List<EGObject>>();
int nbEgObjects = getModel().getNbEGObject();
for (int i = 0; i < nbEgObjects; i++) {
EGObject egObject = getModel().getEGObject(i);
- //l'objet utilise un axe merge
+ // l'objet utilise un axe merge
if (isVerticalAxisMerged(egObject)) {
- //si oui, on enregistre l'axe
+ // si oui, on enregistre l'axe
EGAxeVertical mergeAxis = egObject.getAxeY();
List<EGObject> objects = res.get(mergeAxis);
if (objects == null) {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -308,8 +308,6 @@
updatePanelData();
// paletteConf_.setPreferredSize(new Dimension(300,300));
paletteComp.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Param\xE9trage")));
- // JScrollPane peast = new JScrollPane(paletteConf_);
- // peast.setPreferredSize(new Dimension(150, 200));
add(paletteComp, BorderLayout.CENTER);
if (selection.size() > 0) {
@@ -327,9 +325,7 @@
final BuPanel btpn = new BuPanel();
btpn.setLayout(new BuButtonLayout(1, SwingConstants.RIGHT));
- // btpn.add(btFormat_);
btpn.add(btRefresh_);
- // btpn.add(btApply_);
add(btpn, BuBorderLayout.SOUTH);
this.setPreferredSize(new Dimension(300, 300));
@@ -337,7 +333,6 @@
this.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Edition de la l\xE9gende des courbes")));
// -- initialise au premier courbe --//
-// list_.setSelectedIndex(0);
}
private EGCourbe[] getSelectedCourbes() {
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurePaletteAction.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -67,8 +67,6 @@
doAfterDisplay();
return true;
- // return ((BConfigurePalette)palette_).setPalettePanelTarget(_target == null ? null : ((BCalque)
- // _target).getConfigureComponent());
}
public BPalettePanelInterface buildPaletteContent() {
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigureSectionBuilder.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -1,8 +1,12 @@
/*
* @creation 10 nov. 06
+ *
* @modification $Date: 2007-05-04 13:49:45 $
+ *
* @license GNU General Public License 2
+ *
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
* @mail de...@fu...
*/
package org.fudaa.ebli.controle;
@@ -23,6 +27,7 @@
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
+import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -46,49 +51,31 @@
final BConfigurableInterface sect_;
public static boolean isSame(final BConfigurableInterface _i1, final BConfigurableInterface _i2) {
- if (!isSameTitle(_i1, _i2)) {
- return false;
- };
- if (!isSame(_i1.createSelecteurs(), _i2.createSelecteurs())) {
- return false;
- }
+ if (!isSameTitle(_i1, _i2)) { return false; };
+ if (!isSame(_i1.createSelecteurs(), _i2.createSelecteurs())) { return false; }
final BConfigurableInterface[] c1 = _i1.getSections();
final BConfigurableInterface[] c2 = _i2.getSections();
- if (!CtuluLibArray.isSameSize(c1, c2)) {
- return false;
- }
+ if (!CtuluLibArray.isSameSize(c1, c2)) { return false; }
if (c1 != null) {
for (int i = c1.length - 1; i >= 0; i--) {
- if (!isSame(c1[i], c2[i])) {
- return false;
- }
+ if (!isSame(c1[i], c2[i])) { return false; }
}
}
return true;
}
private static boolean isSameTitle(final BConfigurableInterface _i1, final BConfigurableInterface _i2) {
- if (_i1 == _i2) {
- return true;
- }
- if (_i1 == null || _i2 == null) {
- return false;
- }
+ if (_i1 == _i2) { return true; }
+ if (_i1 == null || _i2 == null) { return false; }
return CtuluLib.isEquals(_i1.getTitle(), _i2.getTitle());
}
private static boolean isSameTitle(final List _list) {
- if (CtuluLibArray.isEmpty(_list)) {
- return false;
- }
- if (_list.size() == 1) {
- return true;
- }
+ if (CtuluLibArray.isEmpty(_list)) { return false; }
+ if (_list.size() == 1) { return true; }
final BConfigurableInterface i1 = (BConfigurableInterface) _list.get(0);
for (int i = _list.size() - 1; i > 0; i--) {
- if (!isSameTitle(i1, (BConfigurableInterface) _list.get(i))) {
- return false;
- }
+ if (!isSameTitle(i1, (BConfigurableInterface) _list.get(i))) { return false; }
}
return true;
}
@@ -98,43 +85,29 @@
}
private static boolean isSame(final List _list) {
- if (CtuluLibArray.isEmpty(_list)) {
- return false;
- }
- if (_list.size() == 1) {
- return true;
- }
+ if (CtuluLibArray.isEmpty(_list)) { return false; }
+ if (_list.size() == 1) { return true; }
final BConfigurableInterface i1 = (BConfigurableInterface) _list.get(0);
for (int i = _list.size() - 1; i > 0; i--) {
- if (!isSame(i1, (BConfigurableInterface) _list.get(i))) {
- return false;
- }
+ if (!isSame(i1, (BConfigurableInterface) _list.get(i))) { return false; }
}
return true;
}
public static BConfigurableInterface getCommonConfigurable(final BConfigurableInterface[] _conf) {
// on se d\xE9barrasse des cas tordus
- if (_conf == null || _conf.length == 0) {
- return null;
- }
- if (_conf.length == 1) {
- return _conf[0];
- }
+ if (_conf == null || _conf.length == 0) { return null; }
+ if (_conf.length == 1) { return _conf[0]; }
final BConfigurableInterface first = _conf[0];
boolean reallySame = true;
for (int i = 1; i < _conf.length && reallySame; i++) {
reallySame = isSame(first, _conf[i]);
}
- if (reallySame) {
- return new BConfigurableCommon(_conf);
- }
+ if (reallySame) { return new BConfigurableCommon(_conf); }
final List res = new ArrayList();
final BConfigurableInterface[][] sameTitle = getCommonSousSections(_conf, true);
- if (sameTitle == null) {
- return null;
- }
+ if (sameTitle == null) { return null; }
for (int i = 0; i < sameTitle.length; i++) {
if (CtuluLibArray.isEmpty(sameTitle[i])) {
continue;
@@ -157,18 +130,15 @@
.toArray(new BConfigurableInterface[res.size()]), null);
}
- private static BConfigurableInterface[][] getCommonSousSections(final BConfigurableInterface[] _conf, final boolean _testTitleOnly) {
+ private static BConfigurableInterface[][] getCommonSousSections(final BConfigurableInterface[] _conf,
+ final boolean _testTitleOnly) {
final BConfigurableInterface[] ssFirst = _conf[0].getSections();
- if (CtuluLibArray.isEmpty(ssFirst)) {
- return new BConfigurableInterface[0][0];
- }
+ if (CtuluLibArray.isEmpty(ssFirst)) { return new BConfigurableInterface[0][0]; }
int min = ssFirst.length;
final List[] sections = new ArrayList[min];
for (int i = 0; i < _conf.length; i++) {
final BConfigurableInterface[] ssi = _conf[i].getSections();
- if (CtuluLibArray.isEmpty(ssi)) {
- return null;
- }
+ if (CtuluLibArray.isEmpty(ssi)) { return null; }
min = Math.min(min, ssi.length);
for (int k = 0; k < min; k++) {
if (sections[k] == null) {
@@ -195,14 +165,10 @@
}
public static boolean isSame(final BSelecteurInterface[] _i1, final BSelecteurInterface[] _i2) {
- if (!CtuluLibArray.isSameSize(_i1, _i2)) {
- return false;
- }
+ if (!CtuluLibArray.isSameSize(_i1, _i2)) { return false; }
if (_i1 != null) {
for (int i = _i1.length - 1; i >= 0; i--) {
- if (!isSame(_i1[i], _i2[i])) {
- return false;
- }
+ if (!isSame(_i1[i], _i2[i])) { return false; }
}
}
return true;
@@ -367,24 +333,22 @@
for (int i = 0; i < ssSections_.length; i++) {
ssSectionsBuilder_[i] = new BConfigureSectionBuilder(ssSections_[i]);
ssSectionsBuilder_[i].buildPanel(true);
- tabbed.addTab(ssSections_[i].getTitle(), ssSectionsBuilder_[i].pn_);
+ tabbed.addTab(ssSections_[i].getTitle(), new JScrollPane(ssSectionsBuilder_[i].pn_,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED));
}
}
}
-
+
protected void buildTab(int i) {
- buildTab();
- if(i>=0)
- selectTab(i);
+ buildTab();
+ if (i >= 0) selectTab(i);
}
- public void selectTab(int i){
- if(pn_==null || !(pn_ instanceof BuTabbedPane))
- return;
- ((BuTabbedPane)pn_).setSelectedIndex(i);
+ public void selectTab(int i) {
+ if (pn_ == null || !(pn_ instanceof BuTabbedPane)) return;
+ ((BuTabbedPane) pn_).setSelectedIndex(i);
}
-
+
protected void updateTarget() {
if (!CtuluLibArray.isEmpty(sel_)) {
for (int i = 0; i < sel_.length; i++) {
@@ -402,9 +366,7 @@
public void buildSelecteurs(final JComponent _pn, final GridBagConstraints _cl, final GridBagLayout _lay) {
components_ = new ArrayList();
- if (CtuluLibArray.isEmpty(sel_)) {
- return;
- }
+ if (CtuluLibArray.isEmpty(sel_)) { return; }
updateConstraints(_cl);
for (int i = 0; i < sel_.length; i++) {
final BSelecteurInterface si = sel_[i];
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-18 21:36:11 UTC (rev 5985)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-18 21:36:39 UTC (rev 5986)
@@ -45,6 +45,7 @@
import javax.swing.plaf.basic.BasicInternalFrameUI;
import org.fudaa.ctulu.*;
+import org.fudaa.ctulu.gui.CtuluAnalyzeGUI;
import org.fudaa.ctulu.gui.CtuluFileChooserFileTester;
import org.fudaa.ctulu.gui.CtuluFilleWithComponent;
import org.fudaa.ctulu.gui.CtuluLibDialog;
@@ -997,19 +998,9 @@
if (_analyze == null) { return false; }
if (!_analyze.isEmpty()) {
_analyze.printResume();
+ CtuluAnalyzeGUI.showDialogErrorFiltre(_analyze, this, _analyze.getDesc(), false);
}
- if (_analyze.getFatalError() != null) {
- final String f = _analyze.getFatalError();
- String deb = f;
- if (_analyze.containsErrors()) {
- deb += CtuluLibString.LINE_SEP + _analyze.getErrorResume();
- }
- error(_analyze.getDesc(), deb, false);
- return true;
- } else if (_analyze.containsErrors()) {
- error(_analyze.getDesc(), _analyze.getErrorResume());
- }
- return false;
+ return _analyze.getFatalError() != null;
}
public boolean manageErrorOperationAndIsFatal(final CtuluIOOperationSynthese _opResult) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-20 21:01:02
|
Revision: 5991
http://fudaa.svn.sourceforge.net/fudaa/?rev=5991&view=rev
Author: deniger
Date: 2010-10-20 21:00:55 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Added Paths:
-----------
trunk/framework/fudaa-dico/bin/
Removed Paths:
-------------
trunk/framework/.classpath
trunk/framework/.directory
trunk/framework/ctulu-bu/.settings/
trunk/framework/ctulu-common/.settings/
trunk/framework/ctulu-fu/.settings/
trunk/framework/ctulu-gis/.settings/
trunk/framework/ctulu-ui/.settings/
trunk/framework/ctulu-video/.settings/
trunk/framework/dodico-common/.settings/
trunk/framework/ebli-1d/.settings/
trunk/framework/ebli-2d/.settings/
trunk/framework/fudaa-common-courbe/.settings/
trunk/framework/fudaa-common-save/.settings/
trunk/framework/fudaa-dico/server/.settings/
trunk/framework/fudaa-dico/ui/.settings/
Property Changed:
----------------
trunk/framework/ebli-3d/
trunk/framework/ebli-common/
trunk/framework/ebli-graphe/
trunk/framework/ebli-visuallibrary/
trunk/framework/fudaa-common/
Deleted: trunk/framework/.classpath
===================================================================
--- trunk/framework/.classpath 2010-10-20 20:56:40 UTC (rev 5990)
+++ trunk/framework/.classpath 2010-10-20 21:00:55 UTC (rev 5991)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: trunk/framework/.directory
===================================================================
--- trunk/framework/.directory 2010-10-20 20:56:40 UTC (rev 5990)
+++ trunk/framework/.directory 2010-10-20 21:00:55 UTC (rev 5991)
@@ -1,6 +0,0 @@
-[Dolphin]
-Timestamp=2010,5,11,11,47,19
-ViewMode=1
-
-[Settings]
-ShowDotFiles=true
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-20 20:56:40 UTC (rev 5990)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-10-20 21:00:55 UTC (rev 5991)
@@ -358,7 +358,7 @@
}
public String getFatalError() {
- LogRecord log = getFirstOfLevel(Level.SEVERE);
+ LogRecord log = getFirstOfLevel(FATAL);
return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log);
}
Property changes on: trunk/framework/ebli-3d
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-common
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ nb-configuration.xml
.classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-graphe
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-visuallibrary
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/fudaa-common
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-20 20:56:40 UTC (rev 5990)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2010-10-20 21:00:55 UTC (rev 5991)
@@ -1000,7 +1000,7 @@
_analyze.printResume();
CtuluAnalyzeGUI.showDialogErrorFiltre(_analyze, this, _analyze.getDesc(), false);
}
- return _analyze.getFatalError() != null;
+ return _analyze.containsFatalError();
}
public boolean manageErrorOperationAndIsFatal(final CtuluIOOperationSynthese _opResult) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-22 22:06:32
|
Revision: 6001
http://fudaa.svn.sourceforge.net/fudaa/?rev=6001&view=rev
Author: deniger
Date: 2010-10-22 22:06:26 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
Property Changed:
----------------
trunk/framework/ctulu-fu/
trunk/framework/ctulu-gis/
trunk/framework/ctulu-video/
trunk/framework/dodico-common/
trunk/framework/ebli-1d/
trunk/framework/ebli-2d/
trunk/framework/ebli-3d/
trunk/framework/ebli-common/
trunk/framework/fudaa-common-courbe/
trunk/framework/fudaa-common-save/
trunk/framework/fudaa-dico/server/
trunk/framework/fudaa-dico/ui/
Property changes on: trunk/framework/ctulu-fu
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ctulu-gis
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java 2010-10-22 22:00:20 UTC (rev 6000)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java 2010-10-22 22:06:26 UTC (rev 6001)
@@ -20,6 +20,7 @@
private final CtuluUI ui;
private final JTable table;
+ private char separator='\t';
/**
* @param ui
@@ -35,8 +36,22 @@
}
public void actionPerformed(ActionEvent e) {
- CtuluTableExportPanel.doExport(table, ui,CtuluLibSwing.getActiveWindow());
+ CtuluTableExportPanel.doExport(separator,table, ui,CtuluLibSwing.getActiveWindow());
}
+ /**
+ * @return the separator
+ */
+ public char getSeparator() {
+ return separator;
+ }
+
+ /**
+ * @param separator the separator to set
+ */
+ public void setSeparator(char separator) {
+ this.separator = separator;
+ }
+
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2010-10-22 22:00:20 UTC (rev 6000)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2010-10-22 22:06:26 UTC (rev 6001)
@@ -33,7 +33,6 @@
import org.fudaa.ctulu.CsvWriter;
import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.CtuluTaskDelegate;
@@ -50,6 +49,8 @@
@SuppressWarnings("serial")
public final class CtuluTableExportPanel extends CtuluDialogPanel implements ItemListener {
+ private static final char DEFAULT_SEPARATOR = '\t';
+
JList cbModel_;
BuRadioButton cbOnlySelected_;
@@ -64,27 +65,44 @@
JDialog parentDial_;
- public static void showExportDialog(final JTable _table, final File _dest, final boolean _xsl, final CtuluUI _ui) {
+ char separator = '\t';
+
+ public static void showExportDialog(final char separator, final JTable _table, final File _dest, final boolean _xsl,
+ final CtuluUI _ui) {
showExportDialog(_table, _dest, _xsl, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
public static void showExportDialog(final JTable _table, final File _dest, final boolean _xsl, final CtuluUI _ui,
final Window windowParent) {
+ showExportDialog('\t', _table, _dest, _xsl, _ui, windowParent);
+ }
+
+ public static void showExportDialog(final char separator, final JTable _table, final File _dest, final boolean _xsl,
+ final CtuluUI _ui, final Window windowParent) {
final CtuluTableExportPanel pn = new CtuluTableExportPanel(_table, _dest, _xsl, _ui);
+ pn.separator = separator;
final CtuluDialog dial = CtuluDialogPanel.createDialog(windowParent, pn);
pn.setParentDial(dial);
dial.afficheDialogModal();
}
public static void doExport(final JTable _t, final CtuluUI _ui, final Window _f) {
+ doExport(DEFAULT_SEPARATOR, _t, _ui, _f);
+ }
+
+ public static void doExport(final char separator, final JTable _t, final CtuluUI _ui, final Window _f) {
final CtuluFileChooserCsvExcel choose = new CtuluFileChooserCsvExcel(_ui);
final File f = choose.getDestFile();
if (f == null) { return; }
- CtuluTableExportPanel.showExportDialog(_t, f, choose.isExcelChoosen(), _ui);
+ CtuluTableExportPanel.showExportDialog(separator, _t, f, choose.isExcelChoosen(), _ui);
}
+ public static void doExport(char separator, final JTable _t, final CtuluUI _ui) {
+ doExport(separator, _t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
+ }
+
public static void doExport(final JTable _t, final CtuluUI _ui) {
- doExport(_t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
+ doExport('\t', _t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
@SuppressWarnings("serial")
@@ -185,7 +203,7 @@
final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
w.write(task.getStateReceiver());
} else {
- final CtuluTableCsvWriter w = new CtuluTableCsvWriter(new CsvWriter(dest_), m);
+ final CtuluTableCsvWriter w = new CtuluTableCsvWriter(new CsvWriter(dest_), m,separator);
w.write(task.getStateReceiver());
}
} catch (final Exception e) {
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java 2010-10-22 22:00:20 UTC (rev 6000)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java 2010-10-22 22:06:26 UTC (rev 6001)
@@ -85,8 +85,8 @@
public void install(JComponent component, CtuluUI ui) {
this.ui=ui;
+ this.component = component;
assert this.component != null;
- this.component = component;
new CtuluPopupListener(this, component);
}
Property changes on: trunk/framework/ctulu-video
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/dodico-common
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-1d
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-2d
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-3d
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
.settings
+ .classpath
.project
target
Property changes on: trunk/framework/ebli-common
___________________________________________________________________
Modified: svn:ignore
- nb-configuration.xml
.classpath
.project
target
.settings
+ nb-configuration.xml
.classpath
.project
target
Property changes on: trunk/framework/fudaa-common-courbe
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/fudaa-common-save
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/fudaa-dico/server
___________________________________________________________________
Modified: svn:ignore
- target
.classpath
.project
+ target
.classpath
.project
.settings
Property changes on: trunk/framework/fudaa-dico/ui
___________________________________________________________________
Modified: svn:ignore
- target
.project
.classpath
+ target
.project
.classpath
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-22 22:30:44
|
Revision: 6005
http://fudaa.svn.sourceforge.net/fudaa/?rev=6005&view=rev
Author: deniger
Date: 2010-10-22 22:30:38 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Property Changed:
----------------
trunk/framework/
trunk/framework/ctulu-bu/
Property changes on: trunk/framework
___________________________________________________________________
Modified: svn:ignore
- .project
target
.settings
+ .project
target
.settings
bin
.classpath
Property changes on: trunk/framework/ctulu-bu
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-22 22:32:23
|
Revision: 6006
http://fudaa.svn.sourceforge.net/fudaa/?rev=6006&view=rev
Author: deniger
Date: 2010-10-22 22:32:17 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Property Changed:
----------------
trunk/framework/ebli-3d/
trunk/framework/ebli-common/
Property changes on: trunk/framework/ebli-3d
___________________________________________________________________
Modified: svn:ignore
- .classpath
.project
target
+ .classpath
.project
target
.settings
Property changes on: trunk/framework/ebli-common
___________________________________________________________________
Modified: svn:ignore
- nb-configuration.xml
.classpath
.project
target
+ nb-configuration.xml
.classpath
.project
target
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X