Revision 47779 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/impl/DefaultMapControlManager.java

View differences:

DefaultMapControlManager.java
36 36 
import java.util.Map;
37 37 
import java.util.Set;
38 38 
import java.util.function.Predicate;
39 
import java.util.function.Supplier;
39 40 
import java.util.prefs.Preferences;
40 41 
import javax.swing.JButton;
41 42 
import javax.swing.JComboBox;
......
413 414 
            JButton btnMapControlEnvelope,
414 415 
            JToggleButton btnCapture
415 416 
        ) {
416 
        EnvelopePickerControllerImpl controller = new EnvelopePickerControllerImpl(mapControl, txtUpperLeftX,
417 
                txtUpperLeftY, txtLowerRightX, txtLowerRightY,
418 
                btnMapControlEnvelope, btnCapture
417 
        EnvelopePickerControllerImpl controller = new EnvelopePickerControllerImpl(
418 
                () -> mapControl,
419 
                txtUpperLeftX,
420 
                txtUpperLeftY,
421 
                txtLowerRightX,
422 
                txtLowerRightY,
423 
                btnMapControlEnvelope,
424 
                btnCapture
419 425 
        );
420 426 
        return controller;
421 427 
    }
......
427 433 
            JButton btnMapControlEnvelope,
428 434 
            JToggleButton btnCapture
429 435 
        ) {
436 
        return this.createEnvelopePickerController(
437 
                () -> mapControl,
438 
                txtEnvelope,
439 
                btnMapControlEnvelope,
440 
                btnCapture
441 
        );
442 
    }
443
444 
    @Override
445 
    public EnvelopePickerControllerImpl createEnvelopePickerController(
446 
            Supplier<MapControl> mapControl,
447 
            JTextComponent txtEnvelope,
448 
            JButton btnMapControlEnvelope,
449 
            JToggleButton btnCapture
450 
        ) {
430 451 
        EnvelopePickerControllerImpl controller = new EnvelopePickerControllerImpl(
431 452 
                mapControl,
432 453 
                txtEnvelope,

Also available in: Unified diff