fudaa-svn-commit — svn commit with diffs

[Fudaa-svn-commit] SF.net SVN: fudaa:[8657] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java

[<de...@us...>]

Revision: 8657
          http://sourceforge.net/p/fudaa/svn/8657
Author:   deniger
Date:     2014-03-05 21:49:43 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
aide sur les dialogues de configuration

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java	2014-03-05 21:47:52 UTC (rev 8656)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java	2014-03-05 21:49:43 UTC (rev 8657)
@@ -3,7 +3,11 @@
  */
 package org.fudaa.fudaa.crue.planimetry;
 
+import javax.swing.JComponent;
 import org.fudaa.ebli.calque.ZEbliCalquesPanel;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.calque.edition.ZEditorPanelInterface;
+import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
 import org.fudaa.fudaa.sig.layer.FSigEditor;
 
 /**
@@ -16,4 +20,16 @@
     super(_panel, new PlanimetrySceneEditor(_panel.getScene(), _panel));
     setExportWithId(true);
   }
+
+  @Override
+  protected void editSingleObject(ZCalqueEditable _target) {
+    super.editSingleObject(_target);
+  }
+
+  @Override
+  protected void configureEditorPanel(JComponent jc) {
+    super.configureEditorPanel(jc);
+    SysdocUrlBuilder.installHelpShortcut(jc, "TESTDUSOIR");
+  }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8656] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/layer/FSigEditor.java

[<de...@us...>]

Revision: 8656
          http://sourceforge.net/p/fudaa/svn/8656
Author:   deniger
Date:     2014-03-05 21:47:52 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
ajout wrapper

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2014-03-05 21:46:37 UTC (rev 8655)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2014-03-05 21:47:52 UTC (rev 8656)
@@ -72,6 +72,7 @@
 import com.memoire.fu.Fu;
 import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.geom.Geometry;
+import javax.swing.JComponent;
 
 /**
  * @author Fred Deniger
@@ -125,6 +126,8 @@
    */
   private int selectedTabInSingleObjectEditorPanel_ = 0;
 
