|
From: <bma...@us...> - 2010-10-29 12:36:20
|
Revision: 6016
http://fudaa.svn.sourceforge.net/fudaa/?rev=6016&view=rev
Author: bmarchan
Date: 2010-10-29 12:36:14 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Le calque d'edition peut ?\195?\170tre utilis?\195?\169 sans listener associ?\195?\169.
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2010-10-28 14:59:29 UTC (rev 6015)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2010-10-29 12:36:14 UTC (rev 6016)
@@ -149,12 +149,15 @@
pointFin_ = ligne_.getDernier();
}
updateMouseMoved(x, y);
- support_.atomicChanged();
+ if (support_!=null)
+ support_.atomicChanged();
}
}
private boolean polyAdded() {
+ if (support_==null) return false;
+
support_.unsetMessage();
final GrObjet o = ligne_.getGeometrie();
final DeLigneBrisee old = ligne_;
@@ -273,12 +276,14 @@
tmp_.x_ = _x;
tmp_.y_ = _y;
tmp_.autoApplique(getVersReel());
- support_.setMessage(CtuluLib.getS("Distance:")
+ if (support_!=null)
+ support_.setMessage(CtuluLib.getS("Distance:")
+ CtuluLibString.ESPACE
+ CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(tmp_.x_, tmp_.y_, pointFin_.x_,
pointFin_.y_)));
} else {
- support_.unsetMessage();
+ if (support_!=null)
+ support_.unsetMessage();
}
}
@@ -365,12 +370,15 @@
multipoint_.enleveDernier();
multipoint_.affiche(g2d, tp_, isRapide(), tmp_, getVersEcran());
- support_.atomicChanged();
+ if (support_!=null)
+ support_.atomicChanged();
}
}
private boolean polyAdded() {
+ if (support_==null) return false;
+
support_.unsetMessage();
final GrObjet o = multipoint_.getGeometrie();
final DeMultiPoint old = multipoint_;
@@ -501,6 +509,8 @@
void addCurrentForme() {
if (pt_==null) return;
+ if (support_==null) return;
+
final ZEditionAttributesDataI d = features_ == null ? null : features_.createPointData();
if (d != null) {
d.addPoint();
@@ -644,7 +654,7 @@
if (data_ != null) {
data_.addPoint();
}
- boolean ok = support_.addNewRectangle(pointDep_,tmp_, data_);
+ boolean ok = support_!=null && support_.addNewRectangle(pointDep_,tmp_, data_);
pointDep_ = null;
repaint();
return;
@@ -668,12 +678,31 @@
GrPoint tmp_ = new GrPoint();
/**
- * @param _support le support recevant les evts
+ * Constructeur, sans listener associ\xE9.
*/
- public ZCalqueEditionInteraction(final ZCalqueEditionInteractionTargetI _support) {
+ public ZCalqueEditionInteraction() {
super();
- support_ = _support;
}
+ /**
+ * Constructeur, avec listener des op\xE9rations de saisie.
+ * @param _listener le listener recevant les evts
+ */
+ public ZCalqueEditionInteraction(final ZCalqueEditionInteractionTargetI _listener) {
+ super();
+ support_ = _listener;
+ }
+
+ /**
+ * D\xE9finition du listener recevant les op\xE9rations de saisie.
+ * @param _listener Le listener.
+ */
+ public void setListener(ZCalqueEditionInteractionTargetI _listener) {
+ support_ = _listener;
+ }
+
+ public ZCalqueEditionInteractionTargetI getListener() {
+ return support_;
+ }
public Cursor getSpecificCursor() {
return new Cursor(Cursor.CROSSHAIR_CURSOR);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|