Revision 8694

View differences:

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.wms/org.gvsig.wms.provider/src/main/java/org/gvsig/wms/provider/DefaultWMSRasterServerExplorer.java
271 271
    @Override
272 272
    public WMSLayerNode getListAsTree(boolean clone) {
273 273
        if (clone) {
274
            DefaultWMSLayerNode cloned = new DefaultWMSLayerNode(getRooLayer(), null, wmsClient, service);
274
            DefaultWMSLayerNode cloned = new DefaultWMSLayerNode(getRootLayer(), null, wmsClient, service);
275 275
            return cloned;
276 276
        } else {
277 277
            if (layerNode == null) {
278
                layerNode = new DefaultWMSLayerNode(getRooLayer(), null, wmsClient, service);
278
                layerNode = new DefaultWMSLayerNode(getRootLayer(), null, wmsClient, service);
279 279
            }
280 280
            return this.layerNode;
281 281
        }
282 282
    }
283 283

  
284
    private WMSLayer getRooLayer() {
284
    private WMSLayer getRootLayer() {
285 285
        if(rootLayer == null) {
286 286
            rootLayer = this.wmsClient.getRootLayer();
287 287
        }
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.wms/org.gvsig.wms.swing/org.gvsig.wms.swing.impl/src/main/java/org/gvsig/wms/swing/impl/DefaultWMSParametersPanelController.java
489 489
                formatIndex = formats.indexOf(format);
490 490
            }
491 491
        } else {
492
            formatIndex = 0;
493
            format = formats.get(formatIndex);
492
            if(formats.size()>0){
493
                formatIndex = 0;
494
                format = formats.get(formatIndex);
495
            }
494 496
        }
495 497
        lstFormats.getSelectionModel().setSelectionInterval(formatIndex, formatIndex);
496 498

  
......
501 503
                formatInfoIndex = infoFormats.indexOf(infoFormat);
502 504
            }
503 505
        } else {
504
            formatInfoIndex = 0;
505
            infoFormat = infoFormats.get(formatInfoIndex);
506
            if(infoFormats.size()>0){
507
                formatInfoIndex = 0;
508
                infoFormat = infoFormats.get(formatInfoIndex);
509
            }
506 510
        }
507 511
        lstInfoFormats.getSelectionModel().setSelectionInterval(formatInfoIndex, formatInfoIndex);
508 512

  
509

  
510
//        infoFormat = infoFormats.get(0);
511

  
512 513
        txtInformation.setText(serverExplorer.getInfoString());
513 514

  
514 515
        tabWMS.setEnabledAt(4, true);
......
834 835
                    logger.info("Can't get crs from: '"+srs+"' code", e);
835 836
                }
836 837
            }
837
        } else {
838
        };
839
        if(lstProjections.getModel().getSize()>0){
838 840
            lstProjections.setSelectedIndex(0);
839
        };
841
        }
840 842
    }
841 843

  
842 844
    /**
......
1240 1242

  
1241 1243
        } else {
1242 1244
            wmsLayerNode = serverExplorer.getListAsTree(true);
1243
            while(!wmsLayerNode.isLeaf()){
1244
                for (int i=0; i<wmsLayerNode.getChildCount(); i++) {
1245
                    TreeNode child = wmsLayerNode.getChildAt(i);
1246
                    if(child.isLeaf()){
1247
                        wmsLayerNode = (WMSLayerNode)child;
1248
                        break;
1249
                    }
1250
                }
1251
            }
1245
            wmsLayerNode = findLeaf(wmsLayerNode);
1246
            //FIXME: ?if wmsLayerNode == null?
1252 1247
            fillParametersInUniqueNode(wmsLayerNode);
1253 1248
        }
1254
        wmsLayerNode.setTitle(txtLayerName.getText());
1249
        if(wmsLayerNode!=null){
1250
            wmsLayerNode.setTitle(txtLayerName.getText());
1251
        }
1255 1252
        return wmsLayerNode;
1256 1253
    }
1257 1254

  
1255
    private WMSLayerNode findLeaf(WMSLayerNode node){
1256
        if(node.isLeaf()){
1257
            return node;
1258
        }
1259
        for (int i=0; i<node.getChildCount(); i++) {
1260
            WMSLayerNode child = (WMSLayerNode) node.getChildAt(i);
1261
            return findLeaf(child);
1262
        }
1263
        return null;
1264
    }
1265

  
1258 1266
    private void fillParametersInTree(WMSLayerNode wmsLayerNode) {
1259 1267
        if(wmsLayerNode.isLeaf()){
1260 1268
            if(selectedLayers.contains(wmsLayerNode)){

Also available in: Unified diff