+  
+
   /**
    * L'\xE9dition pour un objet selectionn\xE9 unique.
    *
@@ -135,6 +138,7 @@
     final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
     final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected, true, true,
             getCoordinateDefinitions());
+    configureEditorPanel(ed);
     if (isDeferredModificationAsDefault()) {
       ed.setDeferredModifications(true);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8655] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/edition/ZEditorDefault.java

[<de...@us...>]

Revision: 8655
          http://sourceforge.net/p/fudaa/svn/8655
Author:   deniger
Date:     2014-03-05 21:46:37 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
ajout wrapper

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2014-03-05 12:01:39 UTC (rev 8654)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2014-03-05 21:46:37 UTC (rev 8655)
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JInternalFrame;
 import javax.swing.KeyStroke;
@@ -383,7 +384,6 @@
       }
     }
 
-
     boolean b = isModifiable;
     // Si la selection est sur le m\xEAme objet.
     b = b && (idGeom = hlp.getUniqueSelectedIdx()) != -1;
@@ -394,7 +394,8 @@
         if (!(geom instanceof GISMultiPoint)) {
           if (hlp.getNbAtomicSelected() == 1) {
             b = b
-                    && (hlp.getUniqueAtomicSelection().getMinIndex() == 0 || hlp.getUniqueAtomicSelection().getMaxIndex() + 1 == geom.getCoordinateSequence().size());
+                    && (hlp.getUniqueAtomicSelection().getMinIndex() == 0 || hlp.getUniqueAtomicSelection().getMaxIndex() + 1 == geom.
+                    getCoordinateSequence().size());
           } else if (hlp.getNbAtomicSelected() == 2) {
             b = b && Math.abs(hlp.getUniqueAtomicSelection().getMinIndex() - hlp.getUniqueAtomicSelection().getMaxIndex()) == 1;
           } else {
@@ -641,8 +642,8 @@
   public void moved(double _dx, double _dy, double _dz, boolean _confirmOnZ) {
     if (_confirmOnZ && _dz != 0
             && !ui_.question(EbliLib.getS("Accroche suivant Z"),
-            EbliLib.getS("Voulez vous translater les objets\ns\xE9lectionn\xE9s suivant DZ={0} ?",
-            getXYFormatter().getXYFormatter().format(_dz)))) {
+                    EbliLib.getS("Voulez vous translater les objets\ns\xE9lectionn\xE9s suivant DZ={0} ?",
+                            getXYFormatter().getXYFormatter().format(_dz)))) {
       _dz = 0;
     }
 
@@ -865,6 +866,10 @@
     return null;
   }
 
+  protected void configureEditorPanel(JComponent jc) {
+
+  }
+
   /**
    * L'\xE9dition pour un objet selectionn\xE9 unique.
    *
@@ -874,6 +879,7 @@
     final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
     final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected,
             true, true, getCoordinateDefinitions());
+    configureEditorPanel(ed);
     ed.setCmd(getMng());
     ed.afficheModale(getFrame(), _target.getTitle());
   }
@@ -890,6 +896,7 @@
     final boolean editAttribute = true;
     final EbliAtomicsEditorPanel ed = new EbliAtomicsEditorPanel(idx, vertex, getCoordinateDefinitions(),
             _target.getModelEditable(), editAttribute, getMng());
+    configureEditorPanel(ed);
     ed.afficheModale(getFrame(), _target.getTitle());
   }
 
@@ -910,6 +917,7 @@
     final EbliSegmentsEditorPanel ed = new EbliSegmentsEditorPanel(idx, segments, getCoordinateDefinitions(),
             (ZModeleLigneBriseeEditable) _target.getModelEditable(),
             editAttribute, getMng());
+    configureEditorPanel(ed);
     ed.afficheModale(getFrame(), _target.getTitle());
   }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8652] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8652
          http://sourceforge.net/p/fudaa/svn/8652
Author:   deniger
Date:     2014-03-04 23:30:37 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-617

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-project/pom.xml

Added Paths:
-----------
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/
    trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml

Removed Paths:
-------------
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java

Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml	2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml	2014-03-04 23:30:37 UTC (rev 8652)
@@ -49,6 +49,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-netbeans-api-progress</artifactId>
+      <version>${netbeans.version}</version>
+    </dependency>
+    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>

Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java (from rev 8645, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/IndexSaverTest.java	2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,62 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.report;
+
+import java.io.File;
+import java.util.List;
+import org.fudaa.dodico.crue.common.transformer.DateDurationConverter;
+import org.fudaa.dodico.crue.io.AbstractIOTestCase;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
+import org.fudaa.dodico.crue.test.FileTest;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class IndexSaverTest extends FileTest {
+
+  private String auteurCreation = "AuteurCreation";
+  private String auteurDerniereModif = "AuteurDerniereModif";
+
+  public IndexSaverTest() {
+  }
+
+  @Test
+  public void testRead() {
+    File file = AbstractIOTestCase.getFile("/org/fudaa/dodico/crue/projet/report/index.xml");
+    assertTrue(file.exists());
+    ReportIndexReader saver = new ReportIndexReader();
+    CrueIOResu<List<ReportViewLineInfo>> read = saver.read(file);
+    List<ReportViewLineInfo> metier = read.getMetier();
+    testResult(metier,
+            DateDurationConverter.getDate("2012-10-09T12:02:23.853").toDateTime().getMillis(),
+            DateDurationConverter.getDate("2012-10-09T12:02:33.853").toDateTime().getMillis(), "fileName 1", "fileName 2");
+    file.delete();
+
+  }
+
+  private void testGeneralInfos(final ReportViewLineInfo line, final long creationDate, final long modificationDate) {
+    assertEquals(auteurCreation, line.getAuteurCreation());
+    assertEquals(auteurDerniereModif, line.getAuteurDerniereModif());
+    assertEquals(creationDate, line.getDateCreation().toDateTime().getMillis());
+    assertEquals(modificationDate, line.getDateDerniereModif().toDateTime().getMillis());
+  }
+
+  private void testResult(List<ReportViewLineInfo> metier, final long creationDate, final long modificationDate, final String fileNameOne,
+          final String fileNameTwo) {
+    assertEquals(2, metier.size());
+    ReportViewLineInfo line = metier.get(0);
+    assertEquals("Vue 1", line.getNom());
+    assertEquals(fileNameOne, line.getFilename());
+    assertEquals(fileNameOne, line.getCommentaire());
+    testGeneralInfos(line, creationDate, modificationDate);
+    line = metier.get(1);
+    assertEquals("Vue 2", line.getNom());
+    assertEquals(fileNameTwo, line.getFilename());
+    assertEquals(fileNameTwo, line.getCommentaire());
+    testGeneralInfos(line, creationDate, modificationDate);
+  }
+}

Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java (from rev 8645, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/report/ReportViewLineInfoTest.java	2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,58 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.report;
+
+import org.fudaa.dodico.crue.common.ConnexionInformationDefault;
+import org.fudaa.dodico.crue.common.ConnexionInformationFixed;
+import org.joda.time.LocalDateTime;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ReportViewLineInfoTest {
+
+  public ReportViewLineInfoTest() {
+  }
+
+  @Test
+  public void testCloned() {
+    ReportViewLineInfo info = new ReportViewLineInfo();
+    info.setCommentaire("commentaire");
+    info.setDateCreation(new LocalDateTime());
+    info.setAuteurCreation("Tester");
+    ReportViewLineInfo cloned = info.clone();
+    assertEquals(info.getCommentaire(), cloned.getCommentaire());
+    assertEquals(info.getDateCreation(), cloned.getDateCreation());
+
+    ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
+    info.updateEdited(ci);
+    assertEquals(info.getAuteurDerniereModif(), ci.getCurrentUser());
+    assertEquals(info.getDateDerniereModif(), ci.getCurrentDate());
+  }
+
+  @Test
+  public void testCopy() {
+    ReportViewLineInfo info = new ReportViewLineInfo();
+    info.setCommentaire("commentaire");
+    info.setDateCreation(new LocalDateTime(0));
+    info.setAuteurCreation("Tester");
+    info.setAuteurDerniereModif("modifier");
+    info.setDateDerniereModif(new LocalDateTime(10));
+    info.setFilename("filename");
+
+    ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
+    assertNotSame(info.getAuteurCreation(), ci.getCurrentUser());
+    assertNotSame(info.getAuteurDerniereModif(), ci.getCurrentUser());
+    ReportViewLineInfo copy = info.copy(ci);
+    assertEquals(info.getCommentaire(), copy.getCommentaire());
+    assertEquals(ci.getCurrentUser(), copy.getAuteurCreation());
+    assertEquals(ci.getCurrentUser(), copy.getAuteurDerniereModif());
+    assertEquals(ci.getCurrentDate(), copy.getDateCreation());
+    assertEquals(ci.getCurrentDate(), copy.getDateDerniereModif());
+    assertNull(copy.getFilename());
+  }
+}

Added: trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/resources/org/fudaa/dodico/crue/projet/report/index.xml	2014-03-04 23:30:37 UTC (rev 8652)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ReportIndex xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue http://www.fudaa.fr/xsd/crue/report-index-1.0.xsd">
+  <Commentaire></Commentaire>
+  <Type>longitudinal</Type>
+  <VueConfig>
+    <Nom>Vue 1</Nom>
+    <Commentaire>fileName 1</Commentaire>
+    <Filename>fileName 1</Filename>
+    <AuteurCreation>AuteurCreation</AuteurCreation>
+    <DateCreation>2012-10-09T12:02:23.853</DateCreation>
+    <AuteurDerniereModif>AuteurDerniereModif</AuteurDerniereModif>
+    <DateDerniereModif>2012-10-09T12:02:33.853</DateDerniereModif>
+  </VueConfig>
+  <VueConfig>
+    <Nom>Vue 2</Nom>
+    <Commentaire>fileName 2</Commentaire>
+    <Filename>fileName 2</Filename>
+    <AuteurCreation>AuteurCreation</AuteurCreation>
+    <DateCreation>2012-10-09T12:02:23.853</DateCreation>
+    <AuteurDerniereModif>AuteurDerniereModif</AuteurDerniereModif>
+    <DateDerniereModif>2012-10-09T12:02:33.853</DateDerniereModif>
+  </VueConfig>
+</ReportIndex>
\ No newline at end of file

Deleted: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java	2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfoTest.java	2014-03-04 23:30:37 UTC (rev 8652)
@@ -1,58 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.report.view;
-
-import org.fudaa.dodico.crue.common.ConnexionInformationDefault;
-import org.fudaa.dodico.crue.common.ConnexionInformationFixed;
-import org.joda.time.LocalDateTime;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ReportViewLineInfoTest {
-
-  public ReportViewLineInfoTest() {
-  }
-
-  @Test
-  public void testCloned() {
-    ReportViewLineInfo info = new ReportViewLineInfo();
-    info.setCommentaire("commentaire");
-    info.setDateCreation(new LocalDateTime());
-    info.setAuteurCreation("Tester");
-    ReportViewLineInfo cloned = info.clone();
-    assertEquals(info.getCommentaire(), cloned.getCommentaire());
-    assertEquals(info.getDateCreation(), cloned.getDateCreation());
-
-    ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
-    info.updateEdited(ci);
-    assertEquals(info.getAuteurDerniereModif(), ci.getCurrentUser());
-    assertEquals(info.getDateDerniereModif(), ci.getCurrentDate());
-  }
-
-  @Test
-  public void testCopy() {
-    ReportViewLineInfo info = new ReportViewLineInfo();
-    info.setCommentaire("commentaire");
-    info.setDateCreation(new LocalDateTime(0));
-    info.setAuteurCreation("Tester");
-    info.setAuteurDerniereModif("modifier");
-    info.setDateDerniereModif(new LocalDateTime(10));
-    info.setFilename("filename");
-
-    ConnexionInformationFixed ci = new ConnexionInformationFixed(new ConnexionInformationDefault());
-    assertNotSame(info.getAuteurCreation(), ci.getCurrentUser());
-    assertNotSame(info.getAuteurDerniereModif(), ci.getCurrentUser());
-    ReportViewLineInfo copy = info.copy(ci);
-    assertEquals(info.getCommentaire(), copy.getCommentaire());
-    assertEquals(ci.getCurrentUser(), copy.getAuteurCreation());
-    assertEquals(ci.getCurrentUser(), copy.getAuteurDerniereModif());
-    assertEquals(ci.getCurrentDate(), copy.getDateCreation());
-    assertEquals(ci.getCurrentDate(), copy.getDateDerniereModif());
-    assertNull(copy.getFilename());
-  }
-}

Deleted: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java	2014-03-04 23:30:10 UTC (rev 8651)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/IndexSaverTest.java	2014-03-04 23:30:37 UTC (rev 8652)
@@ -1,99 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.report.view.persist;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.common.transformer.DateDurationConverter;
-import org.fudaa.dodico.crue.io.AbstractIOTestCase;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.fudaa.crue.report.data.ReportContentType;
-import org.fudaa.fudaa.crue.report.view.ReportViewLine;
-import org.fudaa.fudaa.crue.report.view.ReportViewLineInfo;
-import org.joda.time.LocalDateTime;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class IndexSaverTest extends FileTest {
-
-  private String auteurCreation = "AuteurCreation";
-  private String auteurDerniereModif = "AuteurDerniereModif";
-
-  public IndexSaverTest() {
-  }
-
-  @Test
-  public void testRead() {
-    File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/index.xml");
-    assertTrue(file.exists());
-    IndexSaver saver = new IndexSaver();
-    CrueIOResu<List<ReportViewLineInfo>> read = saver.read(file);
-    List<ReportViewLineInfo> metier = read.getMetier();
-    testResult(metier,
-            DateDurationConverter.getDate("2012-10-09T12:02:23.853").toDateTime().getMillis(),
-            DateDurationConverter.getDate("2012-10-09T12:02:33.853").toDateTime().getMillis(), "fileName 1", "fileName 2");
-    file.delete();
-
-  }
-
-  @Test
-  public void testWrite() throws IOException {
-    IndexSaver saver = new IndexSaver();
-    File target = createTempFile("index", ".xml");
-    final long creationDate = System.currentTimeMillis() - 10000;
-    final long modificationDate = System.currentTimeMillis();
-    final String fileNameOne = "fileName 1";
-    final String fileNameTwo = "fileName 2";
-    ReportViewLine lineOne = new ReportViewLine(ReportContentType.LONGITUDINAL, createInfo(creationDate, modificationDate, fileNameOne), null, null, null);
-    ReportViewLine lineTwo = new ReportViewLine(ReportContentType.LONGITUDINAL, createInfo(creationDate, modificationDate, fileNameTwo), null, null, null);
-    lineOne.getInfo().setNom("Vue 1");
-    lineTwo.getInfo().setNom("Vue 2");
-    CtuluLog save = saver.save(target, Arrays.asList(lineOne, lineTwo), "longitudinal");
-
-    assertTrue(save.isEmpty());
-    CrueIOResu<List<ReportViewLineInfo>> read = saver.read(target);
-    assertTrue(read.getAnalyse().isEmpty());
-    List<ReportViewLineInfo> metier = read.getMetier();
-    testResult(metier, creationDate, modificationDate, fileNameOne, fileNameTwo);
-  }
-
-  private ReportViewLineInfo createInfo(final long creationDate, final long modificationDate, final String fileName) {
-    ReportViewLineInfo info = new ReportViewLineInfo();
-    info.setAuteurCreation(auteurCreation);
-    info.setAuteurDerniereModif(auteurDerniereModif);
-    info.setDateCreation(new LocalDateTime(creationDate));
-    info.setDateDerniereModif(new LocalDateTime(modificationDate));
-    info.setFilename(fileName);
-    info.setCommentaire(fileName);
-    return info;
-  }
-
-  private void testGeneralInfos(final ReportViewLineInfo line, final long creationDate, final long modificationDate) {
-    assertEquals(auteurCreation, line.getAuteurCreation());
-    assertEquals(auteurDerniereModif, line.getAuteurDerniereModif());
-    assertEquals(creationDate, line.getDateCreation().toDateTime().getMillis());
-    assertEquals(modificationDate, line.getDateDerniereModif().toDateTime().getMillis());
-  }
-
-  private void testResult(List<ReportViewLineInfo> metier, final long creationDate, final long modificationDate, final String fileNameOne, final String fileNameTwo) {
-    assertEquals(2, metier.size());
-    ReportViewLineInfo line = metier.get(0);
-    assertEquals("Vue 1", line.getNom());
-    assertEquals(fileNameOne, line.getFilename());
-    assertEquals(fileNameOne, line.getCommentaire());
-    testGeneralInfos(line, creationDate, modificationDate);
-    line = metier.get(1);
-    assertEquals("Vue 2", line.getNom());
-    assertEquals(fileNameTwo, line.getFilename());
-    assertEquals(fileNameTwo, line.getCommentaire());
-    testGeneralInfos(line, creationDate, modificationDate);
-  }
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8651] trunk/soft/fudaa-crue/crue-otfa

[<de...@us...>]

Revision: 8651
          http://sourceforge.net/p/fudaa/svn/8651
Author:   deniger
Date:     2014-03-04 23:30:10 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-617

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-otfa/nbactions.xml
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
    trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
    trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml

Added Paths:
-----------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java

Modified: trunk/soft/fudaa-crue/crue-otfa/nbactions.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/nbactions.xml	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/nbactions.xml	2014-03-04 23:30:10 UTC (rev 8651)
@@ -7,7 +7,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
             </goals>
             <properties>
-                <exec.args>-Xmx64M -classpath %classpath ${packageClassName}</exec.args>
+                <exec.args>-Xmx512M  -DSiteConfigDir="C:\data\Fudaa-Crue\etc" -classpath %classpath org.fudaa.dodico.crue.projet.otfa.OtfaBatch C:\data\Fudaa-Crue\Data\otfa-simple-valide.otfa.xml</exec.args>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
@@ -18,7 +18,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
             </goals>
             <properties>
-                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Xmx64M -classpath %classpath ${packageClassName}</exec.args>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Xmx512M  -DSiteConfigDir="C:\data\Fudaa-Crue\etc" -classpath %classpath org.fudaa.dodico.crue.projet.otfa.OtfaBatch C:\data\Fudaa-Crue\Data\otfa-simple-valide.otfa.xml</exec.args>
                 <exec.executable>java</exec.executable>
                 <jpda.listen>true</jpda.listen>
             </properties>
@@ -30,7 +30,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
             </goals>
             <properties>
-                <exec.args>${profiler.args} -Xmx64M -classpath %classpath ${packageClassName}</exec.args>
+                <exec.args>-Xmx512M  -DSiteConfigDir="C:\data\Fudaa-Crue\etc" -classpath %classpath org.fudaa.dodico.crue.projet.otfa.OtfaBatch C:\data\Fudaa-Crue\Data\otfa-simple-valide.otfa.xml</exec.args>
                 <exec.executable>${profiler.java}</exec.executable>
             </properties>
         </action>

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueConverterCommonParameter.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -25,6 +25,9 @@
     dao.Scenario = metier.getScenarioNom();
     dao.Coeur = metier.getCoeurName();
     dao.LancerCalcul = metier.isLaunchCompute();
+    dao.Transitoire = metier.isRapportOnTransitoire();
+    dao.CheminCSV = metier.getCheminCSV();
+    dao.Rapport = metier.getRapport();
     return dao;
   }
 
@@ -34,6 +37,9 @@
     metier.setScenarioNom(dao.Scenario);
     metier.setCoeurName(dao.Coeur);
     metier.setLaunchCompute(dao.LancerCalcul);
+    metier.setRapportOnTransitoire(dao.Transitoire);
+    metier.setCheminCSV(dao.CheminCSV);
+    metier.setRapport(dao.Rapport);
     return metier;
   }
 

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/common/CrueDaoStructureOptions.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -43,5 +43,8 @@
     public String Scenario;
     public String Coeur;
     public boolean LancerCalcul;
+    public boolean Transitoire;
+    public String Rapport;
+    public String CheminCSV;
   }
 }

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -1,6 +1,7 @@
 package org.fudaa.dodico.crue.projet.otfa;
 
 import java.io.File;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
@@ -17,6 +18,9 @@
   private String scenarioNom;
   private boolean launchCompute;
   private String coeurName;
+  private boolean rapportOnTransitoire;
+  private String rapport;
+  private String cheminCSV;
 
   public OtfaCampagneItem() {
   }
@@ -30,12 +34,37 @@
     }
   }
 
+  public boolean isRapportOnTransitoire() {
+    return rapportOnTransitoire;
+  }
+
+  public void setRapportOnTransitoire(boolean rapportOnTransitoire) {
+    this.rapportOnTransitoire = rapportOnTransitoire;
+  }
+
+  public String getRapport() {
+    return rapport;
+  }
+
+  public void setRapport(String rapport) {
+    this.rapport = rapport;
+  }
+
+  public String getCheminCSV() {
+    return cheminCSV;
+  }
+
+  public void setCheminCSV(String cheminCSV) {
+    this.cheminCSV = cheminCSV;
+  }
+
+
   public boolean isEmpty() {
     return StringUtils.isBlank(coeurName) && StringUtils.isBlank(scenarioNom) && StringUtils.isBlank(etuFile);
   }
 
   /**
-   * 
+   *
    * @return true si la version utilisee est Crue9.
    */
   public boolean isCrue9() {
@@ -55,7 +84,7 @@
 
   /**
    * @return le fichier en prenant en compte le répertoire de otfa
-   * @param  le répertoire contenant le fichier otfa.
+   * @param otfaDir répertoire contenant le fichier otfa.
    */
   public File getEtuFile(File otfaDir) {
     if (StringUtils.isBlank(etuFile)) {
@@ -122,54 +151,48 @@
    */
   @Override
   public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + ((coeurName == null) ? 0 : coeurName.hashCode());
-    result = prime * result + ((etuFile == null) ? 0 : etuFile.hashCode());
-    result = prime * result + (launchCompute ? 1231 : 1237);
-    result = prime * result + ((scenarioNom == null) ? 0 : scenarioNom.hashCode());
-    return result;
+    int hash = 7;
+    hash = 19 * hash + Objects.hashCode(this.etuFile);
+    hash = 19 * hash + Objects.hashCode(this.scenarioNom);
+    hash = 19 * hash + (this.launchCompute ? 1 : 0);
+    hash = 19 * hash + Objects.hashCode(this.coeurName);
+    hash = 19 * hash + (this.rapportOnTransitoire ? 1 : 0);
+    hash = 19 * hash + Objects.hashCode(this.rapport);
+    hash = 19 * hash + Objects.hashCode(this.cheminCSV);
+    return hash;
   }
 
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
     if (obj == null) {
       return false;
     }
     if (getClass() != obj.getClass()) {
       return false;
     }
-    OtfaCampagneItem other = (OtfaCampagneItem) obj;
-    if (coeurName == null) {
-      if (other.coeurName != null) {
-        return false;
-      }
-    } else if (!coeurName.equals(other.coeurName)) {
+    final OtfaCampagneItem other = (OtfaCampagneItem) obj;
+    if (!Objects.equals(this.etuFile, other.etuFile)) {
       return false;
     }
-    if (etuFile == null) {
-      if (other.etuFile != null) {
-        return false;
-      }
-    } else if (!etuFile.equals(other.etuFile)) {
+    if (!Objects.equals(this.scenarioNom, other.scenarioNom)) {
       return false;
     }
-    if (launchCompute != other.launchCompute) {
+    if (this.launchCompute != other.launchCompute) {
       return false;
     }
-    if (scenarioNom == null) {
-      if (other.scenarioNom != null) {
-        return false;
-      }
-    } else if (!scenarioNom.equals(other.scenarioNom)) {
+    if (!Objects.equals(this.coeurName, other.coeurName)) {
       return false;
     }
+    if (this.rapportOnTransitoire != other.rapportOnTransitoire) {
+      return false;
+    }
+    if (!Objects.equals(this.rapport, other.rapport)) {
+      return false;
+    }
+    if (!Objects.equals(this.cheminCSV, other.cheminCSV)) {
+      return false;
+    }
     return true;
   }
+
 }

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaContentValidator.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -11,6 +11,7 @@
 import org.fudaa.ctulu.CtuluLogGroup;
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.fudaa.dodico.crue.common.CrueOperationResult;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
 import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
 import org.fudaa.dodico.crue.config.coeur.CoeurManager;
 import org.fudaa.dodico.crue.config.coeur.CrueVersionType;
@@ -21,6 +22,11 @@
 import org.fudaa.dodico.crue.metier.etude.EMHProjet;
 import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
 import org.fudaa.dodico.crue.projet.EMHProjetController;
+import org.fudaa.dodico.crue.projet.report.ReportContentType;
+import org.fudaa.dodico.crue.projet.report.ReportIndexReader;
+import org.fudaa.dodico.crue.projet.report.ReportIndexReaderHelper;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfo;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
 
 /**
  * @author deniger
@@ -92,6 +98,9 @@
     if (complete) {
       validScenarioExist(campagne, logsByLineId);
     }
+    if (complete) {
+      validReportExist(campagne, logsByLineId);
+    }
 
     return logGroup;
   }
@@ -277,6 +286,46 @@
 
   }
 
+  private boolean rapportIsBlankOrExists(OtfaCampagne campagne, OtfaCampagneItem item, CtuluLog log) {
+    if (StringUtils.isNotBlank(item.getRapport())) {
+      File etuFile = item.getEtuFile(campagne.getOtfaDir());
+      if (etuFile.exists()) {
+        final ReportContentType contentType = ReportViewLineInfoAndType.getContentType(item.getRapport());
+        if (contentType == null) {
+          return false;
+        }
+        CoeurConfigContrat coeur = getCoeurForItem(item, etuFile);
+        //validation effectuée auparavant:
+        if (coeur == null) {
+          return false;
+        }
+        final CrueOperationResult<EMHProjet> result = EMHProjetController.readProjet(etuFile, coeur);
+        if (result == null || result.getResult() == null) {
+          return false;
+        }
+        ReportIndexReaderHelper helper = new ReportIndexReaderHelper(result.getResult());
+        return helper.containsReportWithIdOrDescription(contentType, item.getRapport()) != null;
+
+      }
+
+    }
+    return true;
+  }
+
+  private void validReportExist(OtfaCampagne campagne, Map<Integer, CtuluLog> logsByLineId) {
+
+    for (OtfaCampagneLine line : campagne.getLines()) {
+      CtuluLog log = logsByLineId.get(line.getIndice());
+      if (!rapportIsBlankOrExists(campagne, line.getReference(), log)) {
+        log.addSevereError("otfa.validator.reportNotFoundReference", line.getReference().getRapport());
+      }
+      if (!rapportIsBlankOrExists(campagne, line.getCible(), log)) {
+        log.addSevereError("otfa.validator.reportNotFoundCible", line.getReference().getRapport());
+      }
+
+    }
+  }
+
   private void validScenarioExist(OtfaCampagne campagne, OtfaCampagneItem item,
           final Map<String, Map<String, CrueVersionType>> scenariosByEtudes, CtuluLog log) {
     File etuFile = item.getEtuFile(campagne.getOtfaDir());
@@ -311,13 +360,15 @@
         CrueVersionType versionItem = item.isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10;
 
         final CrueVersionType scenarioVersion = scenarios.get(name);
+
         if (!versionItem.equals(scenarioVersion)) {
           //attention, il faut également prendre en compte le cas ou le coeur crue10 n'existe pas :
           //erreur relevée par ailleurs: il faut eviter les remontées multiples
           if (versionItem.equals(CrueVersionType.CRUE10) && !coeurExist(item.getCoeurName())) {
-            Logger.getLogger(OtfaContentValidator.class.getName()).log(Level.INFO,
-                    "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
-                    scenarioVersion);
+            Logger.getLogger(OtfaContentValidator.class
+                    .getName()).log(Level.INFO,
+                            "pas d'erreur le scenario {0} car deja remonté dans un test precedent",
+                            scenarioVersion);
           } else {
             log.addSevereError("otfa.validator.crueVersionNonCompatible", name, scenarioVersion.getDisplayName(),
                     versionItem.getDisplayName());

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	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -9,6 +9,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.ctulu.CtuluLogGroup;
 import org.fudaa.ctulu.CtuluLogLevel;
@@ -279,6 +280,7 @@
     }
 
     EMHProjet projet = projetResult.getResult();
+
     EMHProjetController controller = new EMHProjetController(projet, user);
 
     ManagerEMHScenario managerScenario = projet.getScenario(item.getScenarioNom());
@@ -364,6 +366,14 @@
           }
         }
       }
+      if (StringUtils.isNotEmpty(item.getRapport())) {
+        OtfaReportExecutor report = new OtfaReportExecutor(projet, emhScenario, item, campagne);
+        CtuluLog log = report.exportCSV();
+        if (log.isNotEmpty()) {
+          logs.addLog(null);
+        }
+
+      }
     }
 
     return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());

Added: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -0,0 +1,55 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.otfa;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.projet.report.ReportContentType;
+import org.fudaa.dodico.crue.projet.report.ReportIndexReaderHelper;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class OtfaReportExecutor {
+
+  private final EMHProjet projet;
+  private final EMHScenario emhScenario;
+  private final OtfaCampagneItem item;
+  private final OtfaCampagne campagne;
+
+  OtfaReportExecutor(EMHProjet projet, EMHScenario emhScenario, OtfaCampagneItem item, OtfaCampagne campagne) {
+    this.projet = projet;
+    this.emhScenario = emhScenario;
+    this.item = item;
+    this.campagne = campagne;
+  }
+
+  CtuluLog exportCSV() {
+    CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+    ReportIndexReaderHelper helper = new ReportIndexReaderHelper(projet);
+    final ReportContentType contentType = ReportViewLineInfoAndType.getContentType(item.getRapport());
+    if (contentType == null) {
+      log.addSevereError("otfa.report.typeUnknown", item.getRapport());
+      return log;
+    }
+    final ReportViewLineInfoAndType reportInfoAndType = helper.containsReportWithIdOrDescription(contentType, item.getRapport());
+    if (reportInfoAndType == null) {
+      log.addSevereError("otfa.report.notFound", item.getRapport());
+      return log;
+    }
+    File dir = new File(projet.getInfos().getDirOfRapports(), reportInfoAndType.getType().getFolderName());
+    File xml = new File(dir, reportInfoAndType.getInfo().getFilename());
+    if (!xml.exists()) {
+      log.addSevereError("otfa.report.fileNotFound", xml.getAbsolutePath());
+      return log;
+    }
+    return log;
+  }
+
+}

Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueOTFA.java	2014-03-04 23:30:10 UTC (rev 8651)
@@ -119,6 +119,9 @@
     item.setScenarioNom("Sc_M3-0_c9");
     item.setCoeurName("Crue9");
     item.setLaunchCompute(true);
+    item.setCheminCSV("cheminCsv1");
+    item.setRapport("rapport1/test.xml");
+    item.setRapportOnTransitoire(true);
 
     line.setReference(item);
 
@@ -128,6 +131,9 @@
     item.setScenarioNom("Sc_M3-0_c9");
     item.setCoeurName("Crue10.1");
     item.setLaunchCompute(true);
+    item.setCheminCSV("cheminCsv2");
+    item.setRapport("rapport2/test.xml");
+    item.setRapportOnTransitoire(false);
 
     line.setCible(item);
 
@@ -166,6 +172,8 @@
     assertEquals(expected.getCommentaire(), actual.getCommentaire());
     assertEquals(expected.getReference(), actual.getReference());
     assertEquals(expected.getCible(), actual.getCible());
+    assertEquals(expected.isLancerComparaison(), actual.isLancerComparaison());
+
   }
 
   private static void assertEquals(OtfaCampagneItem expected, OtfaCampagneItem actual) {
@@ -173,6 +181,9 @@
     assertEquals(expected.getScenarioNom(), actual.getScenarioNom());
     assertEquals(expected.getCoeurName(), actual.getCoeurName());
     assertEquals(expected.isLaunchCompute(), actual.isLaunchCompute());
+    assertEquals(expected.getCheminCSV(), actual.getCheminCSV());
+    assertEquals(expected.getRapport(), actual.getRapport());
+    assertEquals(expected.isRapportOnTransitoire(), actual.isRapportOnTransitoire());
   }
 
   @Override

Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml	2014-03-04 23:29:03 UTC (rev 8650)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/resources/otfa/campagne.otfa.xml	2014-03-04 23:30:10 UTC (rev 8651)
@@ -30,12 +30,18 @@
 				<Scenario>Sc_M3-0_c9</Scenario>
 				<Coeur>Crue9</Coeur>
 				<LancerCalcul>true</LancerCalcul>
+        <Transitoire>true</Transitoire>
+        <Rapport>rapport1/test.xml</Rapport>
+        <CheminCSV>cheminCsv1</CheminCSV>
 			</Reference>
 			<Cible>
  				<Etude>C:/etudes/v10.2/Etu3-0</Etude>
 				<Scenario>Sc_M3-0_c9</Scenario>
 				<Coeur>Crue10.1</Coeur>
 				<LancerCalcul>true</LancerCalcul>
+        <Transitoire>false</Transitoire>
+        <Rapport>rapport2/test.xml</Rapport>
+        <CheminCSV>cheminCsv2</CheminCSV>
 			</Cible>
 		</LigneCampagne>
 		<LigneCampagne Numero="2">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8650] trunk/soft/fudaa-crue/crue-core/src/main/resources /org/fudaa/dodico/crue/common/businessMessages.properties

[<de...@us...>]

Revision: 8650
          http://sourceforge.net/p/fudaa/svn/8650
Author:   deniger
Date:     2014-03-04 23:29:03 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-617

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties

Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-03-04 23:23:56 UTC (rev 8649)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2014-03-04 23:29:03 UTC (rev 8650)
@@ -1,6 +1,8 @@
 #Par convention, les fichiers de traduction sont en ISO-8859-1
 
 otfa.validator.cibleEtuFileNotFound=Le fichier etu cible {0} n''existe pas
+otfa.validator.reportNotFoundReference=Le rapport {0} n''existe pas pour la r\u00e9f\u00e9rence
+otfa.validator.reportNotFoundCible=Le rapport {0} n''existe pas pour la cible
 otfa.scenarionNotFound.detail=Le sc\u00e9nario {0} n''a pas \u00e9t\u00e9 trouv\u00e9
 otfa.scenarioNotFound=Sc\u00e9nario introuvable
 migrate.isChildrenFilesTester.isNotChild=Le fichier {0} n''est pas contenu dans le r\u00e9pertoire de l''\u00e9tude initiale
@@ -1269,4 +1271,28 @@
 otfa.avancement.line=Traitement de la ligne OTFA {0}/{1}
 otfa.avancement.unlock=D\u00e9blocage des fichier etu
 otfa.avancement.deleteRunAvant=Effacement des runs avant le lancement
-otfa.avancement.deleteRunApres=Effacement des runs apr\u00e8s le lancement
\ No newline at end of file
+otfa.avancement.deleteRunApres=Effacement des runs apr\u00e8s le lancement
+Transveral.Type=Profils en travers
+ProfilEnLong.Type=Profils en long
+Temporel.Type=Temporel
+MultiVar.Type=Multi-Variables
+RPTG.Type=Pr\u00e9-traitement g\u00e9om\u00e9trique
+Planimetry.Type=Planim\u00e9trie
+otfa.report.typeUnknown=Le rapport {0} est de type inconnu
+otfa.report.notFound=Le rapport {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+otfa.report.fileNotFound=Le fichier {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+RunCourant.DisplayName=Courant
+Variable.Time.TempsSce=Temps SCE
+Variable.Time.TempsSimu=Temps Simu
+Variable.Time.NomCalc=Nom du calcul
+Expression.Emh.Nom=Nom de l'EMH
+Expression.Emh.Commentaire=Commentaire de l'EMH
+Expression.Profil.Commentaire=Commentaire du profil
+notComputedBecauseCycle=Non calcul\u00e9e car la variableFC {0} comporte un cycle
+aggregation.variableNotCorrect=La fonction d'aggr\u00e9gation attend un nom de variable et non une valeur. Exemple MaxSurT("Z") et non MaxSurT(Z)
+formule.stat.moy=Moyenne
+formule.stat.max=Maximum
+formule.stat.min=Minimum
+formule.stat.somme=Somme
+aggregation.internError=Erreur interne: pas de valeur \u00e0 traiter
+aggregation.noRun=Erreur interne: pas de Run sp\u00e9cifi\u00e9
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8648] trunk/soft/fudaa-crue/ui-application/src/main/ resources/etc/fudaacrueDev.conf

[<de...@us...>]

Revision: 8648
          http://sourceforge.net/p/fudaa/svn/8648
Author:   deniger
Date:     2014-03-04 11:15:49 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-543: deboguage

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf

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	2014-03-04 11:11:45 UTC (rev 8647)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2014-03-04 11:15:49 UTC (rev 8648)
@@ -3,7 +3,8 @@
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
-default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc"  -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true -J-Ddebug-swing=true"
+#ajouter -J-Ddebug-swing=true pour vérifier que les composants sont toujours dessinés dans le thread swing (EDT)
+default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc"  -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8647] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8647
          http://sourceforge.net/p/fudaa/svn/8647
Author:   deniger
Date:     2014-03-04 11:11:45 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
CRUE-543: deboguage

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
    trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/CheckThreadViolationRepaintManager.java

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	2014-03-04 09:33:20 UTC (rev 8646)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2014-03-04 11:11:45 UTC (rev 8647)
@@ -3,7 +3,7 @@
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
-default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc"  -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true"
+default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc"  -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true -J-Ddebug-swing=true"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch

Added: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/CheckThreadViolationRepaintManager.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/CheckThreadViolationRepaintManager.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/CheckThreadViolationRepaintManager.java	2014-03-04 11:11:45 UTC (rev 8647)
@@ -0,0 +1,155 @@
+/*
+ GPL 2
+ */
+
+package org.fudaa.fudaa.crue.branding;
+
+import java.lang.ref.WeakReference;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.RepaintManager;
+import javax.swing.SwingUtilities;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CheckThreadViolationRepaintManager extends RepaintManager {
+
+  // it is recommended to pass the complete check
+  private boolean completeCheck = true;
+  private WeakReference<JComponent> lastComponent;
+
+  public CheckThreadViolationRepaintManager(boolean completeCheck) {
+    this.completeCheck = completeCheck;
+  }
+
+  public CheckThreadViolationRepaintManager() {
+    this(true);
+  }
+
+  public boolean isCompleteCheck() {
+    return completeCheck;
+  }
+
+  public void setCompleteCheck(boolean completeCheck) {
+    this.completeCheck = completeCheck;
+  }
+
+  public synchronized void addInvalidComponent(JComponent component) {
+    checkThreadViolations(component);
+    super.addInvalidComponent(component);
+  }
+
+  public void addDirtyRegion(JComponent component, int x, int y, int w, int h) {
+    checkThreadViolations(component);
+    super.addDirtyRegion(component, x, y, w, h);
+  }
+
+  private void checkThreadViolations(JComponent c) {
+    if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
+      boolean repaint = false;
+      boolean fromSwing = false;
+      boolean imageUpdate = false;
+      StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+      for (StackTraceElement st : stackTrace) {
+        if (repaint && st.getClassName().startsWith("javax.swing.")
+                && // for details see
+                // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
+                !st.getClassName().startsWith("javax.swing.SwingWorker")) {
+          fromSwing = true;
+        }
+        if (repaint && "imageUpdate".equals(st.getMethodName())) {
+          imageUpdate = true;
+        }
+        if ("repaint".equals(st.getMethodName())) {
+          repaint = true;
+          fromSwing = false;
+        }
+      }
+      if (imageUpdate) {
+                //assuming it is java.awt.image.ImageObserver.imageUpdate(...)
+        //image was asynchronously updated, that's ok
+        return;
+      }
+      if (repaint && !fromSwing) {
+        //no problems here, since repaint() is thread safe
+        return;
+      }
+      //ignore the last processed component
+      if (lastComponent != null && c == lastComponent.get()) {
+        return;
+      }
+      lastComponent = new WeakReference<JComponent>(c);
+      violationFound(c, stackTrace);
+    }
+  }
+
+  protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
+    System.out.println();
+    System.out.println("EDT violation detected");
+    System.out.println(c);
+    for (StackTraceElement st : stackTrace) {
+      System.out.println("\tat " + st);
+    }
+  }
+
+  public static void main(String[] args) throws Exception {
+    //set CheckThreadViolationRepaintManager
+    RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+    //Valid code
+    SwingUtilities.invokeAndWait(new Runnable() {
+      public void run() {
+        test();
+      }
+    });
+    System.out.println("Valid code passed...");
+    repaintTest();
+    System.out.println("Repaint test - correct code");
+    //Invalide code (stack trace expected)
+    test();
+  }
+
+  static void test() {
+    JFrame frame = new JFrame("Am I on EDT?");
+    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    frame.add(new JButton("JButton"));
+    frame.pack();
+    frame.setVisible(true);
+    frame.dispose();
+  }
+
+  //this test must pass
+  static void imageUpdateTest() {
+    JFrame frame = new JFrame();
+    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    JEditorPane editor = new JEditorPane();
+    frame.setContentPane(editor);
+    editor.setContentType("text/html");
+    //it works with no valid image as well
+    editor.setText("<html><img src=\"file:\\lala.png\"></html>");
+    frame.setSize(300, 200);
+    frame.setVisible(true);
+  }
+
+  private static JButton test;
+
+  static void repaintTest() {
+    try {
+      SwingUtilities.invokeAndWait(new Runnable() {
+        public void run() {
+          test = new JButton();
+          test.setSize(100, 100);
+        }
+      });
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    // repaint(Rectangle) should be ok
+    test.repaint(test.getBounds());
+    test.repaint(0, 0, 100, 100);
+    test.repaint();
+  }
+}

Modified: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2014-03-04 09:33:20 UTC (rev 8646)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2014-03-04 11:11:45 UTC (rev 8647)
@@ -7,6 +7,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.RepaintManager;
 import javax.swing.border.Border;
 import org.openide.awt.Toolbar;
 import org.openide.awt.ToolbarPool;
@@ -62,6 +63,9 @@
       perspective.add(buttons, BorderLayout.SOUTH);
       perspective.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
     }
+    if ("true".equals(System.getProperty("debug-swing"))) {
+      RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+    }
   }
 
   public static Toolbar getPerspectiveToolbar(Toolbar[] in) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8644] trunk/soft/fudaa-crue/ui-report/nb-configuration. xml

