Revision 321

View differences:

org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.swing/org.gvsig.vectorediting.swing.impl/src/main/java/org/gvsig/vectorediting/swing/impl/DefaultEditingBehavior.java
37 37
import org.slf4j.Logger;
38 38
import org.slf4j.LoggerFactory;
39 39

  
40
import org.gvsig.fmap.geom.Geometry;
41 40
import org.gvsig.fmap.geom.primitive.Point;
42 41
import org.gvsig.fmap.mapcontext.ViewPort;
43 42
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
......
89 88

  
90 89
        if (editingContext.getMapControl() != null) {
91 90
            this.editingContext = editingContext;
91
            setMapControl(editingContext.getMapControl());
92 92
        }
93 93
    }
94 94

  
org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.swing/org.gvsig.vectorediting.swing.impl/src/main/java/org/gvsig/vectorediting/swing/impl/EditingCompoundBehavior.java
48 48
    private Mode mode = Mode.EDITING;
49 49
    private IBehavior editing;
50 50
    private IBehavior selection;
51
    private IBehavior zoom;
52 51

  
53 52
    public final static int EDITING_INDEX = 0;
54 53
    public final static int SELECTION_INDEX = 1;
......
58 57
        this.editing = editing;
59 58

  
60 59
        this.selection = null;
61
        this.zoom = new MouseWheelBehavior();
62 60
    }
63 61

  
64 62
    @Override
......
151 149
        case SELECTION:
152 150
            this.selection.mouseClicked(e);
153 151
        }
154
        this.zoom.mouseClicked(e);
155 152
    }
156 153

  
157 154
    @Override
......
164 161
        case SELECTION:
165 162
            this.selection.mouseDragged(e);
166 163
        }
167
        this.zoom.mouseDragged(e);
168 164
    }
169 165

  
170 166
    @Override
......
177 173
        case SELECTION:
178 174
            this.selection.mouseEntered(e);
179 175
        }
180
        this.zoom.mouseEntered(e);
181 176
    }
182 177

  
183 178
    @Override
......
190 185
        case SELECTION:
191 186
            this.selection.mouseExited(e);
192 187
        }
193
        this.zoom.mouseExited(e);
194 188
    }
195 189

  
196 190
    @Override
......
203 197
        case SELECTION:
204 198
            this.selection.mouseMoved(e);
205 199
        }
206
        this.zoom.mouseMoved(e);
207 200
    }
208 201

  
209 202
    @Override
......
216 209
        case SELECTION:
217 210
            this.selection.mousePressed(e);
218 211
        }
219
        this.zoom.mousePressed(e);
220 212
    }
221 213

  
222 214
    @Override
......
229 221
        case SELECTION:
230 222
            this.selection.mouseReleased(e);
231 223
        }
232
        this.zoom.mouseReleased(e);
233 224
    }
234 225

  
235 226
    @Override
......
242 233
        case SELECTION:
243 234
            this.selection.mouseWheelMoved(e);
244 235
        }
245
        this.zoom.mouseWheelMoved(e);
246 236
    }
247 237

  
248 238
    @Override
......
255 245
        case SELECTION:
256 246
            this.selection.paintComponent(renderer);
257 247
        }
258
        this.zoom.paintComponent(renderer);
259 248
    }
260 249

  
261 250
    @Override
......
274 263
    @Override
275 264
    public void setMapControl(MapControl mc) {
276 265
        this.editing.setMapControl(mc);
277
        this.zoom.setMapControl(mc);
278 266

  
279 267
        if (this.selection == null) {
280 268
            if (mc != null) {

Also available in: Unified diff