Revision 640

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/DefaultSelectionByThemeDataSource.java
16 16
	/**
17 17
	 * @see com.iver.cit.gvsig.gui.SelectionByThemeDataSource#getViews()
18 18
	 */
19
	public String[] getLayers() {
20
		String[] ret = new String[layers.getLayersCount()];
21
		for (int i = 0; i < ret.length; i++){
22
			ret[i] = layers.getLayer(i).getName(); 
23
		}
19
	public FLayers getLayers() {
24 20
		
25
		return ret;
21
		return layers;
26 22
	}
27 23

  
28 24
}
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/SelectionByThemeDataSource.java
1 1
package com.iver.cit.gvsig.gui;
2 2

  
3
import com.iver.cit.gvsig.fmap.layers.FLayers;
3 4

  
5

  
4 6
public interface SelectionByThemeDataSource {
5
	public String[] getLayers();
7
	public FLayers getLayers();
6 8
}
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/SelectionByTheme.java
254 254
	 */
255 255
	public void setDataSource(SelectionByThemeDataSource source) {
256 256
		dataSource = source;
257
		String[] nameLayers = new String[dataSource.getLayers().getLayersCount()];
258
		for (int i=0; i < nameLayers.length; i++)
259
			nameLayers[i] = dataSource.getLayers().getLayer(i).getName();
257 260
		DefaultComboBoxModel model = 
258
			new DefaultComboBoxModel(dataSource.getLayers());
261
			new DefaultComboBoxModel(nameLayers);
259 262
		cmbCapas.setModel(model);
260 263
	}
261 264
	/**
......
272 275
		for (int i = 0; i < listeners.size();
273 276
				i++) {
274 277
			SelectionByThemeListener l = (SelectionByThemeListener) listeners.get(i);
275
			l.newSet(layers, layers[selection], actionCode);
278
			l.newSet(layers, dataSource.getLayers().getLayer(selection), actionCode);
276 279
		}
277 280
		
278 281
	}
......
281 284
		for (int i = 0; i < listeners.size();
282 285
				i++) {
283 286
			SelectionByThemeListener l = (SelectionByThemeListener) listeners.get(i);
284
			l.addToSet(layers, layers[selection], actionCode);
287
			l.addToSet(layers, dataSource.getLayers().getLayer(selection), actionCode);
285 288
		}
286 289
		
287 290
	}
......
290 293
		for (int i = 0; i < listeners.size();
291 294
				i++) {
292 295
			SelectionByThemeListener l = (SelectionByThemeListener) listeners.get(i);
293
			l.fromSet(layers, layers[selection], actionCode);
296
			l.fromSet(layers, dataSource.getLayers().getLayer(selection), actionCode);
294 297
		}
295 298
		
296 299
	}

Also available in: Unified diff