Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8249] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry
|
From: <de...@us...> - 2013-01-23 22:47:33
|
Revision: 8249
http://fudaa.svn.sourceforge.net/fudaa/?rev=8249&view=rev
Author: deniger
Date: 2013-01-23 22:47:23 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
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/configuration/BrancheConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java
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 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -74,6 +74,7 @@
createFindActions();
getVueCalque().setCheckTtranslation(false);
((FSigEditor) gisEditor_).setDisplayInfo(false);
+ FSigEditor.activeDeferredModificationAsDefault();
}
public PlanimetryVisuPanelConfigurer getConfigurer() {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -35,7 +35,7 @@
iconForAtomic.setDisplayName(NbBundle.getMessage(BrancheConfigurationInfo.class,
"BrancheConfiguration.AtomicPoint.DisplayName"));
res.add(iconForAtomic);
- res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_BRANCHES));
+ res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_BRANCHES,false));
res.add(createColorSheet(in));
return res;
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -36,7 +36,7 @@
res.add(iconForAtomic);
iconForAtomic.setDisplayName(NbBundle.getMessage(CasierConfigurationInfo.class,
"CasierConfiguration.AtomicPoint.DisplayName"));
- res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_CASIERS));
+ res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_CASIERS,false));
} catch (Exception exception) {
Exceptions.printStackTrace(exception);
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.planimetry.configuration;
+import java.awt.Color;
import org.fudaa.fudaa.crue.common.config.ConfigurationInfoHelper;
import org.fudaa.fudaa.crue.planimetry.configuration.editor.LabelAlignmentPropertyEditorSupport;
import java.awt.Font;
@@ -62,11 +63,11 @@
return get.containsNumber(value);
}
- public static Sheet.Set createSet(LabelConfiguration in, String prefix) {
- return createSet(in, prefix, null);
+ public static Sheet.Set createSet(LabelConfiguration in, String prefix, boolean addColor) {
+ return createSet(in, prefix, null, addColor);
}
- public static Sheet.Set createSet(LabelConfiguration in, String prefix, Node.Property<?> first) {
+ public static Sheet.Set createSet(LabelConfiguration in, String prefix, Node.Property<?> first, boolean addColor) {
Sheet.Set set = Sheet.createPropertiesSet();
if (first != null) {
set.put(first);
@@ -79,6 +80,9 @@
set.put(createDistance(in));
set.put(createFont(in));
set.put(createLabelAlignment(in));
+ if (addColor) {
+ set.put(createTextColor(in));
+ }
} catch (NoSuchMethodException noSuchMethodException) {
Exceptions.printStackTrace(noSuchMethodException);
}
@@ -106,6 +110,12 @@
return res;
}
+ private static Reflection createTextColor(LabelConfiguration in) throws NoSuchMethodException {
+ PropertySupport.Reflection res = ConfigurationInfoHelper.create(LabelConfiguration.PROP_TEXT_COLOR,
+ Color.class, in, VisuConfigurationInfo.class);
+ return res;
+ }
+
private static Reflection createLabelAlignment(LabelConfiguration in) throws NoSuchMethodException {
PropertySupport.Reflection res = ConfigurationInfoHelper.create(LabelConfiguration.PROP_ALIGMNENT,
Integer.TYPE, in, VisuConfigurationInfo.class);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -25,7 +25,7 @@
res.add(set);
res.add(TraceIconModelConfigurationInfo.createSet(in.icon, PREFIX_LINE));
res.add(TraceLineModelConfigurationInfo.createSet(in.line, PREFIX_LINE, true));
- res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_LINE));
+ res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_LINE, true));
return res;
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -31,7 +31,7 @@
PropertySupport.Reflection displayCasierName = ConfigurationInfoHelper.create(NodeConfiguration.PROP_DISPLAY_CASIER_NAME,
Boolean.TYPE, in,
"NodeConfiguration.DisplayCasierName", VisuConfigurationInfo.class);
- res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_NODES, displayCasierName));
+ res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_NODES, displayCasierName, false));
} catch (NoSuchMethodException noSuchMethodException) {
Exceptions.printStackTrace(noSuchMethodException);
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -6,8 +6,9 @@
import org.openide.util.NbBundle;
/**
- ** Attention. Les name des set sont utilisés pour la persistence dans le xml. Donc, ne pas changer sans rejouer les tests
- * unitaires et faire des reprises
+ ** Attention. Les name des set sont utilisés pour la persistence dans le xml. Donc, ne pas changer sans rejouer les tests unitaires et faire des
+ * reprises
+ *
* @author deniger ( genesis)
*/
public class PointConfigurationInfo {
@@ -23,7 +24,7 @@
set.setShortDescription(set.getDisplayName());
res.add(set);
res.add(TraceIconModelConfigurationInfo.createSet(in.iconModel, PREFIX_POINTS));
- res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_POINTS));
+ res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_POINTS, true));
return res;
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -30,7 +30,7 @@
set.setShortDescription(set.getDisplayName());
res.add(set);
res.add(TraceIconModelConfigurationInfo.createSet(in.iconModel, PREFIX_SECTIONS));
- res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_SECTIONS));
+ res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_SECTIONS, false));
res.add(createColorSheet(in));
return res;
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -42,7 +42,7 @@
//label nom de section
final Reflection createSectionNamePosition = createSectionNamePosition(in);
final Set labelSection = LabelConfigurationInfo.createSet(in.getSectionLabelConfiguration(), PREFIX_TRACES,
- createSectionNamePosition);
+ createSectionNamePosition, false);
labelSection.put(createSectionNamePosition);
labelSection.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.LabelSection.DisplayName", VisuConfigurationInfo.class));
labelSection.setShortDescription(labelSection.getDisplayName());
@@ -56,7 +56,7 @@
//label des lits
- final Set labelLits = LabelConfigurationInfo.createSet(in.getLitLabelConfiguration(), PREFIX_TRACES + ".lits");
+ final Set labelLits = LabelConfigurationInfo.createSet(in.getLitLabelConfiguration(), PREFIX_TRACES + ".lits", false);
labelLits.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.LabelLits.DisplayName", VisuConfigurationInfo.class));
res.add(labelLits);
} catch (NoSuchMethodException ex) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -24,20 +24,20 @@
* @author Frederic Deniger
*/
public abstract class AbstractGroupExternController<T extends AbstractPlanimetryExternLayerGroup> extends Observable implements LayerController {
-
+
public static final String PROPERTY_LAYER_ADDED = "LayerAdded";
public static final String PROPERTY_LAYER_REMOVED = "LayerRemoved";
CalqueAddRemoveListener calquesListener;
boolean editable;
protected final PlanimetryController controller;
private final T groupLayer;
-
+
public AbstractGroupExternController(PlanimetryController controller, T groupLayer) {
this.controller = controller;
this.groupLayer = groupLayer;
createCalqueListener();
}
-
+
public BCalque addAdditionalLayer(PlanimetryAdditionalLayerContrat layer) {
BCalque calque = (BCalque) layer;
//nom unique
@@ -47,16 +47,17 @@
} else if (calque instanceof ZCalqueLigneBriseeEditable) {
((ZCalqueLigneBriseeEditable) calque).setEditor(controller.getVisuPanel().getEditor());
}
+ layer.getLayerController().init(getHelper());
layer.installed();
groupLayer.enDernier(calque);
return calque;
}
-
+
public void addAdditionnalLayer(List<PlanimetryAdditionalLayerContrat> additionnalLayer) {
for (PlanimetryAdditionalLayerContrat layer : additionnalLayer) {
addAdditionalLayer(layer);
}
-
+
}
/**
@@ -65,46 +66,46 @@
*/
public List<PlanimetryAdditionalLayerContrat> getAdditionnalLayers() {
BCalque[] calques = getGroupLayer().getCalques();
-
+
List<PlanimetryAdditionalLayerContrat> res = new ArrayList<PlanimetryAdditionalLayerContrat>();
for (BCalque bCalque : calques) {
res.add((PlanimetryAdditionalLayerContrat) bCalque);
}
return res;
}
-
+
@Override
public void cancel() {
}
-
+
@Override
public void changeDone() {
}
-
+
@Override
public void changeWillBeDone() {
}
-
+
public T getGroupLayer() {
return groupLayer;
}
-
+
@Override
public boolean isEditable() {
return editable;
}
-
+
@Override
public void saveDone() {
}
-
+
protected final void createCalqueListener() {
if (calquesListener == null) {
calquesListener = new CalqueAddRemoveListener();
getGroupLayer().addContainerListener(calquesListener);
}
}
-
+
public void setArbreEditable(boolean editable) {
this.editable = editable;
getGroupLayer().setArbreEditable(editable);
@@ -113,31 +114,39 @@
planimetryAdditionalLayerContrat.getLayerController().setEditable(editable);
}
}
-
+
+ public PlanimetryControllerHelper getHelper() {
+ return controller.getHelper();
+ }
+
@Override
public void init(PlanimetryControllerHelper helper) {
+ List<PlanimetryAdditionalLayerContrat> additionnalLayers = getAdditionnalLayers();
+ for (PlanimetryAdditionalLayerContrat planimetryAdditionalLayerContrat : additionnalLayers) {
+ planimetryAdditionalLayerContrat.getLayerController().init(helper);
+ }
}
//ne fait rien car les actions de ce groupe sont controllees par l'arbre.
@Override
public void setEditable(boolean editable) {
}
-
+
@Override
public void setVisuConfiguration(VisuConfiguration cloned) {
}
-
+
private class CalqueAddRemoveListener implements ContainerListener, PropertyChangeListener {
-
+
public CalqueAddRemoveListener() {
}
-
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
AbstractGroupExternController.this.setChanged();
AbstractGroupExternController.this.notifyObservers(evt.getPropertyName());
}
-
+
@Override
public void componentAdded(ContainerEvent e) {
final BCalque c = (BCalque) e.getChild();
@@ -146,7 +155,7 @@
AbstractGroupExternController.this.setChanged();
AbstractGroupExternController.this.notifyObservers(PROPERTY_LAYER_ADDED);
}
-
+
@Override
public void componentRemoved(ContainerEvent e) {
final BCalque c = (BCalque) e.getChild();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -37,10 +37,6 @@
}
@Override
- public void init(PlanimetryControllerHelper helper) {
- }
-
- @Override
public void resetModification() {
super.resetModification();
cloned = null;
@@ -53,7 +49,7 @@
@Override
public void changeWillBeDone() {
- super.cloneDataIfNeeded();
+ super.changeWillBeDone();
if (cloned == null) {
LigneBriseeConfiguration layerConfiguration = layer.getLayerConfiguration();
Cloner cloner = new Cloner();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -48,7 +48,7 @@
@Override
public void changeWillBeDone() {
- super.cloneDataIfNeeded();
+ super.changeWillBeDone();
if (cloned == null) {
PointConfiguration layerConfiguration = layer.getLayerConfiguration();
Cloner cloner = new Cloner();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java 2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java 2013-01-23 22:47:23 UTC (rev 8249)
@@ -43,6 +43,7 @@
final CtuluCommandContainer _cmd) {
final PlanimetryPointExternModifiableLayer layer = GroupExternDrawController.createLayerPoints(_zone, getGisEditor());
layer.setName(BGroupeCalque.findUniqueChildName(this, "point"));
+ layer.getLayerController().init(controller.getHelper());
layer.setTitle(_title);
finishActionCreation(this, _cmd, layer, false);
return layer;
@@ -53,6 +54,7 @@
final PlanimetryLigneBriseeExternModifiableLayer layer = GroupExternDrawController.createLayerLignes(_zone, getGisEditor());
layer.setName(BGroupeCalque.findUniqueChildName(this, "poly"));
layer.setTitle(_title);
+ layer.getLayerController().init(controller.getHelper());
finishActionCreation(this, _cmd, layer, false);
return layer;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