[<de...@us...>]

Revision: 8644
          http://sourceforge.net/p/fudaa/svn/8644
Author:   deniger
Date:     2014-02-28 11:21:07 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Modification de ?\194?\171 Build/Compile/Java Platform

Removed Paths:
-------------
    trunk/soft/fudaa-crue/ui-report/nb-configuration.xml

Deleted: trunk/soft/fudaa-crue/ui-report/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
+++ trunk/soft/fudaa-crue/ui-report/nb-configuration.xml	2014-02-28 11:21:07 UTC (rev 8644)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-        <netbeans.compile.on.save>test</netbeans.compile.on.save>
-    </properties>
-</project-shared-configuration>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8643] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8643
          http://sourceforge.net/p/fudaa/svn/8643
Author:   deniger
Date:     2014-02-28 11:18:52 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Modification de ?\194?\171 Build/Compile/Java Platform

Removed Paths:
-------------
    trunk/soft/fudaa-crue/crue-io/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-common/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-post/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-study/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml

Deleted: trunk/soft/fudaa-crue/crue-io/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/crue-io/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <config-data xmlns="http://www.netbeans.org/ns/maven-config-data/1">
-        <configurations/>
-    </config-data>
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-        <netbeans.compile.on.save>test</netbeans.compile.on.save>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-common/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-common/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-post/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-post/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-study/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-study/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

