Revision 5518

View differences:

trunk/extensions/extWMS/src/com/iver/cit/gvsig/gui/dialogs/WMSPropsDialog.java
54 54
import javax.swing.JPanel;
55 55
import javax.swing.tree.TreePath;
56 56

  
57
import org.gvsig.gui.beans.controls.dnd.JDnDList;
58
import org.gvsig.gui.beans.controls.dnd.JDnDListModel;
59

  
57 60
import com.iver.andami.PluginServices;
58 61
import com.iver.andami.ui.mdiManager.View;
59 62
import com.iver.andami.ui.mdiManager.ViewInfo;
......
98 101
    
99 102
	private void initialize(FLayer layer) {
100 103
		setLayout(null);
101

  
104
		
102 105
        setFLayer(layer);
103 106
        wmsParamsTabbedPane = getParamsPanel(((FLyrWMS) layer).getProperties());
104 107
        wmsParamsTabbedPane.addWizardListener(new WizardListener(){
......
110 113
			public void error(Exception e) {
111 114
			}
112 115
        	
113
        })  ;     
116
        })  ;
117
        wmsParamsTabbedPane.disableDisagregatedLayers();
114 118
        this.add(wmsParamsTabbedPane);
115 119
        this.add(getButtonsPanel(), null);
116 120
        
......
169 173
                WMSLayerNode[] selectedLayers = (WMSLayerNode[]) ((Vector) info.get("selectedLayers")).toArray(new WMSLayerNode[0]);
170 174
                //boolean any = false;
171 175
                // selected layers
176
                //((JDnDListModel) toc.getLstSelectedLayers().getModel()).clear();
172 177
	            for (int i = 0; i < selectedLayers.length; i++) {
173
                    //  Se a?ade a la lista de layers seleccionados	            	
178
	            	toc.getJustTreeLayer().clearSelection();
179
	            	//  Se a?ade a la lista de layers seleccionados	            	
174 180
	            	TreePath path = new TreePath(((LayerTreeModel)toc.getJustTreeLayer()
175 181
	            						.getModel()).getNodeByName(selectedLayers[i].getName()));
176 182
	            	toc.getJustTreeLayer().addSelectionPath(path);
......
300 306
		        	return;
301 307
				}				
302 308
                ((FLyrWMS) fLayer).setFormat(wmsParamsTabbedPane.getFormat());
303
                //((FLyrWMS) fLayer).setLayerQuery(wmsParamsTabbedPane.getLayersQuery());
309
                
310
                if (!wmsParamsTabbedPane.getDisagregatedLayers())
311
                	((FLyrWMS) fLayer).setLayerQuery(wmsParamsTabbedPane.getLayersQuery());
304 312
                ((FLyrWMS) fLayer).setInfoLayerQuery(wmsParamsTabbedPane.getQueryableLayerQuery());
305 313
                ((FLyrWMS) fLayer).setSRS(wmsParamsTabbedPane.getSRS());
306 314
                ((FLyrWMS) fLayer).setName(wmsParamsTabbedPane.getLayerName());
trunk/extensions/extWMS/src/com/iver/cit/gvsig/gui/panels/WMSParamsPanel.java
1184 1184
    	return v;
1185 1185
    }
1186 1186
    
1187
    public Vector getLayerStyle(String layerName)
1188
    {
1189
    	Vector v = new Vector();
1190
    	WMSLayerNode[] layers = selectedLayersToArray();
1191
    	for (int i = 0; i < layers.length; i++) {
1192
    		if (layers[i].getName().equalsIgnoreCase( layerName))
1193
    		{
1194
    			FMapWMSStyle sty = layers[i].getSelectedStyle();
1195
    			String s = (sty!=null)? sty.name : "";
1196
    			v.add(s);
1197
    			return v;
1198
    		}
1199
		}
1200
    	return v;
1201
    }
1202
    
1187 1203
    /**
1188 1204
     * This method initializes tabInfo	
1189 1205
     * 	
......
1334 1350
		        layer.setSRS(getSRS());
1335 1351
		        layer.setName(node.getTitle());
1336 1352
		        layer.setWmsTransparency(getTransparency());
1337
		        layer.setStyles(getStyles());
1353
		        layer.setStyles(getLayerStyle(node.getName()));
1338 1354
		        layer.setDimensions(getDimensions());
1339 1355
		        layer.setDriver(getDriver());
1340 1356
		        layer.setOnlineResources(getOnlineResources());
......
1518 1534
	public boolean getDisagregatedLayers(){
1519 1535
		return chkDisagregate.isSelected();		
1520 1536
	}
1537
	public void disableDisagregatedLayers(){
1538
		chkDisagregate.setEnabled(false);
1539
	}
1521 1540
}  //  @jve:decl-index=0:visual-constraint="10,10"

Also available in: Unified diff