Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4176] branches/FudaaModeleur_TC1Bis/fudaa_devel
|
From: <emm...@us...> - 2008-11-05 16:47:01
|
Revision: 4176
http://fudaa.svn.sourceforge.net/fudaa/?rev=4176&view=rev
Author: emmanuel_martin
Date: 2008-11-05 16:46:58 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Fusion de GEOMETRY_ACTION_REPLACE et GEOMETRY_ACTION_STRUCTURE_CHANGE en GEOMETRY_ACTION_MODIFY dans ZModelListener et GISZoneListener
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -207,7 +207,7 @@
// System.err.println("overload " + getClass().getName() + ".firePointRemoved");
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
// System.err.println("overload " + getClass().getName() + ".firePointStructureChanged");
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -291,7 +291,7 @@
// System.err.println("overload " + getClass().getName() + ".firePointRemoved");
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
// System.err.println("overload " + getClass().getName() + ".firePointStructureChanged");
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -44,9 +44,9 @@
GISCollection.this.fireGeometryAdded(_newIdx, (Geometry) _newGeom);
}
- protected void fireObjectChanged(int _oldIdx, Object _oldGeom) {
+ protected void fireObjectModified(int _oldIdx, Object _oldGeom) {
GISCollection.this.geometryChanged();
- GISCollection.this.fireGeometryReplaced(_oldIdx, (Geometry) _oldGeom);
+ GISCollection.this.fireGeometryModified(_oldIdx, (Geometry) _oldGeom);
}
protected void fireObjectRemoved(int _oldIdx, Object _oldGeom) {
@@ -54,11 +54,6 @@
GISCollection.this.fireGeometryRemoved(_oldIdx, (Geometry) _oldGeom);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
- GISCollection.this.geometryChanged();
- GISCollection.this.fireGeometryStructureChanged(_idx, (Geometry) _geom);
- }
-
protected List getList() {
return list_;
}
@@ -163,15 +158,10 @@
listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_REMOVE);
}
- protected void fireGeometryReplaced(int _oldIdx, Geometry _oldGeom) {
+ protected void fireGeometryModified(int _oldIdx, Geometry _oldGeom) {
if (listener_!=null)
- listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_REPLACE);
+ listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_MODIFY);
}
-
- protected void fireGeometryStructureChanged(int _idx, Geometry _geom) {
- if (listener_!=null)
- listener_.objectAction(this, _idx, _geom, GISZoneListener.OBJECT_ACTION_STRUCTURE_CHANGE);
- }
protected Envelope computeEnvelopeInternal() {
final Envelope e = new Envelope();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -12,9 +12,7 @@
* Cette interface permet l'\xE9coute des changements concernant les objets et les
* attributs (si existant). Les changements sont : l'ajout d'un attribut, la
* suppression d'un attribut, le changement d'une valeur d'un attribut, l'ajout
- * d'un objet, la supression d'un objet, le remplacement d'un objet par une
- * autre et la modification interne d'un objet (g\xE9n\xE9ralement l'ajout ou la
- * suppression de points).
+ * d'un objet, la supression d'un objet et la modification d'un objet.
*
* @author Emmanuel MARTIN
* @version $Id: AttributeListener.java 4103 2008-10-28 15:55:12Z
@@ -34,16 +32,8 @@
* Action indiquant la supression d'un objet dans le conteneur de g\xE9om\xE9tries.
*/
public static final int OBJECT_ACTION_REMOVE=3;
- /**
- * Action indiquant la remplacement d'un objet dans le conteneur de
- * g\xE9om\xE9tries.
- */
- public static final int OBJECT_ACTION_REPLACE=4;
- /**
- * Action indiquant la modification des donn\xE9es internes \xE0 l'objet.
- * G\xE9n\xE9ralement une modification de ses sommets.
- */
- public static final int OBJECT_ACTION_STRUCTURE_CHANGE=5;
+ /** Action indiquant la modification d'un objet. */
+ public static final int OBJECT_ACTION_MODIFY=4;
/**
* M\xE9thode appel\xE9e lorsqu'une action d'ajout ou de suppression est effectu\xE9e
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -42,7 +42,7 @@
fireSupportAddOrRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom){
+ protected void fireObjectModified(int _idx, Object _geom){
fireSupportAddOrRemoved();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -358,7 +358,7 @@
}
public void objectAction(Object _source, int geom, Object _obj, int _action) {
- if (_action == OBJECT_ACTION_REPLACE) {
+ if (_action == OBJECT_ACTION_MODIFY) {
fireDonneesBrutesNuageSupportChanged();
} else {
fireDonneesBrutesNuageSupportAddOrRemoved();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -172,7 +172,7 @@
H2dRubarOuvrage.this.mng_.fireOuvrageChanged(H2dRubarOuvrage.this, true);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
H2dRubarOuvrage.this.mng_.fireOuvrageChanged(H2dRubarOuvrage.this, true);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -62,7 +62,7 @@
H2dRubarOuvrageMng.this.fireOuvrageRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
H2dRubarOuvrageMng.this.fireOuvrageRemoved();
}
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -58,7 +58,7 @@
super(_nb);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
p_.setValue(nbSeuilKw_, CtuluLibString.getString(getNbSeuil()));
H2dTelemacSeuilMng.this.fireSeuilAdded();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -97,7 +97,7 @@
majTaille();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
majTaille();
}
}
@@ -1049,7 +1049,7 @@
fireCulvertRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
new Throwable().printStackTrace();
fireCulvertRemoved();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -12,11 +12,10 @@
/**
* Cette interface permet l'\xE9coute des changements concernant les g\xE9om\xE9tries.
* Les changements sont : l'ajout d'une g\xE9om\xE9trie, la supression d'une
- * g\xE9om\xE9trie, le remplacement d'une g\xE9om\xE9trie par une autre et la modification
- * interne d'une g\xE9om\xE9trie (g\xE9n\xE9ralement l'ajout ou la suppression de points).
+ * g\xE9om\xE9trie et la modification d'une g\xE9om\xE9trie.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public interface ZModelListener {
/** Action indiquant l'ajout d'une g\xE9om\xE9trie dans le conteneur de g\xE9om\xE9tries. */
@@ -26,16 +25,8 @@
* g\xE9om\xE9tries.
*/
public static final int GEOMETRY_ACTION_REMOVE=3;
- /**
- * Action indiquant la remplacement d'une g\xE9om\xE9trie dans le conteneur de
- * g\xE9om\xE9tries.
- */
- public static final int GEOMETRY_ACTION_REPLACE=4;
- /**
- * Action indiquant la modification des donn\xE9es internes \xE0 la g\xE9om\xE9trie.
- * G\xE9n\xE9ralement une modification de ses sommets.
- */
- public static final int GEOMETRY_ACTION_STRUCTURE_CHANGE=5;
+ /** Action indiquant la modification d'une g\xE9om\xE9trie */
+ public static final int GEOMETRY_ACTION_MODIFY=4;
/**
* M\xE9thode appel\xE9e lorsqu'une action est effectu\xE9e sur une g\xE9om\xE9trie.
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -75,7 +75,7 @@
public void objectAction(Object _source, int geom, Object _obj, int _action) {
logic_.tableModel_.updateError();
- if (_action == OBJECT_ACTION_REPLACE||_action==OBJECT_ACTION_STRUCTURE_CHANGE) {
+ if (_action == OBJECT_ACTION_MODIFY) {
logic_.tableModel_.fireTableRowsUpdated(0, logic_.tableModel_.getRowCount() - 1);
logic_.majTextFields();
} else if (_action == OBJECT_ACTION_REMOVE && logic_.tableModel_.getRowCount() > 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