Deleted: trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
+++ trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml	2014-02-28 11:18:52 UTC (rev 8643)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-       <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8642] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8642
          http://sourceforge.net/p/fudaa/svn/8642
Author:   deniger
Date:     2014-02-28 11:13:25 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Modification de ?\194?\171 Build/Compile/Java Platform 

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-io/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-post/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-report/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-study/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
    trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml

Modified: trunk/soft/fudaa-crue/crue-io/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/crue-io/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <config-data xmlns="http://www.netbeans.org/ns/maven-config-data/1">
         <configurations/>
     </config-data>
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
         <netbeans.compile.on.save>test</netbeans.compile.on.save>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-commandline/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-comparison/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-emh/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-loader/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-loi/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
         <netbeans.compile.on.save>none</netbeans.compile.on.save>
-        <netbeans.hint.jdkPlatform>JDK_1.7_051</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-otfa/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-planimetry/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-post/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-post/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-report/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-report/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
         <netbeans.compile.on.save>test</netbeans.compile.on.save>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-study/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-study/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Modified: trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
         <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>

Modified: trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml	2014-02-28 10:46:31 UTC (rev 8641)
+++ trunk/soft/fudaa-crue/ui-wrapper/nb-configuration.xml	2014-02-28 11:13:25 UTC (rev 8642)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+       <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8639] trunk/soft/fudaa-crue/ui-post/src

[<de...@us...>]

Revision: 8639
          http://sourceforge.net/p/fudaa/svn/8639
Author:   deniger
Date:     2014-02-25 21:32:32 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-post/src/test/
    trunk/soft/fudaa-crue/ui-post/src/test/java/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8638] trunk/soft/fudaa-crue/ui-options/src

[<de...@us...>]

Revision: 8638
          http://sourceforge.net/p/fudaa/svn/8638
Author:   deniger
Date:     2014-02-25 21:31:34 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-options/src/test/
    trunk/soft/fudaa-crue/ui-options/src/test/java/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8637] trunk/soft/fudaa-crue/ui-modelling/src/main/java/ org/fudaa/fudaa/crue/modelling/list/ AbstractModellingListEditionTopComponent.java

[<de...@us...>]

Revision: 8637
          http://sourceforge.net/p/fudaa/svn/8637
Author:   deniger
Date:     2014-02-25 21:31:11 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java	2014-02-25 21:25:49 UTC (rev 8636)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java	2014-02-25 21:31:11 UTC (rev 8637)
@@ -1,12 +1,12 @@
 package org.fudaa.fudaa.crue.modelling.list;
 
 import java.awt.Rectangle;
+import java.awt.dnd.Autoscroll;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 import java.awt.event.MouseMotionListener;
 import java.util.List;
-import javax.swing.JComponent;
 import org.apache.commons.lang.ArrayUtils;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -48,19 +48,9 @@
         }
       }
     });
-//    outlineView.scrollRectToVisible(null);
-    MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
-      public void mouseDragged(MouseEvent e) {
-        System.err.println("e " + e.getY() + " " + outlineView.getOutline().getAutoscrolls());
-        Rectangle r = new Rectangle(0, e.getY(), 10, 10);
-//        outlineView.scrollRectToVisible(r);
-//        ((JComponent) e.getSource()).scrollRectToVisible(r);
-        outlineView.getOutline().scrollRectToVisible(r);
-      }
+//    outlineView.setAutoscrolls(false);
+//    outlineView.getOutline().setAutoscrolls(true);
 
-    };
-    outlineView.getOutline().addMouseMotionListener(doScrollRectToVisible);
-
   }
 
   /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8636] trunk/soft/fudaa-crue/ui-commandline/src

[<de...@us...>]

Revision: 8636
          http://sourceforge.net/p/fudaa/svn/8636
Author:   deniger
Date:     2014-02-25 21:25:49 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-commandline/src/test/
    trunk/soft/fudaa-crue/ui-commandline/src/test/java/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8635] trunk/soft/fudaa-crue/ui-branding/src

[<de...@us...>]

Revision: 8635
          http://sourceforge.net/p/fudaa/svn/8635
Author:   deniger
Date:     2014-02-25 21:25:24 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-branding/src/test/
    trunk/soft/fudaa-crue/ui-branding/src/test/java/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8634] trunk/soft/fudaa-crue/ui-common/src/main/resources /org/fudaa/fudaa/crue/common

[<de...@us...>]

Revision: 8634
          http://sourceforge.net/p/fudaa/svn/8634
Author:   deniger
Date:     2014-02-25 21:20:02 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/editor/
    trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/editor/Bundle.properties

Copied: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/editor/Bundle.properties (from rev 8606, trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/editor/Bundle.properties	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/editor/Bundle.properties	2014-02-25 21:20:02 UTC (rev 8634)
@@ -0,0 +1,4 @@
+CTL_DialogTitleFilesAndDirs=Choisir un fichier ou un r\u00e9pertoire
+CTL_DialogTitleFiles=Choisir un fichier
+CTL_DialogTitleDirs=Choisir un r\u00e9pertoire
+ACSD_FileEditor=N/A
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8633] trunk/soft/fudaa-crue/ui-modelling/src/main/java/ org/fudaa/fudaa/crue/modelling/listener/ExplorerManagerListenerHelper.java

[<de...@us...>]

Revision: 8633
          http://sourceforge.net/p/fudaa/svn/8633
Author:   deniger
Date:     2014-02-25 21:19:20 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/ExplorerManagerListenerHelper.java

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/ExplorerManagerListenerHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/ExplorerManagerListenerHelper.java	2014-02-25 21:18:55 UTC (rev 8632)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/ExplorerManagerListenerHelper.java	2014-02-25 21:19:20 UTC (rev 8633)
@@ -19,7 +19,7 @@
 public class ExplorerManagerListenerHelper implements ExplorerManager.Provider {
 
   protected final ExplorerManager em = new ExplorerManager();
-  private AbstractModellingTopComponent topComponent;
+  private final AbstractModellingTopComponent topComponent;
 
   public ExplorerManagerListenerHelper(AbstractModellingTopComponent topComponent) {
     this.topComponent = topComponent;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8632] trunk/soft/fudaa-crue/ui-common/src/main/java/org/ fudaa/fudaa/crue/common/InitPerspectiveInstaller.java

[<de...@us...>]

Revision: 8632
          http://sourceforge.net/p/fudaa/svn/8632
Author:   deniger
Date:     2014-02-25 21:18:55 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java	2014-02-25 21:18:10 UTC (rev 8631)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java	2014-02-25 21:18:55 UTC (rev 8632)
@@ -4,6 +4,7 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.beans.PropertyEditorManager;
+import java.io.File;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -13,6 +14,7 @@
 import org.fudaa.ebli.palette.BPalettePlage;
 import static org.fudaa.fudaa.crue.common.Bundle.*;
 import org.fudaa.fudaa.crue.common.editor.CustomColorChooser;
+import org.fudaa.fudaa.crue.common.editor.FileEditor;
 import org.fudaa.fudaa.crue.common.editor.LocalDateTimeEditor;
 import org.fudaa.fudaa.crue.common.pdt.DurationPropertyEditor;
 import org.fudaa.fudaa.crue.common.pdt.PrendreClicheFinPermanentEditor;
@@ -89,6 +91,10 @@
     DurationPropertyEditor.registerEditor();
     LocalDateTimeEditor.registerEditor();
     PrendreClicheFinPermanentEditor.registerAllClicheEditors();
+    //https://fudaa-project.atlassian.net/browse/CRUE-633 
+    //TODO a enlever des que l'on pourra passer à une version de Netbeans >7.4
+    //La version 7.4 corrige le probleme mais apporte des régressions sur la persistances des informations sur les OutlineView. <br>
+    PropertyEditorManager.registerEditor(File.class, FileEditor.class);
     PropertyEditorManager.registerEditor(Color.class, CustomColorChooser.class);
     Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
     for (TopComponent topComponent : opened) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8631] trunk/soft/fudaa-crue/ui-report/src/main/java/org/ fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java

[<de...@us...>]

Revision: 8631
          http://sourceforge.net/p/fudaa/svn/8631
Author:   deniger
Date:     2014-02-25 21:18:10 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java	2014-02-25 21:17:32 UTC (rev 8630)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java	2014-02-25 21:18:10 UTC (rev 8631)
@@ -67,14 +67,14 @@
     axeX.setSpecificFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
     axeX.setSpecificDetailFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
     axeX.setUserObject(propertyHorizontal);
-    EGCourbe selectedComponent = uiController.getEGGrapheSimpleModel().getSelectedComponent();
-    Object selectedKey = null;
-    if (selectedComponent != null && selectedComponent.getModel() != null) {
-      selectedKey = ((CourbeModelWithKey) selectedComponent.getModel()).getKey();
-      if (ReportVerticalTimeKey.isTimeKey(selectedKey)) {
-        selectedKey = null;
-      }
-    }
+//    EGCourbe selectedComponent = uiController.getEGGrapheSimpleModel().getSelectedComponent();
+//    Object selectedKey = null;
+//    if (selectedComponent != null && selectedComponent.getModel() != null) {
+//      selectedKey = ((CourbeModelWithKey) selectedComponent.getModel()).getKey();
+//      if (ReportVerticalTimeKey.isTimeKey(selectedKey)) {
+//        selectedKey = null;
+//      }
+//    }
     Map<String, List<ReportRunKey>> keyByVar = ReportRunVariableHelper.getByEmh(content.reportRunEmhs);
     List<ResultatTimeKey> times = reportService.getRangeSelectedTimeKeys();
     List<EGCourbeSimple> courbes = new ArrayList<EGCourbeSimple>();
