Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8759] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-06-09 21:19:04
|
Revision: 8759
http://sourceforge.net/p/fudaa/svn/8759
Author: deniger
Date: 2014-06-09 21:19:00 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
CRUE-583
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/report-longitudinalWsmode.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/explorer.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output.wsmode
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output_1Wsmode.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/properties.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/rightSlidingSide.xml
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/explorer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/explorer.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/explorer.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <module name="org.netbeans.core.ui/1" spec="1.2" />
+ <name unique="explorer" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="20" weight="0.3"/>
+ <path orientation="vertical" number="20" weight="0.5"/>
+ </constraints>
+ <bounds x="168" y="224" width="537" height="510" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2014-06-09 20:56:21 UTC (rev 8758)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -114,7 +114,7 @@
<file name="properties.settings_hidden"/>
</folder>
<folder name="Modes">
- <file name="sysdoc.wsmode" url="sysdocWsmode.xml"/>
+ <file name="sysdoc.wsmode" url="sysdocWsmode.xml"/>
<file name="study-editor.wsmode" url="study-editorWsmode.xml"/>
<file name="study-bottomLeft.wsmode" url="study-bottomLeftWsmode.xml"/>
<file name="study-bottomRight.wsmode" url="study-bottomRightWsmode.xml"/>
@@ -177,6 +177,12 @@
<file name="otfa-topLeft.wsmode" url="otfa-topLeftWsmode.xml"/>
<file name="otfa-editor.wsmode" url="otfa-editorWsmode.xml"/>
+
+
+ <file name="rightSlidingSide.wsmode" url="rightSlidingSide.xml"/>
+ <file name="explorer.wsmode" url="explorer.xml"/>
+ <file name="properties.wsmode" url="properties.xml"/>
+ <file name="output.wsmode" url="output.xml"/>
</folder>
</folder>
<folder name="Windows2Local">
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output.wsmode (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output.wsmode 2014-06-09 21:19:00 UTC (rev 8759)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <name unique="output" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="60" weight="0.6965352449223416"/>
+ <path orientation="vertical" number="80" weight="0.3"/>
+ <path orientation="horizontal" number="30" weight="0.8"/>
+ </constraints>
+ <bounds x="168" y="693" width="672" height="204" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output_1Wsmode.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output_1Wsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/output_1Wsmode.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <name unique="output" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="60" weight="0.6965352449223416"/>
+ <path orientation="vertical" number="80" weight="0.3"/>
+ <path orientation="horizontal" number="30" weight="0.8"/>
+ </constraints>
+ <bounds x="168" y="693" width="672" height="204" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/properties.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/properties.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/properties.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <name unique="properties" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="60" weight="0.6965352449223416"/>
+ <path orientation="vertical" number="40" weight="0.7"/>
+ <path orientation="horizontal" number="80" weight="0.3"/>
+ <path orientation="vertical" number="80" weight="0.5"/>
+ </constraints>
+ <bounds x="1260" y="571" width="252" height="326" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/report-longitudinalWsmode.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/report-longitudinalWsmode.xml 2014-06-09 20:56:21 UTC (rev 8758)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/report-longitudinalWsmode.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -6,7 +6,7 @@
<constraints>
<path orientation="horizontal" number="238" weight="0.5"/>
</constraints>
- <bounds x="350" y="50" width="1000" height="850" />
+ <bounds x="333" y="52" width="1159" height="921" />
<frame state="0"/>
<empty-behavior permanent="true"/>
</mode>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/rightSlidingSide.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/rightSlidingSide.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/rightSlidingSide.xml 2014-06-09 21:19:00 UTC (rev 8759)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <module name="org.netbeans.core.ui/1" spec="1.2" />
+ <name unique="rightSlidingSide" />
+ <kind type="sliding" />
+ <slidingSide side="right" />
+ <state type="joined" />
+ <bounds x="1" y="0" width="1262" height="964" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2014-06-09 20:56:21 UTC (rev 8758)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2014-06-09 21:19:00 UTC (rev 8759)
@@ -26,7 +26,6 @@
import org.fudaa.dodico.crue.edition.SimplificationProcessor;
import org.fudaa.dodico.crue.edition.SimplificationSeuils;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.helper.DisableSortHelper;
import org.fudaa.fudaa.crue.modelling.loi.SimplificationSeuilsChooser;
import org.fudaa.fudaa.crue.modelling.node.ModellingNodeEMHFactory;
import org.fudaa.fudaa.crue.modelling.services.ModellingSelectedEMHService;
@@ -245,7 +244,7 @@
return;
}
updating = true;
- Set<Long> selectedUid = new HashSet<Long>(resultatEMHsSelected.allInstances());
+ Set<Long> selectedUid = new HashSet<>(resultatEMHsSelected.allInstances());
selectEMHs(selectedUid);
updating = false;
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java 2014-06-09 20:56:21 UTC (rev 8758)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java 2014-06-09 21:19:00 UTC (rev 8759)
@@ -134,7 +134,7 @@
@Override
public boolean addGeometry(GrPolyligne _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
- if (_p.nombre() == 0) {
+ if (_p.nombre() < 2) {
return false;
}
PlanimetryControllerHelper helper = super.getLayerController().getHelper();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
