Revision 22023 trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/generictoolbar/GenericToolBarPanel.java

View differences:

GenericToolBarPanel.java
25 25
import java.awt.event.ItemListener;
26 26
import java.awt.event.MouseEvent;
27 27
import java.awt.event.MouseListener;
28
import java.util.ArrayList;
28 29
import java.util.Iterator;
29 30

  
30 31
import javax.swing.JToolBar;
......
33 34
import org.gvsig.gui.beans.comboboxconfigurablelookup.JComboBoxConfigurableLookUp;
34 35
import org.gvsig.gui.beans.controls.combobutton.ComboButton;
35 36
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
37
import org.gvsig.raster.util.RasterToolsUtil;
36 38

  
37 39
import com.iver.cit.gvsig.fmap.layers.FLayer;
38 40
import com.iver.cit.gvsig.fmap.layers.FLayers;
......
58 60
		initialize();
59 61
	}
60 62
	
61
	/**
63
	/**	
62 64
	 * Especifica que las capas de la vista han cambiado.
63 65
	 * @param layers
64 66
	 */
65 67
	public void setLayers(FLayers layers) {
66 68
		lastLayers = layers;
67 69

  
68

  
69 70
		getComboBoxConfigurableLookUp().setBlockPopupHided(true);
70 71
		getComboBoxConfigurableLookUp().removeAllItems();
71
		for (int i = 0; i < layers.getLayersCount(); i++) {
72
			getComboBoxConfigurableLookUp().addItem(layers.getLayer(i).getName());
73
		}
72
		
73
		ArrayList lyrs = RasterToolsUtil.getLayerList(layers, null);
74
		for (int i = 0; i < lyrs.size(); i++) 
75
			getComboBoxConfigurableLookUp().addItem(((FLayer)lyrs.get(i)).getName());
74 76

  
75 77
		if (layers.getActives().length > 0) {
76 78
			getComboBoxConfigurableLookUp().setSelectedItem(layers.getActives()[0].getName());
......
179 181
	public FLayer getLayerSelected() {
180 182
		if (lastLayers == null)
181 183
			return null;
182
		for (int i = 0; i < lastLayers.getLayersCount(); i++) {
183
			if (lastLayers.getLayer(i).getName().equals(getComboBoxConfigurableLookUp().getEditor().getItem())) {
184
				return lastLayers.getLayer(i);
185
			}
184
		ArrayList lyrs = RasterToolsUtil.getLayerList(lastLayers, null);
185
		for (int i = 0; i < lyrs.size(); i++) {
186
			if (((FLayer)lyrs.get(i)).getName().equals(getComboBoxConfigurableLookUp().getEditor().getItem())) 
187
				return (FLayer)lyrs.get(i);
186 188
		}
187 189
		return null;
188 190
	}

Also available in: Unified diff