@@ -98,9 +98,9 @@
               final EGCourbePersist persist = content.courbeconfigs.get(key);
               applyPersistConfig(persist, courbe);
               courbes.add(courbe);
-              if (selectedKey == null) {
-                selectedKey = key;
-              }
+//              if (selectedKey == null) {
+//                selectedKey = key;
+//              }
             }
           }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8630] trunk/soft/fudaa-crue/ui-study/src/main/java/org/ fudaa/fudaa/crue/study/services/GlobalStateManager.java

[<de...@us...>]

Revision: 8630
          http://sourceforge.net/p/fudaa/svn/8630
Author:   deniger
Date:     2014-02-25 21:17:32 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java

Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java	2014-02-25 21:16:52 UTC (rev 8629)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/GlobalStateManager.java	2014-02-25 21:17:32 UTC (rev 8630)
@@ -88,6 +88,7 @@
     pnInfos.add(jlPost);
     pnInfos.add(txtPost);
     final JScrollPane scrollPane = new SimpleScrollPane();
+    scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
     scrollPane.setViewportBorder(BorderFactory.createEmptyBorder());
     scrollPane.setBorder(BorderFactory.createEmptyBorder());
     scrollPane.setViewportView(pnInfos);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8629] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8629
          http://sourceforge.net/p/fudaa/svn/8629
Author:   deniger
Date:     2014-02-25 21:16:52 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
backup de la base

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/FileEditor.java
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/StringCustomEditor.java

