Revision 30

View differences:

org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsEditRouteCalibrationController.java
273 273
            public void actionPerformed(ActionEvent e) {
274 274
                canceled = false;
275 275
                validateData();
276
                //doClose();
276
                doClose();
277 277
                listeners.fireActionEvent(new ActionEvent(
278 278
                    JLrsEditRouteCalibrationController.this, 0,
279 279
                    "accept"));
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
198 198
                                saveLayer(activeLayer,params);
199 199
                            }
200 200

  
201
                            panelController.close();
201
                            panel.close();
202 202
                        }
203 203

  
204 204
                    });
......
359 359
     * @see java.awt.event.ComponentListener#componentHidden(java.awt.event.ComponentEvent)
360 360
     */
361 361
    public void componentHidden(ComponentEvent e) {
362
        panelSelectId = null;
363
        panelController = null;
362
        if(e.getComponent() == panelSelectId){
363
            panelSelectId = null;
364
        } else if(e.getComponent() == panelController){
365
            panelController = null;
366
        } else {
367
            if(e.getComponent().getComponentAt(0, 0) == panelSelectId){
368
                panelSelectId = null;
369
            } else if(e.getComponent().getComponentAt(0, 0) == panelController){
370
                panelController.close();
371
                panelController = null;
372
            }
373
        }
364 374
    }
365 375
}

Also available in: Unified diff