Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8402] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2013-04-23 21:17:52
|
Revision: 8402
http://fudaa.svn.sourceforge.net/fudaa/?rev=8402&view=rev
Author: deniger
Date: 2013-04-23 21:17:42 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
TraceCasiers
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -123,8 +123,14 @@
}
public long getGlobalTimeForResultatKey(ResultatTimeKey key) {
- createTimeByKey();
- return timeByKey.get(key);
+ if (key == null) {
+ return 0;
+ }
+ if (key.isPermanent()) {
+ createTimeByKey();
+ return timeByKey.get(key);
+ }
+ return key.getDuree();
}
/**
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -68,6 +68,8 @@
public RTFAResultLines launch(OtfaCampagne in) {
RTFAResultLines result = null;
OutOfMemoryError oomError = null;
+ FileLocker locker = new FileLocker();
+ Set<File> allEtu = new HashSet<File>();
try {
if (!lineSaver.isStarted()) {
lineSaver.start(false);
@@ -93,7 +95,6 @@
return result;
}
- Set<File> allEtu = new HashSet<File>();
List<OtfaCampagneLine> lines = in.getLines();
for (OtfaCampagneLine line : lines) {
allEtu.add(line.getReference().getEtuFile(in.getOtfaDir()));
@@ -104,11 +105,11 @@
return result;
}
}
- FileLocker locker = new FileLocker();
try {
for (File file : allEtu) {
locker.lock(file, user);
}
+ Thread.currentThread().sleep(5000);
processAllLines(in, campagneLogs);
} finally {
for (File file : allEtu) {
@@ -124,7 +125,12 @@
} catch (OutOfMemoryError error) {
Logger.getLogger(OtfaExecutor.class.getName()).log(Level.WARNING, "message");
oomError = error;
+ } catch (Exception ex) {
+ Logger.getLogger(OtfaExecutor.class.getName()).log(Level.INFO, "message");
} finally {
+ for (File file : allEtu) {
+ locker.unlock(file);
+ }
lineSaver.close();
}
if (oomError != null) {
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.69"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.69/"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0RC2/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,5 +1,5 @@
# ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\0.68"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -202,12 +202,19 @@
return showQuestionAndSaveDialogConf(title, message, classToSave, null, null);
}
+ public static boolean showQuestion(DialogDescriptor dialogDescriptor, Class classToSave, String helpId, PerspectiveEnum perspective) {
+ if (helpId != null) {
+ SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, helpId, perspective);
+ }
+ return showQuestion(dialogDescriptor, classToSave);
+ }
+
public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective) {
DialogDescriptor descriptor = new DialogDescriptor(message, title);
if (helpId != null) {
SysdocUrlBuilder.installDialogHelpCtx(descriptor, helpId, perspective);
}
- return showQuestionAndSaveDialogConf(descriptor, classToSave);
+ return showQuestion(descriptor, classToSave);
}
/**
@@ -306,12 +313,12 @@
});
}
- public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave) {
- return showQuestionAndSaveDialogConf(descriptor, classToSave, false);
+ public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave) {
+ return showQuestion(descriptor, classToSave, false);
}
- public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
+ public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
JDialog createDialog = (JDialog) DialogDisplayer.getDefault().createDialog(descriptor);
createDialog.pack();
createDialog.setName(classToSave.getCanonicalName());
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -55,6 +55,6 @@
});
new CheckBoxListPopupListener(list);
SysdocUrlBuilder.installDialogHelpCtx(desc, "bdlAffichageCourbes", null);
- DialogHelper.showQuestionAndSaveDialogConf(desc, getClass());
+ DialogHelper.showQuestion(desc, getClass());
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -102,7 +102,7 @@
tfDistance.validateData();
update(null, null);
updateBrancheDistance();
- return DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+ return DialogHelper.showQuestion(dialog, getClass());
}
@Override
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -99,7 +99,7 @@
DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
DialogDescriptor descriptor = new DialogDescriptor(panel, getTitle());
SysdocUrlBuilder.installDialogHelpCtx(descriptor, "affecteSectionsBranches", PerspectiveEnum.MODELLING);
- boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+ boolean accepted = DialogHelper.showQuestion(descriptor, getClass());
DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
if (accepted) {
final List<SectionProfilToBrancheParametersChange> acceptedModification = panel.getAcceptedModification();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -2,6 +2,7 @@
import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuGridLayout;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.io.File;
import javax.swing.event.DocumentEvent;
@@ -32,22 +33,22 @@
* @author deniger ( genesis)
*/
public class TraceCasierImporterAction extends EbliActionSimple {
-
+
private final PlanimetryController controller;
-
+
public TraceCasierImporterAction(PlanimetryController controller) {
super(NbBundle.getMessage(TraceCasierImporterAction.class, "TraceCasierImporterAction.ActionName"), null, TraceCasierImporterAction.class.
getSimpleName());
this.controller = controller;
}
-
+
@Override
public void actionPerformed(ActionEvent _e) {
ChooseInputFiles panel = new ChooseInputFiles();
+ panel.setPreferredSize(new Dimension(450, 350));
DialogDescriptor dialogDescriptor = new DialogDescriptor(panel, getTitle());
panel.setDialogDescriptor(dialogDescriptor);
- boolean accepted = DialogHelper.
- showQuestionAndSaveDialogConf(getTitle(), dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
+ boolean accepted = DialogHelper.showQuestion(dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
if (accepted) {
final File shapeFile = panel.getShapeFile();
final File profilFile = panel.getProfilDbfFile();
@@ -69,12 +70,12 @@
controller.getGroupExternController().addTraceCasiers(casiersZone, shapeFile, SigFormatHelper.EnumFormat.SHP);
DialogHelper.showNotifyOperationTermine(getTitle(), NbBundle.getMessage(TraceCasierImporterAction.class,
"TraceCasierImporterAction.Result", casiersZone.getNumGeometries()));
-
+
}
}
}
}
-
+
private CtuluLogResult<GISZoneCollectionLigneBrisee> loadFiles(File shapeFile, File profilFile, ProgressHandle progress) {
progress.switchToIndeterminate();
FSigFileLoadResult result = new FSigFileLoadResult();
@@ -87,13 +88,13 @@
CtuluLogResult<GISZoneCollectionLigneBrisee> toCasier = processor.toCasier();
return toCasier;
}
-
+
private static class ChooseInputFiles extends CtuluDialogPanel {
-
+
private final CtuluFileChooserPanel chooseShpFile;
private final CtuluFileChooserPanel chooseDbfFile;
DialogDescriptor dialogDescriptor;
-
+
public ChooseInputFiles() {
setLayout(new BuGridLayout(2, 5, 10));
chooseShpFile = addFileChooserPanel(this, NbBundle.getMessage(TraceCasierImporterAction.class, "importTraceCasier.ChooseShapefile.Label"), false,
@@ -105,12 +106,12 @@
public void insertUpdate(DocumentEvent e) {
updateValidState();
}
-
+
@Override
public void removeUpdate(DocumentEvent e) {
updateValidState();
}
-
+
@Override
public void changedUpdate(DocumentEvent e) {
updateValidState();
@@ -121,12 +122,12 @@
chooseDbfFile.setAllFileFilter(true);
chooseDbfFile.setFilter(new FileFilter[]{new BuFileFilter("dbf")});
}
-
+
public void setDialogDescriptor(DialogDescriptor dialogDescriptor) {
this.dialogDescriptor = dialogDescriptor;
updateValidState();
}
-
+
protected void updateValidState() {
if (getShapeFile() != null && chooseDbfFile.getFile() == null) {
chooseDbfFile.setInitDir(getShapeFile().getParentFile());
@@ -135,11 +136,11 @@
dialogDescriptor.setValid(getShapeFile() != null && getShapeFile().isFile());
}
}
-
+
protected File getShapeFile() {
return chooseShpFile.getFile();
}
-
+
protected File getProfilDbfFile() {
return chooseDbfFile.getFile();
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -60,7 +60,7 @@
DialogDescriptor des = new DialogDescriptor(panel, getTitle());
SysdocUrlBuilder.installDialogHelpCtx(des, "creationCasiersDepuisTraceCasiers", PerspectiveEnum.MODELLING);
DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
- boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(des, TraceProfilToSectionPanel.class);
+ boolean accepted = DialogHelper.showQuestion(des, TraceProfilToSectionPanel.class);
DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
if (accepted) {
List<TraceCasierSousModele> acceptedModification = panel.getAcceptedModification();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -59,7 +59,7 @@
DialogDescriptor des = new DialogDescriptor(panel, getTitle());
SysdocUrlBuilder.installDialogHelpCtx(des, "creationSectionsDepuisTraceProfils", PerspectiveEnum.MODELLING);
DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
- boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(des, TraceProfilToSectionPanel.class);
+ boolean accepted = DialogHelper.showQuestion(des, TraceProfilToSectionPanel.class);
DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
if (accepted) {
List<TraceProfilSousModele> acceptedModification = panel.getAcceptedModification();
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -48,7 +48,7 @@
DialogDescriptor descriptor = new DialogDescriptor(view, NbBundle.getMessage(ExternFileChooser.class, "fileExtern.DialogTitle"));
DialogHelper.readInPreferences(view.getView(), "outlineView", ExternFileChooser.class);
SysdocUrlBuilder.installDialogHelpCtx(descriptor, "choisirFichierExterne", PerspectiveEnum.REPORT);
- boolean ok = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+ boolean ok = DialogHelper.showQuestion(descriptor, getClass());
DialogHelper.writeInPreferences(view.getView(), "outlineView", ExternFileChooser.class);
if (ok) {
List<String> files = new ArrayList<String>();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -38,7 +38,7 @@
ui.setDescriptor(descriptor);
DialogHelper.readInPreferences(ui.getView(), "outlineView", ReportLongitudinalBrancheChooserUI.class);
SysdocUrlBuilder.installDialogHelpCtx(descriptor, "vueProfilLongitudinalConfigurationBranches", PerspectiveEnum.REPORT);
- boolean ok = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+ boolean ok = DialogHelper.showQuestion(descriptor, getClass());
DialogHelper.writeInPreferences(ui.getView(), "outlineView", ReportLongitudinalBrancheChooserUI.class);
if (ok) {
config.branchesConfig.clear();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -75,7 +75,7 @@
DialogDescriptor dialog = new DialogDescriptor(tabbedPane, org.openide.util.NbBundle.getMessage(ReportPlanimetryConfigUI.class, "DialogEditRapport.Name"));
SysdocUrlBuilder.installDialogHelpCtx(dialog, "configurationVuePlanimetrique", PerspectiveEnum.REPORT);
- boolean ok = DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+ boolean ok = DialogHelper.showQuestion(dialog, getClass());
if (ok) {
ReportVariableKey before = brancheConfigurationExtra.getData().getArrowVariable();
brancheConfigurationExtra.setData((ReportPlanimetryBrancheExtraData) brancheEditor.apply());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -131,7 +131,7 @@
ReportTimeReduceRangePanel reducePanelBuilder = new ReportTimeReduceRangePanel(values, subLabeltoStringTransformer, reducedRange);
final JPanel reducePanel = reducePanelBuilder.getPanel();
DialogDescriptor dial = new DialogDescriptor(reducePanel, NbBundle.getMessage(ReportTimeStepTopPanel.class, "ReduceTime.DialogTitle"));
- boolean ok = DialogHelper.showQuestionAndSaveDialogConf(dial, ReportTimeReduceRangePanel.class, false);
+ boolean ok = DialogHelper.showQuestion(dial, ReportTimeReduceRangePanel.class, false);
if (ok) {
IntRange newRange = reducePanelBuilder.getRange();
if (!ObjectUtils.equals(newRange, reducedRange)) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -30,7 +30,7 @@
editor.getExplorerManager().setRootContext(NodeHelper.createNode(nodes, "videos"));
DialogDescriptor descriptor = new DialogDescriptor(editor, org.openide.util.NbBundle.getMessage(ReportTimeVideoRecorderEditor.class, "ConfigurationVideos.DialogTitle"));
SysdocUrlBuilder.installDialogHelpCtx(descriptor, "configurationExportVideo", PerspectiveEnum.REPORT);
- return DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+ return DialogHelper.showQuestion(descriptor, getClass());
}
private static class Editor extends DefaultOutlineViewEditor {
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