Modified: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2014-02-25 21:16:02 UTC (rev 8628)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java	2014-02-25 21:16:52 UTC (rev 8629)
@@ -37,7 +37,7 @@
     Toolbar state = getStateToolbar(toolbars);
     if (state != null) {
       state.setOpaque(false);
-      state.setBorder(BorderFactory.createCompoundBorder(state.getBorder(), BorderFactory.createEmptyBorder(5, 5, 0, 0)));
+      state.setBorder(BorderFactory.createCompoundBorder(state.getBorder(), BorderFactory.createEmptyBorder(1, 1, 0, 0)));
     }
     Toolbar perspective = getPerspectiveToolbar(toolbars);
     if (perspective != null) {

Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/FileEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/FileEditor.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/FileEditor.java	2014-02-25 21:16:52 UTC (rev 8629)
@@ -0,0 +1,541 @@
+/*
+ Copier depuis le source Netbeans
+ */
+package org.fudaa.fudaa.crue.common.editor;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.KeyboardFocusManager;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditorSupport;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.Action;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JScrollBar;
+import javax.swing.KeyStroke;
+import org.openide.nodes.Node;
+import org.openide.explorer.propertysheet.ExPropertyEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
+
+/**
+ * https://fudaa-project.atlassian.net/browse/CRUE-633 TODO a enlever des que l'on pourra passer à une version de Netbeans >7.4
+ *
+ * La version 7.4 corrige le probleme mais apporte des régressions sur la persistances des informations sur les OutlineView. <br>
+ *
+ * PropertyEditor for * <code>java.io.File</code>.
+ *
+ * @author Jaroslav Tulach, David Strupl, Peter Zavadsky, Jesse Glick
+ */
+public class FileEditor extends PropertyEditorSupport implements ExPropertyEditor, PropertyChangeListener {
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_SHOW_DIRECTORIES = "directories"; //NOI18N
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_SHOW_FILES = "files"; //NOI18N
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_FILTER = "filter"; //NOI18N
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_CURRENT_DIR = "currentDir"; //NOI18N
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_BASE_DIR = "baseDir"; // NOI18N
+
+  /**
+   * Name of the property obtained from the feature descriptor.
+   */
+  static final String PROPERTY_FILE_HIDING = "file_hiding"; // NOI18N
+
+  /**
+   * Openning mode.
+   */
+  private int mode = JFileChooser.FILES_AND_DIRECTORIES;
+
+  /**
+   * Flag indicating whether to choose directories. Default value is <code>true</code>.
+   */
+  private boolean directories = true;
+  /**
+   * Flag indicating whether to choose files. Default value is <code>true</code>.
+   */
+  private boolean files = true;
+  /**
+   * Flag indicating whether to hide files marked as hidden. Default value is <code>false</code>.
+   */
+  private boolean fileHiding = false;
+  /**
+   * Filter for files to show.
+   */
+  private javax.swing.filechooser.FileFilter fileFilter;
+  /**
+   * Current firectory.
+   */
+  private File currentDirectory;
+  /**
+   * Base directory to which to show relative path, if is set.
+   */
+  private File baseDirectory;
+
+  /**
+   * Caches last used directory.
+   */
+  static File lastCurrentDir;
+
+  private PropertyEnv env;
+
+  /**
+   * Cached chooser. If you don't cache it, MountIterator in core flickers and behaves weirdly, because apparently PropertyPanel will call
+   * getCustomEditor repeatedly and refresh the display each time. XXX MountIterator is dead so is this still necessary? -jglick
+   */
+  private JFileChooser chooser;
+
+  /**
+   * whether the value can be edited -- default to true
+   */
+  private boolean editable = true;
+
+  /**
+   * This method is called by the IDE to pass the environment to the property editor.
+   *
+   * @param env Environment passed by the ide.
+   */
+  public void attachEnv(PropertyEnv env) {
+    this.env = env;
+
+    // clearing to defaults
+    directories = true;
+    files = true;
+    fileFilter = null;
+    fileHiding = false;
+
+    Object dirs = env.getFeatureDescriptor().getValue(PROPERTY_SHOW_DIRECTORIES);
+    if (dirs instanceof Boolean) {
+      directories = ((Boolean) dirs).booleanValue();
+    } // XXX else if != null, warn
+    Object fil = env.getFeatureDescriptor().getValue(PROPERTY_SHOW_FILES);
+    if (fil instanceof Boolean) {
+      files = ((Boolean) fil).booleanValue();
+    } // XXX else if != null, warn
+    Object filter = env.getFeatureDescriptor().getValue(PROPERTY_FILTER);
+    if (filter instanceof FilenameFilter) {
+      fileFilter = new DelegatingFilenameFilter((FilenameFilter) filter);
+    } else if (filter instanceof javax.swing.filechooser.FileFilter) {
+      fileFilter = (javax.swing.filechooser.FileFilter) filter;
+    } else if (filter instanceof java.io.FileFilter) {
+      fileFilter = new DelegatingFileFilter((java.io.FileFilter) filter);
+    } // XXX else if != null, warn
+
+    Object curDir = env.getFeatureDescriptor().getValue(PROPERTY_CURRENT_DIR);
+    if (curDir instanceof File) {
+      currentDirectory = (File) curDir;
+      if (!currentDirectory.isDirectory()) {
+        Logger.getAnonymousLogger().warning("java.io.File will not accept currentDir=" + currentDirectory); // NOI18N
+        currentDirectory = null;
+      }
+    } // XXX else if != null, warn
+
+    Object baseDir = env.getFeatureDescriptor().getValue(PROPERTY_BASE_DIR);
+    if (baseDir instanceof File) {
+      baseDirectory = (File) baseDir;
+      // As baseDir accept only directories in their absolute form.
+      if (!baseDirectory.isDirectory() || !baseDirectory.isAbsolute()) {
+        Logger.getAnonymousLogger().warning("java.io.File will not accept baseDir=" + baseDirectory); // NOI18N
+        baseDirectory = null;
+      }
+    } // XXX else if != null, warn
+    if (files) {
+      mode = directories ? JFileChooser.FILES_AND_DIRECTORIES
+              : JFileChooser.FILES_ONLY;
+    } else {
+      mode = directories ? JFileChooser.DIRECTORIES_ONLY
+              : JFileChooser.FILES_AND_DIRECTORIES; // both false, what now? XXX warn
+    }
+
+    Object fileHide = env.getFeatureDescriptor().getValue(PROPERTY_FILE_HIDING);
+    if (fileHide instanceof Boolean) {
+      fileHiding = ((Boolean) fileHide).booleanValue();
+    }
+
+    if (env.getFeatureDescriptor() instanceof Node.Property) {
+      Node.Property prop = (Node.Property) env.getFeatureDescriptor();
+      editable = prop.canWrite();
+    }
+  }
+
+  /**
+   * Returns human readable form of the edited value.
+   *
+   * @return string reprezentation
+   */
+  public String getAsText() {
+    File file = (File) getValue();
+    if (file == null) {
+      return ""; // NOI18N
+    }
+    String path = file.getPath();
+    // Dot is more friendly to people though Java itself would prefer blank:
+    if ("".equals(path)) {
+      path = "."; // NOI18N
+    }
+    return path;
+  }
+
+  /**
+   * Parses the given string and should create a new instance of the edited object.
+   *
+   * @param str string reprezentation of the file (used as a parameter for File).
+   * @throws IllegalArgumentException If the given string cannot be parsed
+   */
+  public void setAsText(String str) throws IllegalArgumentException {
+    if (str == null) {
+      throw new IllegalArgumentException("null"); // NOI18N
+    }
+    if ("".equals(str)) { // NOI18N
+      setValue(null);
+      return;
+    }
+    // See getAsText.
+    if (".".equals(str)) {
+      str = ""; // NOI18N
+    }
+    setValue(new File(str));
+  }
+
+  /**
+   * Custon editor.
+   *
+   * @return Returns custom editor component.
+   */
+  public Component getCustomEditor() {
+    if (!editable) {
+      String info = "";
+      Object curVal = getValue();
+      if (curVal instanceof java.io.File) {
+        info = ((java.io.File) curVal).getAbsolutePath();
+      }
+      return new StringCustomEditor(info, false, true, null, this, env);
+    }
+    if (chooser == null) {
+      chooser = createHackedFileChooser();
+
+      File originalFile = (File) getValue();
+      if (originalFile != null && !originalFile.isAbsolute() && baseDirectory != null) {
+        originalFile = new File(baseDirectory, originalFile.getPath());
+      }
+      if (currentDirectory != null) {
+        chooser.setCurrentDirectory(currentDirectory);
+      } else if (originalFile != null && originalFile.getParentFile() != null) {
+        chooser.setCurrentDirectory(originalFile.getParentFile());
+        chooser.setSelectedFile(originalFile);
+      } else if (lastCurrentDir != null) {
+        chooser.setCurrentDirectory(lastCurrentDir);
+      }
+      chooser.setFileSelectionMode(mode);
+      if (fileFilter != null) {
+        chooser.setFileFilter(fileFilter);
+      }
+      switch (mode) {
+        case JFileChooser.FILES_AND_DIRECTORIES:
+          chooser.setDialogTitle(getString("CTL_DialogTitleFilesAndDirs"));
+          break;
+        case JFileChooser.FILES_ONLY:
+          chooser.setDialogTitle(getString("CTL_DialogTitleFiles"));
+          break;
+        case JFileChooser.DIRECTORIES_ONLY:
+          chooser.setDialogTitle(getString("CTL_DialogTitleDirs"));
+          break;
+      }
+      chooser.setFileHidingEnabled(fileHiding);
+
+      chooser.setControlButtonsAreShown(false);
+
+      chooser.addPropertyChangeListener(
+              JFileChooser.SELECTED_FILE_CHANGED_PROPERTY,
+              this
+      );
+
+      HelpCtx.setHelpIDString(chooser, getHelpCtx().getHelpID());
+    }
+
+    return chooser;
+  }
+
+  /**
+   * Implements PropertyEditor method.
+   *
+   * @return Returns true.
+   */
+  public boolean supportsCustomEditor() {
+    return true;
+  }
+
+  /**
+   * Should create a string insertable to the newly generated source code.
+   *
+   * @return initialization string
+   */
+  public String getJavaInitializationString() {
+    File value = (File) getValue();
+    if (value == null) {
+      return "null"; // NOI18N
+    } else {
+            // [PENDING] not a full escape of filenames, but enough to at least
+      // handle normal Windows backslashes
+      if (baseDirectory != null && !value.isAbsolute()) {
+        return "new java.io.File(" // NOI18N
+                + stringify(baseDirectory.getPath())
+                + ", " // NOI18N
+                + stringify(value.getPath())
+                + ")"; // NOI18N
+      } else {
+        return "new java.io.File(" // NOI18N
+                + stringify(value.getAbsolutePath())
+                + ")"; // NOI18N
+      }
+    }
+  }
+
+  static String stringify(String in) {
+    StringBuilder buf = new StringBuilder(in.length() * 2 + 2);
+    buf.append('"'); // NOI18N
+    for (int i = 0; i < in.length(); i++) {
+      char c = in.charAt(i);
+      if (c == '\\' || c == '"') { // NOI18N
+        buf.append('\\'); // NOI18N
+      }
+      buf.append(c);
+    }
+    buf.append('"'); // NOI18N
+    return buf.toString();
+  }
+
+  /**
+   * Gets help context.
+   */
+  private HelpCtx getHelpCtx() {
+    return new HelpCtx(FileEditor.class);
+  }
+
+  /**
+   * Gets localized string. Helper method.
+   */
+  private static String getString(String key) {
+    return NbBundle.getBundle(FileEditor.class).getString(key);
+  }
+
+  /**
+   * Gets relative path of file to specified directory only for case the file is in directory tree.
+   *
+   * @param baseDir base directory
+   * @param file file which relative path to <code>baseDir</code> is needed
+   * @return relative path or <code>null</code> can't be resolved or if the <code>file</code> is not under <code>baseDir</code> tree
+   */
+  static String getChildRelativePath(File baseDir, File file) {
+        // Handle hypothetical weird situations where file is in baseDir
+    // but the prefixes do not match. E.g.:
+    // file=\foo\bar.txt (assumed to be on C:) baseDir=c:\foo
+    if (file.equals(baseDir)) {
+            // The empty pathname, not ".", is correct here I think...
+      // Try making new File(new File("/tmp", x)) for x in {".", ""}
+      return ""; // NOI18N
+    }
+    StringBuilder buf = new StringBuilder(file.getPath().length());
+    buf.append(file.getName());
+    for (File parent = file.getParentFile(); parent != null; parent = parent.getParentFile()) {
+      if (parent.equals(baseDir)) {
+        return buf.toString();
+      }
+      buf.insert(0, File.separatorChar);
+      buf.insert(0, parent.getName());
+    }
+    return null;
+  }
+
+  /**
+   * Property change listaner attached to the JFileChooser chooser.
+   */
+  public void propertyChange(PropertyChangeEvent e) {
+    JFileChooser chooser = (JFileChooser) e.getSource();
+    File f = chooser.getSelectedFile();
+    if (f == null) {
+      return;
+    }
+    if (!files && f.isFile()) {
+      return;
+    }
+    if (!directories && f.isDirectory()) {
+      return;
+    }
+
+    if (baseDirectory != null) {
+      String rel = getChildRelativePath(baseDirectory, f);
+      if (rel != null) {
+        f = new File(rel);
+      }
+    }
+
+        // use to be setValue(f) - the next line is
+    // workaround for JDK bug 4533419
+    // it should be returned back to setValue(f) after the
+    // mentioned bug is fixed in JDK.
+    setValue(new File(f.getPath()));
+
+    lastCurrentDir = chooser.getCurrentDirectory();
+  }
+
+    // XXX #18270. Enter doesn't work when expecting folder change,
+  // Accessibility problem. We hack default behaviour here.
+  /**
+   * Creates hacked fileChooser, responding on Enter the way it performs folder change.
+   */
+  public static JFileChooser createHackedFileChooser() {
+    JFileChooser chooser = new JFileChooser();
+    hackFileChooser(chooser);
+    return chooser;
+  }
+
+  /**
+   * Hacks fileChooser, responding on Enter the way it performs folder change.
+   */
+  public static void hackFileChooser(final JFileChooser chooser) {
+    chooser.getAccessibleContext().setAccessibleDescription(getString("ACSD_FileEditor"));
+
+        //issue 31605 - make escape work properly
+    //Get the existing action key on ESCAPE
+    // XXX is this hack still necessary?
+    final Object key = chooser.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).get(
+            KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+
+    Action close = new AbstractAction() {
+      public void actionPerformed(ActionEvent ae) {
+        Component comp = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+        if (key != null) {
+          //if there was an action, do it first
+          Action a = chooser.getActionMap().get(key);
+          if (a != null) {
+            a.actionPerformed(ae);
+          }
+        }
+        if (comp.getParent() == null) {
+                    //then we were editing a file name, and the editor
+          //was removed - we don't want to close the dialog
+          return;
+        }
+
+        Container c = chooser.getTopLevelAncestor();
+                //The action *may* have already hidden the panel (works
+        //intermittently)
+        if (c instanceof Dialog) {
+          if (((Dialog) c).isVisible()) {
+            ((Dialog) c).setVisible(false);
+            ((Dialog) c).dispose();
+          }
+        }
+      }
+    };
+    chooser.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+            KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close");
+    chooser.getActionMap().put("close", close);
+  }
+
+  private static class ButtonHider implements PropertyChangeListener {
+
+    public void propertyChange(PropertyChangeEvent pce) {
+      if (JFileChooser.CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY.equals(pce.getPropertyName())) {
+        JFileChooser jfc = (JFileChooser) pce.getSource();
+        try {
+          hideShowButtons(jfc, Boolean.TRUE.equals(pce.getNewValue()));
+        } catch (Exception e) {
+          Logger.getLogger(FileEditor.class.getName()).log(Level.WARNING, null, e);
+        }
+      }
+    }
+
+    private void hideShowButtons(Container cont, boolean val) {
+      if (cont instanceof JComboBox || cont instanceof JScrollBar) {
+        return;
+      }
+      Component[] c = cont.getComponents();
+      for (int i = 0; i < c.length; i++) {
+        if (c[i] instanceof Container) {
+          hideShowButtons((Container) c[i], val);
+        }
+        if (c[i] instanceof AbstractButton) {
+          c[i].setVisible(val);
+        }
+      }
+    }
+  }
+
+  /**
+   * Wraps java.io.FileFilter to javax.swing.filechooser.FileFilter.
+   */
+  static class DelegatingFileFilter extends javax.swing.filechooser.FileFilter {
+
+    private java.io.FileFilter filter;
+
+    public DelegatingFileFilter(java.io.FileFilter f) {
+      this.filter = f;
+    }
+
+    public boolean accept(File f) {
+      return filter.accept(f);
+    }
+
+    public String getDescription() {
+      // [PENDING] what should we return?
+      return null;
+    }
+
+  } // End of class DelegatingFileFilter.
+
+  /**
+   * Wraps FilenameFilter to javax.swing.filechooser.FileFilter.
+   */
+  static class DelegatingFilenameFilter extends javax.swing.filechooser.FileFilter {
+
+    private FilenameFilter filter;
+
+    public DelegatingFilenameFilter(FilenameFilter f) {
+      this.filter = f;
+    }
+
+    /**
+     * Calls the filenameFilter's accept method with arguments created from the original object f.
+     */
+    public boolean accept(File f) {
+      return filter.accept(f.getParentFile(), f.getName());
+    }
+
+    public String getDescription() {
+      // [PENDING] what should we return?
+      return null;
+    }
+  } // End of class DelegatingFilenameFilter.
+
+}

Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/StringCustomEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/StringCustomEditor.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/StringCustomEditor.java	2014-02-25 21:16:52 UTC (rev 8629)
@@ -0,0 +1,194 @@
+/*
+Copier depuis le source Netbeans
+ */
+
+package org.fudaa.fudaa.crue.common.editor;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+import org.openide.util.NbBundle;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.text.JTextComponent;
+import java.awt.BorderLayout;
+
+/**
+ * A custom editor for Strings.
+ *
+* @author Ian Formanek
+ * @version 1.00, Sep 21, 1998
+ */
+public class StringCustomEditor extends javax.swing.JPanel implements PropertyChangeListener {
+
+  static final long serialVersionUID = 7348579663907322425L;
+
+  boolean oneline = false;
+  String instructions = null;
+
+  private PropertyEnv env;
+
+  private PropertyEditor editor;
+
+  //enh 29294, provide one line editor on request
+  /**
+   * Create a StringCustomEditor.
+   *
+   * @param value the initial value for the string
+   * @param editable whether to show the editor in read only or read-write mode
+   * @param oneline whether the text component should be a single-line or multi-line component
+   * @param instructions any instructions that should be displayed
+   */
+  StringCustomEditor(String value, boolean editable, boolean oneline, String instructions, PropertyEditor editor, PropertyEnv env) {
+    this.oneline = oneline;
+    this.instructions = instructions;
+    this.env = env;
+    this.editor = editor;
+
+    this.env.setState(PropertyEnv.STATE_NEEDS_VALIDATION);
+    this.env.addPropertyChangeListener(this);
+
+    init(value, editable);
+  }
+
+  /**
+   * Initializes the Form
+   *
+   * @deprecated Nothing should be using this constructor
+   */
+  public StringCustomEditor(String s, boolean editable) {
+    init(s, editable);
+  }
+
+  private void init(String s, boolean editable) {
+    setLayout(new java.awt.BorderLayout());
+    if (oneline) {
+      textArea = new javax.swing.JTextField();
+      add(textArea, BorderLayout.CENTER);
+    } else {
+      textAreaScroll = new javax.swing.JScrollPane();
+      textArea = new javax.swing.JTextArea();
+      textAreaScroll.setViewportView(textArea);
+      add(textAreaScroll, BorderLayout.CENTER);
+    }
+    //original constructor code
+    textArea.setEditable(editable);
+
+    int from = 0;
+    int to = 0;
+    int ctn = 1;
+    while ((to = s.indexOf("\n", from)) > 0) {
+      ctn++;
+      from = to + 1;
+    }
+
+    textArea.setText(s);
+    if (textArea instanceof JTextArea && s.length() < 1E4) {
+      ((JTextArea) textArea).setWrapStyleWord(true);
+      ((JTextArea) textArea).setLineWrap(true);
+      setPreferredSize(new java.awt.Dimension(500, 300));
+    } else {
+      textArea.setMinimumSize(new java.awt.Dimension(100, 20));
+      if (textArea instanceof JTextArea) {
+                //Some gargantuan string value - do something that will
+        //show it.  Line wrap is off, otherwise it will spend
+        //minutes trying to calculate preferred size, etc.
+        setPreferredSize(new java.awt.Dimension(500, 300));
+      }
+    }
+
+    if (!editable) {
+            // hack to fix #9219
+      //TODO Fix this to use UIManager values, this is silly
+      JTextField hack = new JTextField();
+      hack.setEditable(false);
+      textArea.setBackground(hack.getBackground());
+      textArea.setForeground(hack.getForeground());
+    }
+
+    setBorder(BorderFactory.createEmptyBorder(12, 12, 0, 11));
+
+    textArea.getAccessibleContext().setAccessibleName(NbBundle.getBundle(StringCustomEditor.class).getString("ACS_TextArea")); //NOI18N
+    if (instructions == null) {
+      textArea.getAccessibleContext().setAccessibleDescription(NbBundle.getBundle(StringCustomEditor.class).getString("ACSD_TextArea")); //NOI18N
+    } else {
+      textArea.getAccessibleContext().setAccessibleDescription(instructions);
+    }
+    getAccessibleContext().setAccessibleDescription(NbBundle.getBundle(StringCustomEditor.class).getString("ACSD_CustomStringEditor")); //NOI18N
+    //Layout is not quite smart enough about text field along with variable
+    //size text area
+    int prefHeight;
+
+        //IZ 44152, Debugger can produce 512K+ length strings, avoid excessive
+    //iterations (which textArea.getPreferredSize() will definitely do)
+    if (s.length() < 1024) {
+      prefHeight = textArea.getPreferredSize().height + 8;
+    } else {
+      prefHeight = ctn * 8;
+    }
+
+    if (instructions != null) {
+      final JTextArea jta = new JTextArea(instructions);
+      jta.setEditable(false);
+      java.awt.Color c = UIManager.getColor("control");  //NOI18N
+      if (c != null) {
+        jta.setBackground(c);
+      } else {
+        jta.setBackground(getBackground());
+      }
+      jta.setLineWrap(true);
+      jta.setWrapStyleWord(true);
+      jta.setFont(getFont());
+      add(jta, BorderLayout.NORTH, 0);
+      jta.getAccessibleContext().setAccessibleName(
+              NbBundle.getMessage(StringCustomEditor.class,
+                      "ACS_Instructions")); //NOI18N
+      jta.getAccessibleContext().setAccessibleDescription(
+              NbBundle.getMessage(StringCustomEditor.class,
+                      "ACSD_Instructions")); //NOI18N
+      prefHeight += jta.getPreferredSize().height;
+      //jlf guidelines - auto select text when clicked
+      jta.addFocusListener(new java.awt.event.FocusListener() {
+        public void focusGained(java.awt.event.FocusEvent e) {
+          jta.setSelectionStart(0);
+          jta.setSelectionEnd(jta.getText().length());
+        }
+
+        public void focusLost(java.awt.event.FocusEvent e) {
+          jta.setSelectionStart(0);
+          jta.setSelectionEnd(0);
+        }
+      });
+    }
+    if (textArea instanceof JTextField) {
+      setPreferredSize(new java.awt.Dimension(300,
+              prefHeight));
+    }
+  }
+
+  public void addNotify() {
+    super.addNotify();
+    //force focus to the editable area
+    if (isEnabled() && isFocusable()) {
+      textArea.requestFocus();
+    }
+  }
+
+  /**
+   * @return Returns the property value that is result of the CustomPropertyEditor.
+   * @exception InvalidStateException when the custom property editor does not represent valid property value (and thus it should not be set)
+   */
+  private Object getPropertyValue() throws IllegalStateException {
+    return textArea.getText();
+  }
+
+  public void propertyChange(PropertyChangeEvent evt) {
+    if (PropertyEnv.PROP_STATE.equals(evt.getPropertyName()) && evt.getNewValue() == PropertyEnv.STATE_VALID) {
+      editor.setValue(getPropertyValue());
+    }
+  }
+
+  private javax.swing.JScrollPane textAreaScroll;
+  private JTextComponent textArea;
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8628] trunk/soft/fudaa-crue/ui-common/src/main/java/org/ fudaa/fudaa/crue/common/property/PropertyStringReadOnly.java

[<de...@us...>]

Revision: 8628
          http://sourceforge.net/p/fudaa/svn/8628
Author:   deniger
Date:     2014-02-25 21:16:02 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
backup de la base

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyStringReadOnly.java

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyStringReadOnly.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyStringReadOnly.java	2014-02-25 13:18:49 UTC (rev 8627)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyStringReadOnly.java	2014-02-25 21:16:02 UTC (rev 8628)
@@ -17,7 +17,7 @@
   }
 
   @Override
-  public String getValue() throws IllegalAccessException, InvocationTargetException {
+  public String getValue() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
     return value;
   }
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8626] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java

[<de...@us...>]

Revision: 8626
          http://sourceforge.net/p/fudaa/svn/8626
Author:   deniger
Date:     2014-02-14 21:35:48 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java	2014-02-14 21:35:39 UTC (rev 8625)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java	2014-02-14 21:35:48 UTC (rev 8626)
@@ -202,6 +202,13 @@
     }
 
     @Override
+    public GrPoint getVertexForObject(int _ind, int vertex) {
+      GrPoint p = new GrPoint();
+      point(p, _ind, true);
+      return p;
+    }
+
+    @Override
     public BuTable createValuesTable(final ZCalqueAffichageDonneesInterface _layer) {
       return null;
     }
@@ -229,10 +236,7 @@
       return false;
     }
 
-    @Override
-    public GrPoint getVertexForObject(int _ind, int vertex) {
-      return null;
-    }
+    
   }
 
   public ZModelePoint getTmpModel() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8625] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8625
          http://sourceforge.net/p/fudaa/svn/8625
