Revision 29

View differences:

org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.app/org.gvsig.lrs.app.mainplugin/src/main/java/org/gvsig/lrs/app/editroutecalibration/EditRouteCalibrationExtension.java
22 22
 */
23 23
package org.gvsig.lrs.app.editroutecalibration;
24 24

  
25
import java.awt.Component;
25 26
import java.awt.event.ActionEvent;
26 27
import java.awt.event.ActionListener;
27 28
import java.awt.event.ComponentEvent;
......
37 38

  
38 39
import org.gvsig.andami.IconThemeHelper;
39 40
import org.gvsig.andami.plugins.Extension;
41
import org.gvsig.andami.ui.ToolsWindowManager.Window;
40 42
import org.gvsig.app.ApplicationLocator;
41 43
import org.gvsig.app.ApplicationManager;
42 44
import org.gvsig.app.project.documents.view.ViewDocument;
......
76 78

  
77 79
    private static final Logger logger = LoggerFactory.getLogger(EditRouteCalibrationExtension.class);
78 80

  
79
    private JLrsEditRouteCalibrationSelectIdRouteController panel;
81
    private JLrsEditRouteCalibrationSelectIdRouteController panelSelectId;
80 82

  
81 83
    private JLrsEditRouteCalibrationController panelController;
82 84

  
......
104 106
            final I18nManager i18nManager = ToolsLocator.getI18nManager();
105 107

  
106 108
            try {
107
                panel = (JLrsEditRouteCalibrationSelectIdRouteController)manager.createJLrsEditRouteCalibrationSelectIdRouteAlgorithmParameters(activeLayer, null);
108
                panel.addComponentListener(this);
109
                panelSelectId = (JLrsEditRouteCalibrationSelectIdRouteController)manager.createJLrsEditRouteCalibrationSelectIdRouteAlgorithmParameters(activeLayer, null);
110
                panelSelectId.addComponentListener(this);
109 111
            } catch (LrsNeededParameterException e2) {
110 112
                logger.error("Error creating panel", e2);
111 113
                JOptionPane.showMessageDialog(
......
115 117
                    i18nManager.getTranslation("error"), JOptionPane.ERROR_MESSAGE);
116 118
                return;
117 119
            }
118
            panel.setVisibleAceptCancel(true);
119
            panel.addActionListener(new ActionListener() {
120
            panelSelectId.setVisibleAceptCancel(true);
121
            panelSelectId.addActionListener(new ActionListener() {
120 122

  
121 123
                public void actionPerformed(ActionEvent e) {
122 124
                    JLrsAlgorithmParams panel = (JLrsAlgorithmParams) e.getSource();
......
204 206
                        WindowManager.MODE.WINDOW);
205 207
                }
206 208
            });
207
            winManager.showWindow(panel.asJComponent(), i18nManager.getTranslation("edit_route_calibration"),
209
            winManager.showWindow(panelSelectId.asJComponent(), i18nManager.getTranslation("edit_route_calibration"),
208 210
                WindowManager.MODE.WINDOW);
209 211
        }
210 212
    }
......
223 225
        IView view = getActiveView();
224 226
        if (view!=null){
225 227
            FLyrVect activeLayer = getActiveLayer(view);
226
            if (panel == null && panelController == null && activeLayer!=null && activeLayer.isEditing()){
228
            if (panelSelectId == null && panelController == null && activeLayer!=null && activeLayer.isEditing()){
227 229
                return JLrsUtils.isMlayerWithNonGeomField(activeLayer);
228 230
            }
229 231
        }
......
357 359
     * @see java.awt.event.ComponentListener#componentHidden(java.awt.event.ComponentEvent)
358 360
     */
359 361
    public void componentHidden(ComponentEvent e) {
360
        if(e.getComponent() == panel){
361
            panel = null;
362
        }
363
        if(e.getComponent() == panelController){
364
            panelController = null;
365
        }
362
        panelSelectId = null;
363
        panelController = null;
366 364
    }
367 365
}

Also available in: Unified diff