Revision 42651 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/FLayers.java

View differences:

FLayers.java
213 213

  
214 214
            if (layer instanceof FLayers) {
215 215
                FLayers layers = (FLayers) layer;
216
                fmap.addAsCollectionListener(layers);
216
                if( fmap != null ) {
217
                    fmap.addAsCollectionListener(layers);
218
                }
217 219
            }
218 220
            callLayerAdding(LayerCollectionEvent.createLayerAddingEvent(layer));
219 221

  
......
605 607

  
606 608
            } catch (Exception e) {
607 609
                String mesg = Messages.getString("error_printing_layer") + " " + lyr.getName() + ": " + e.getMessage();
608
                fmap.addLayerError(mesg);
610
                if( fmap!=null ) {
611
                    fmap.addLayerError(mesg);
612
                }
609 613
                logger.error(mesg, e);
610 614
            }
611 615

  
......
1018 1022

  
1019 1023
    @Override
1020 1024
    public void beginDraw(Graphics2D g, ViewPort viewPort) {
1025
        if( fmap == null ) {
1026
            return;
1027
        }
1021 1028
        LayerDrawEvent beforeEvent = new LayerDrawEvent(this, g, viewPort, LayerDrawEvent.LAYER_BEFORE_DRAW);
1022 1029
        fmap.fireLayerDrawingEvent(beforeEvent);
1023 1030
    }
1024 1031

  
1025 1032
    @Override
1026 1033
    public void endDraw(Graphics2D g, ViewPort viewPort) {
1034
        if( fmap == null ) {
1035
            return;
1036
        }
1027 1037
        LayerDrawEvent afterEvent = new LayerDrawEvent(this, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW);
1028 1038
        fmap.fireLayerDrawingEvent(afterEvent);
1029 1039
    }

Also available in: Unified diff