Author:   deniger
Date:     2014-02-14 21:35:39 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java
    trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
    trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
    trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java
    trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
    trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
    trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java
    trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
    trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp

Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -40,24 +40,10 @@
     data.setSto(readBinaire(this, Crue9FileFormatFactory.getSTOFileFormat(), FilesForTest.STO_ETU30_M30, data).getMetier());
     ValidatorAndLoaderResultatCrue9.validFcbProfils(read.getMetier(), data, log);
     AbstractIOBinaryTestCase.testAnalyser(log);
-    assertTrue(getResultatPosition(data, "ST_B5_AMONT") > 0);
-    assertTrue(getResultatPosition(data, "ST_B5_AVAL") > 0);
-    assertTrue(getResultatPosition(data, "ST_B8_AMONT") > 0);
-    assertTrue(getResultatPosition(data, "ST_B8_AVAL") > 0);
-    // tests des sections sans géometrie qui peuvent causer problèmes:
-//    FCBSequentialReader.EnteteContainer<FCBValueObject.EnteteBranche, FCBValueObject.ResBranche> containerBranches = infos.getContainerBranches();
-//    for (int i = 0; i < containerBranches.getNbData(); i++) {
-//      String name = containerBranches.getDataName(i);
-//      assertFalse(StringUtils.isBlank(name));
-//    }
-//    FCBSequentialReader.EnteteContainer<FCBValueObject.EnteteCasier, FCBValueObject.ResCasier> containerNoeud = infos.getContainerCasiers();
-//    for (int i = 0; i < containerNoeud.getNbData(); i++) {
-//      String name = containerNoeud.getDataName(i);
-//      assertFalse(StringUtils.isBlank(name));
-//    }
-//    int nbPdt = read.getMetier().getPdt().getNbResultats();
-//    assertEquals(25, nbPdt);
-
+    assertTrue(getResultatPosition(data, "ST_B5_AM") > 0);
+    assertTrue(getResultatPosition(data, "ST_B5_AV") > 0);
+    assertTrue(getResultatPosition(data, "ST_B8_AM") > 0);
+    assertTrue(getResultatPosition(data, "ST_B8_AV") > 0);
   }
 
   private int getResultatPosition(CrueData data, final String id) {

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -88,6 +88,7 @@
     associateLookup(ExplorerUtils.createLookup(mgr, getActionMap()));
 
     this.outlineView.addPropertyColumn("commentaire", NbBundle.getMessage(OtfaCampagneTopComponent.class, "comment"));
+    this.outlineView.addPropertyColumn("lancerComparaison", NbBundle.getMessage(OtfaCampagneTopComponent.class, "lancerComparaison"));
     this.outlineView.addPropertyColumn("referenceEtuFile", NbBundle.getMessage(OtfaCampagneTopComponent.class, "refEtuFile"));
     this.outlineView.addPropertyColumn("referenceScenarioNom", NbBundle.getMessage(OtfaCampagneTopComponent.class, "refScenario"));
     this.outlineView.addPropertyColumn("referenceLaunchCompute", NbBundle.getMessage(OtfaCampagneTopComponent.class,

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -153,6 +153,7 @@
     try {
       Property indice = new PropertySupportReflection(this, line, int.class, "getIndice", null);
       Property commentaire = new PropertySupportReflection(this, line, String.class, "getCommentaire", "setCommentaire");
+      Property lancerComparaison = new PropertySupportReflection(this, line, boolean.class, "isLancerComparaison", "setLancerComparaison");
       final String logDisplayName = NbBundle.getMessage(OtfaCampagneLineNode.class, "logsName");
       final String logDescription = NbBundle.getMessage(OtfaCampagneLineNode.class, "logsDescription");
       OtfaRtfaLineProperty logs = new OtfaRtfaLineProperty(data, "logs", logDisplayName, logDescription);
@@ -168,6 +169,10 @@
       commentaire.setDisplayName(NbBundle.getMessage(OtfaCampagneLineNode.class, "commentName"));
       commentaire.setShortDescription(NbBundle.getMessage(OtfaCampagneLineNode.class, "commentDescription"));
 
+      lancerComparaison.setName("lancerComparaison");
+      lancerComparaison.setDisplayName(NbBundle.getMessage(OtfaCampagneLineNode.class, "lancerComparaisonName"));
+      lancerComparaison.setShortDescription(NbBundle.getMessage(OtfaCampagneLineNode.class, "lancerComparaisonDescription"));
+
       logs.setPropertyEditorClass(LogsPropertyEditor.class);
       comparaisons.setPropertyEditorClass(ComparaisonsPropertyEditor.class);
       if (!data.hasDifferences()) {
@@ -178,6 +183,7 @@
       }
 
       set.put(indice);
+      set.put(lancerComparaison);
       set.put(commentaire);
       set.put(logs);
       set.put(comparaisons);
@@ -234,7 +240,7 @@
       configureFileEditor(etude);
 
       PropertySupportReflection scenario = new ScenarioProperty(this, otfaCampagne, line.getReference(), "getScenarioNom", "setScenarioNom");
-      CoeurProperty coeur = new CoeurProperty(this, line.getReference(), String.class, "getCoeurName", "setCoeurName");
+      CoeurProperty coeur = new CoeurProperty(this, line.getReference(), String.class, "getCoeurName", "setCoeurName", false);
       Property lancerCalcul = new PropertySupportReflection(this, line.getReference(), boolean.class, "isLaunchCompute", "setLaunchCompute");
 
       etude.setName(REFERENCE_ETU_FILE_PROPERTY);
@@ -287,8 +293,9 @@
       };
       etude.setCanWrite(true);
       configureFileEditor(etude);
-      Property scenario = new ScenarioProperty(this, otfaService.getCurrentOTFA().getOtfaCampagne(), line.getCible(), "getScenarioNom", "setScenarioNom");
-      Reflection coeur = new CoeurProperty(this, line.getCible(), String.class, "getCoeurName", "setCoeurName");
+      Property scenario = new ScenarioProperty(this, otfaService.getCurrentOTFA().getOtfaCampagne(), line.getCible(), "getScenarioNom",
+              "setScenarioNom");
+      Reflection coeur = new CoeurProperty(this, line.getCible(), String.class, "getCoeurName", "setCoeurName", true);
       Property lancerCalcul = new PropertySupportReflection(this, line.getCible(), boolean.class, "isLaunchCompute", "setLaunchCompute");
 
       etude.setName(CIBLE_ETU_FILE_PROPERPTY);

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -8,6 +8,7 @@
 import java.beans.PropertyEditorSupport;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.commons.lang.StringUtils;
 import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneItem;
 import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
 import org.fudaa.fudaa.crue.common.property.PropertySupportReflection;
@@ -20,8 +21,11 @@
  */
 public class CoeurProperty extends PropertySupportReflection<String> {
 
-  public CoeurProperty(AbstractNodeFirable node, Object instance, Class clazz, String getter, String setter) throws NoSuchMethodException {
+  private final boolean emptyAuthorized;
+
+  public CoeurProperty(AbstractNodeFirable node, Object instance, Class clazz, String getter, String setter, boolean emptyAuthorized) throws NoSuchMethodException {
     super(node, instance, clazz, getter, setter);
+    this.emptyAuthorized = emptyAuthorized;
   }
 
   @Override
@@ -51,6 +55,9 @@
     public String[] getTags() {
       if (coeurs == null) {
         List<String> all = new ArrayList<String>();
+        if (emptyAuthorized) {
+          all.add(StringUtils.EMPTY);
+        }
         all.add(OtfaCampagneItem.CRUE9);
         all.addAll(service.getCoeursNames());
         coeurs = (String[]) all.toArray(new String[all.size()]);

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties	2014-02-14 21:35:39 UTC (rev 8625)
@@ -38,6 +38,7 @@
 OtfaCampagneTopComponent.ciblesDeleteRunsBeforeCheckBox.text=Effacer les runs avant
 OtfaCampagneTopComponent.openOtfaButton.text=OpenOtfa
 comment=Commentaire
+lancerComparaison=Comparaison
 refEtuFile=Fichier Etu de la r\u00e9f\u00e9rence
 refScenario=Sc\u00e9nario de la r\u00e9f\u00e9rence
 refLaunchCompute=Lancement des runs de la r\u00e9f\u00e9rence

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties	2014-02-14 21:35:39 UTC (rev 8625)
@@ -3,6 +3,8 @@
 indiceDescription=D\u00e9fini l'indice de la ligne.
 commentName=Commentaire
 commentDescription=D\u00e9fini le commentaire de la ligne.
+lancerComparaisonName=Lancer la comparaison
+lancerComparaisonDescription=Lancer la comparaison ou non
 indicateurName=Indicateur
 indicateurDescription=D\u00e9fini l'\u00e9tat des comparaisons de la ligne.
 logsName=Logs

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.MissingResourceException;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.Set;
@@ -27,12 +28,15 @@
 import javax.swing.border.Border;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISPolyligne;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.dodico.crue.metier.emh.IdRegistry;
 import org.fudaa.ebli.calque.BArbreCalqueModel;
 import org.fudaa.ebli.calque.BCalque;
 import org.fudaa.ebli.calque.BGroupeCalque;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.calque.ZCatchEvent;
 import org.fudaa.ebli.calque.ZSelectionEvent;
 import org.fudaa.ebli.calque.ZSelectionListener;
 import org.fudaa.ebli.calque.action.AddVertexAction;
@@ -48,10 +52,12 @@
 import org.fudaa.ebli.find.EbliFindDialog;
 import org.fudaa.ebli.find.EbliFindableItem;
 import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.ressource.EbliResource;
 import org.fudaa.fudaa.crue.planimetry.action.AddBrancheAction;
 import org.fudaa.fudaa.crue.planimetry.action.AddCasierAction;
 import org.fudaa.fudaa.crue.planimetry.action.AddNoeudAction;
 import org.fudaa.fudaa.crue.planimetry.action.EditZonePanel;
+import org.fudaa.fudaa.crue.planimetry.controller.LayerBrancheController;
 import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
 import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryVisuPanelController;
 import org.fudaa.fudaa.crue.planimetry.layer.CalqueWithDynamicActions;
@@ -157,6 +163,54 @@
   }
 
   @Override
+  public void setAccrocheText(ZCatchEvent _evt) {
+    final ZCalqueAffichageDonneesInterface layer = _evt.selection.getScene().getLayerForId(_evt.idxGeom);
+    int idx = _evt.selection.getScene().sceneId2LayerId(_evt.idxGeom);
+    int vertex = _evt.idxVertex;
+    final PlanimetryController planimetryController = getPlanimetryController();
+    if (layer == planimetryController.getCqNoeud()) {
+      final EMH emh = planimetryController.getNodeController().getEMHFromLayerPosition(idx);
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+    } else if (layer == planimetryController.getCqBranche()) {
+      setAccrocheTextBranche(planimetryController, idx, vertex);
+    } else if (layer == planimetryController.getCqCasier()) {
+      final EMH emh = planimetryController.getCasierController().getEMHFromLayerPosition(idx);
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.casier", emh.getNom(), vertex));
+    } else if (layer == planimetryController.getCqSection()) {
+      final EMH emh = planimetryController.getSectionController().getEMHFromLayerPosition(idx);
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.section", emh.getNom()));
+    } else {
+      super.setAccrocheText(_evt);
+    }
+  }
+
+  private void setAccrocheTextBranche(final PlanimetryController planimetryController, int idx, int vertex) throws MissingResourceException {
+    final CatEMHBranche branche = (CatEMHBranche) planimetryController.getBrancheController().getEMHFromLayerPosition(idx);
+    final GISPolyligne brancheGis = planimetryController.getBrancheController().getBrancheGis(idx);
+    if (vertex == LayerBrancheController.getAmontCoordinatePosition()) {
+      final EMH emh = branche.getNoeudAmont();
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+    } else if (vertex == LayerBrancheController.getAvalCoordinatePosition(brancheGis.getNumPoints())) {
+      final EMH emh = branche.getNoeudAval();
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+    } else {
+      setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.branche", branche.getNom(), vertex + 1));
+    }
+  }
+
+  public void setAccrocheText(String[] vars) {
+    String text
+            = EbliResource.EBLI.getString(
+                    "Accroche : Calque={0} Geom={1} Sommet={2}", vars);
+    setInfoText(text);
+  }
+
+  @Override
+  public void unsetAcrrocheText() {
+    super.unsetAcrrocheText();
+  }
+
+  @Override
   protected ZEditorDefault createGisEditor() {
     return new PlanimetryGisEditor(this);
   }
@@ -178,7 +232,7 @@
       }
 
               @Override
-              public void setEnabled(boolean _newValue) {
+      public void setEnabled(boolean _newValue) {
               }
             };
     return res;
@@ -393,15 +447,20 @@
 
       TitledSeparator titleSeparator = new TitledSeparator(org.openide.util.NbBundle.getMessage(PlanimetryVisuPanel.class, "Toolbar.Separator"));
       final Border emptyBorder = BorderFactory.createEmptyBorder(5, 1, 1, 1);
+
       titleSeparator.setBorder(emptyBorder);
+
       gisEditionPalette.add(titleSeparator);
 
       gisEditionPalette.add(add(addNoeud.buildToolButton(EbliComponentFactory.INSTANCE)));
       gisEditionPalette.add(add(addBranche.buildToolButton(EbliComponentFactory.INSTANCE)));
       gisEditionPalette.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
       titleSeparator = new TitledSeparator(org.openide.util.NbBundle.getMessage(PlanimetryVisuPanel.class, "Project.Separator"));
+
       titleSeparator.setBorder(emptyBorder);
+
       gisEditionPalette.add(titleSeparator);
+
       gisEditionPalette.add(add(getPlanimetryController().getProjectEMHOnSIGAction().buildToolButton(EbliComponentFactory.INSTANCE)));
       gisEditionPalette.add(add(getPlanimetryController().getTraceProfilAttachedToBrancheAction().buildToolButton(EbliComponentFactory.INSTANCE)));
     }
@@ -435,6 +494,7 @@
       }
     }
     return emhs;
+
   }
 
   private class ObserverCalque implements Observer {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -46,8 +46,10 @@
     final CtuluListSelection selection = layer.selection(pt, ZCalqueSelectionInteractionAbstract.DEFAULT_TOLERANCE_PIXEL);
     Cursor newCursor = null;
     if (selection == null || selection.isEmpty()) {
-      newCursor = view.getController().getDefautCursor();
-      view.unsetInfoText();
+      if (!view.getController().getCqCatchI().isSomethingCatched()) {
+        newCursor = view.getController().getDefautCursor();
+        view.unsetInfoText();
+      }
       PlanimetryCLimMLayer climM = view.getPlanimetryController().getcondLimiteController().getLayer();
       final CtuluListSelection selectionClimM = climM.selection(pt, ZCalqueSelectionInteractionAbstract.DEFAULT_TOLERANCE_PIXEL);
       if (selectionClimM != null && !selectionClimM.isEmpty()) {
@@ -63,7 +65,7 @@
       }
       view.setInfoText(StringUtils.join(emhs, "; "));
     }
-    if (!newCursor.equals(view.getVueCalque().getCursor())) {
+    if (newCursor != null && !newCursor.equals(view.getVueCalque().getCursor())) {
       view.getVueCalque().setCursor(newCursor);
     }
 

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -2,6 +2,7 @@
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -46,11 +47,23 @@
   }
 
   @Override
+  public void setCalqueInteractionActif(BCalqueInteraction _b) {
+    super.setCalqueInteractionActif(_b);
+    getView().getVueCalque().requestFocus();
+  }
+
+
+  @Override
   public void setView(final ZEbliCalquesPanel view) {
     super.setView(view);
-//    view.getVueCalque().removeKeyListener(cqCatchI_);
-//    removeCalqueInteraction(cqCatchI_);
+    view.getVueCalque().removeKeyListener(cqCatchI_);
     cqCatchI_.setGele(true);
+    final PropertyChangeListener[] propertyChangeListeners = cqCatchI_.getPropertyChangeListeners("gele");
+    if (propertyChangeListeners != null) {
+      for (PropertyChangeListener propertyChangeListener : propertyChangeListeners) {
+        cqCatchI_.removePropertyChangeListener("gele", propertyChangeListener);
+      }
+    }
     view.getVueCalque().addKeyListener(new KeyAdapter() {
       @Override
       public void keyPressed(KeyEvent e) {
@@ -68,7 +81,6 @@
           cqCatchI_.setGele(true);
         }
       }
-
     });
     new PlanimetryAccrocheController((PlanimetryVisuPanel) view).install();
     SelectionMoveInteraction selection = (SelectionMoveInteraction) getCalqueInteraction("cqSELECTION");

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -50,6 +50,11 @@
   }
 
   @Override
+  public boolean canBeUsedForAccroche() {
+    return false;
+  }
+
+  @Override
   public CtuluListSelection selection(GrPoint _pt, int _tolerance) {
     if (modele == null || !isVisible()) {
       return null;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -111,6 +111,11 @@
   LabelPainter labelPainter = new LabelPainter();
 
   @Override
+  public boolean canBeUsedForAccroche() {
+    return false;
+  }
+
+  @Override
   protected boolean isPainted(int idx, GrMorphisme _versEcran) {
     if (isSelected(idx)) {
       return true;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -44,6 +44,7 @@
       GISAttributeModel model = entry.getValue();
       if (model == null) {
         log.addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributNotFound", key));
+        return;
       } else if (model.getSize() != nbPoint) {
         log.addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributeSizeNotCorrect", key, Integer.toString(
                 model.getSize()), Integer.toString(nbPoint)));
@@ -64,7 +65,7 @@
         if (model.getObjectValueAt(i) == null) {
           log.
                   addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributeWithEmptyValue", key, Integer.
-                  toString(i)));
+                                  toString(i)));
         }
       }
     }
@@ -144,7 +145,6 @@
     }
     res.setResultat(zone);
 
-
     return res;
   }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties	2014-02-14 21:35:39 UTC (rev 8625)
@@ -18,3 +18,8 @@
 DeleteEMH.Name=Supprimer uniquement la s\u00e9lection
 Cancel.Name=Annuler
 Project.Separator=<->
+accroche.node=Accroche: Noeud {0}
+accroche.branche=Accroche: Branche {0}, sommet {1}
+accroche.casier=Accroche: Casier {0}, sommet {1}
+accroche.section=Accroche: Section {0}
+

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -33,7 +33,7 @@
             analyse);
     assertTrue(analyse.isEmpty());
     GISZoneCollectionPoint buildPoints = SigLoaderHelper.buildPoints(result.createData());
-    assertEquals(16581, buildPoints.getNbGeometries());
+    assertEquals(2433, buildPoints.getNbGeometries());
     GGPointToTraceProfilProcessor toTrace = new GGPointToTraceProfilProcessor(buildPoints, TestCoeurConfig.INSTANCE.getCrueConfigMetier());
     CtuluLogResult<GISZoneCollectionLigneBrisee> toProfil = toTrace.toProfil();
     return toProfil;

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java	2014-02-14 21:35:39 UTC (rev 8625)
@@ -32,10 +32,10 @@
   @BeforeClass
   public static void extractFile() throws IOException {
     targetDir = CtuluLibFile.createTempDir();
-    shapeFile = new File(targetDir, "EMG_Profil_point.shp");
-    File dbfFile = new File(targetDir, "EMG_Profil_point.dbf");
-    CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.shp", shapeFile);
-    CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.dbf", dbfFile);
+    shapeFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.shp");
+    File dbfFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.dbf");
+    CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.shp", shapeFile);
+    CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.dbf", dbfFile);
   }
 
   @AfterClass
@@ -57,7 +57,7 @@
     assertTrue("contient des doublons donc warning", toProfil.getLog().containsWarnings());//a cous
     assertFalse(toProfil.getLog().containsErrorOrSevereError());
     assertNotNull(toProfil.getResultat());
-    final int nbProfil = 96;
+    final int nbProfil = 16;
     assertEquals(nbProfil, toProfil.getResultat().getNbGeometries());
     GISAttributeModel modelNom = toProfil.getResultat().getModel(nomIdx);
     assertEquals(GGTraceProfilSectionAttributesController.NOM, modelNom.getAttribute());
@@ -67,8 +67,8 @@
       objectValues[i] = (String) initValues[i];
     }
     Arrays.sort(objectValues);
-    assertEquals("100.000", objectValues[0]);
-    assertEquals("99.800", objectValues[nbProfil - 1]);
+    assertEquals("PCF1", objectValues[0]);
+    assertEquals("PCF5", objectValues[nbProfil - 1]);
 
     GISAttributeModel modelXt = toProfil.getResultat().getModel(xtIdx);
     GISAttributeModel modelZ = toProfil.getResultat().getModel(zIdx);
@@ -78,68 +78,68 @@
 
     //c'est trié dans l'ordre
     String nom1 = (String) modelNom.getObjectValueAt(0);
-    assertEquals("98.500", nom1);
+    assertEquals("PCF1", nom1);
 
     Double xt = getValueAt(modelXt, 0, 0);
-    assertEquals(-29.84, xt, 1e-3);
+    assertEquals(-12.02, xt, 1e-3);
     //on teste la première frontière:
     int firstLimMinIdx = 7;
     xt = getValueAt(modelXt, 0, firstLimMinIdx);
-    String limLit = getValueAt(modelLimLit, 0, firstLimMinIdx);
-    String limGeom = getValueAt(modelLimGeo, 0, firstLimMinIdx);
-    String label = getValueAt(modelLabel, 0, firstLimMinIdx);
-    assertEquals(1.08, xt, 1e-3);
-    assertEquals(LimLitHelper.MAJD_MIN, limLit);
-    assertEquals("", limGeom);
-    assertEquals(LimLitHelper.MAJD_MIN, label);
-
-    int thalwegIdx = 12;
-    xt = getValueAt(modelXt, 0, thalwegIdx);
-    limLit = getValueAt(modelLimLit, 0, thalwegIdx);
-    limGeom = getValueAt(modelLimGeo, 0, thalwegIdx);
-    label = getValueAt(modelLabel, 0, thalwegIdx);
-    assertEquals(10.93, xt, 1e-3);
-    assertEquals("", limLit);
-    assertEquals(LimGeoHelper.THALWEG, limGeom);
-    assertEquals(LimGeoHelper.THALWEG, label);
-
-    int lastLimMinIdx = 40;
-    xt = getValueAt(modelXt, 0, lastLimMinIdx);
-    limLit = getValueAt(modelLimLit, 0, lastLimMinIdx);
-    limGeom = getValueAt(modelLimGeo, 0, lastLimMinIdx);
-    label = getValueAt(modelLabel, 0, lastLimMinIdx);
-    assertEquals(114.03, xt, 1e-3);
-    assertEquals("", limGeom);
-    assertEquals(LimLitHelper.MIN_MAJG, limLit);
-    assertEquals(LimLitHelper.MIN_MAJG, label);
-
-    String nom2 = (String) modelNom.getObjectValueAt(1);
-    assertEquals("98.600", nom2);
-
-    int first = 1;
-    xt = getValueAt(modelXt, 1, first);
-    limLit = getValueAt(modelLimLit, 1, first);
-    limGeom = getValueAt(modelLimGeo, 1, first);
-    label = getValueAt(modelLabel, 1, first);
-    assertEquals(-18, xt, 1e-3);
-    assertEquals("", limGeom);
-    assertEquals(LimLitHelper.RD_STOD, limLit);
-    assertEquals(LimLitHelper.RD_STOD, label);
-
-    first = 7;
-    xt = getValueAt(modelXt, 1, first);
-    limLit = getValueAt(modelLimLit, 1, first);
-    limGeom = getValueAt(modelLimGeo, 1, first);
-    label = getValueAt(modelLabel, 1, first);
-    assertEquals(0.54, xt, 1e-3);
-    final String limLitResult = LimLitHelper.STOD_MAJD + ";" + LimLitHelper.MAJD_MIN;
-    final String litGeoResult = LimGeoHelper.AXE + ";" + LimGeoHelper.THALWEG;
-    assertEquals(litGeoResult, limGeom);
-    assertEquals(limLitResult, limLit);
-    assertEquals(limLitResult + "; " + litGeoResult, label);
+    assertEquals(39.98, xt, 1e-3);
+//    String limLit = getValueAt(modelLimLit, 0, firstLimMinIdx);
+//    String limGeom = getValueAt(modelLimGeo, 0, firstLimMinIdx);
+//    String label = getValueAt(modelLabel, 0, firstLimMinIdx);
+////    assertEquals(LimLitHelper.MAJD_MIN, limLit);
+//    assertEquals("", limGeom);
+////    assertEquals(LimLitHelper.MAJD_MIN, label);
+//
+//    int thalwegIdx = 12;
+//    xt = getValueAt(modelXt, 0, thalwegIdx);
+//    limLit = getValueAt(modelLimLit, 0, thalwegIdx);
+//    limGeom = getValueAt(modelLimGeo, 0, thalwegIdx);
+//    label = getValueAt(modelLabel, 0, thalwegIdx);
+//    assertEquals(10.93, xt, 1e-3);
+//    assertEquals("", limLit);
+////    assertEquals(LimGeoHelper.THALWEG, limGeom);
+////    assertEquals(LimGeoHelper.THALWEG, label);
+//
+//    int lastLimMinIdx = 40;
+//    xt = getValueAt(modelXt, 0, lastLimMinIdx);
+//    limLit = getValueAt(modelLimLit, 0, lastLimMinIdx);
+//    limGeom = getValueAt(modelLimGeo, 0, lastLimMinIdx);
+//    label = getValueAt(modelLabel, 0, lastLimMinIdx);
+//    assertEquals(114.03, xt, 1e-3);
+//    assertEquals("", limGeom);
+////    assertEquals(LimLitHelper.MIN_MAJG, limLit);
+////    assertEquals(LimLitHelper.MIN_MAJG, label);
+//
+//    String nom2 = (String) modelNom.getObjectValueAt(1);
+//    assertEquals("98.600", nom2);
+//
+//    int first = 1;
+//    xt = getValueAt(modelXt, 1, first);
+//    limLit = getValueAt(modelLimLit, 1, first);
+//    limGeom = getValueAt(modelLimGeo, 1, first);
+//    label = getValueAt(modelLabel, 1, first);
+//    assertEquals(-18, xt, 1e-3);
+//    assertEquals("", limGeom);
+//    assertEquals(LimLitHelper.RD_STOD, limLit);
+//    assertEquals(LimLitHelper.RD_STOD, label);
+//
+//    first = 7;
+//    xt = getValueAt(modelXt, 1, first);
+//    limLit = getValueAt(modelLimLit, 1, first);
+//    limGeom = getValueAt(modelLimGeo, 1, first);
+//    label = getValueAt(modelLabel, 1, first);
+//    assertEquals(0.54, xt, 1e-3);
+//    final String limLitResult = LimLitHelper.STOD_MAJD + ";" + LimLitHelper.MAJD_MIN;
+//    final String litGeoResult = LimGeoHelper.AXE + ";" + LimGeoHelper.THALWEG;
+//    assertEquals(litGeoResult, limGeom);
+//    assertEquals(limLitResult, limLit);
+//    assertEquals(limLitResult + "; " + litGeoResult, label);
   }
 
   private static <T> T getValueAt(GISAttributeModel model, int geoIdx, int attIdx) {
     return (T) ((CtuluCollection) model.getObjectValueAt(geoIdx)).getObjectValueAt(attIdx);
   }
-}
\ No newline at end of file
+}

Added: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
===================================================================
(Binary files differ)

Index: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf	2014-02-14 21:35:39 UTC (rev 8625)

Property changes on: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
===================================================================
(Binary files differ)

Index: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp	2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp	2014-02-14 21:35:39 UTC (rev 8625)

Property changes on: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.