Revision 1151 org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/generictoolbar/GenericToolBarPanel.java

View differences:

GenericToolBarPanel.java
53 53
 * @version 13/02/2008
54 54
 * @author BorSanZa - Borja S?nchez Zamorano (borja.sanchez@iver.es)
55 55
 */
56
@SuppressWarnings("unchecked")
56 57
public class GenericToolBarPanel extends JToolBar implements ComboButtonListener, ActionListener, MouseListener, ItemListener {
57 58
	private static final long serialVersionUID = -4382962282970490523L;
58 59
	private JComboBoxConfigurableLookUp jCBCLU = null;
......
75 76
		getComboBoxConfigurableLookUp().setBlockPopupHided(true);
76 77
		getComboBoxConfigurableLookUp().removeAllItems();
77 78

  
78
		ArrayList lyrs = RasterToolsUtil.getLayerList(layers, null);
79
		for (int i = 0; i < lyrs.size(); i++)
80
			getComboBoxConfigurableLookUp().addItem(((FLayer)lyrs.get(i)).getName());
79
		if(layers != null) {
80
			ArrayList lyrs = RasterToolsUtil.getLayerList(layers, null);
81
			for (int i = 0; i < lyrs.size(); i++)
82
				getComboBoxConfigurableLookUp().addItem(((FLayer)lyrs.get(i)).getName());
81 83

  
82
		if (layers.getActives().length > 0)
83
			getComboBoxConfigurableLookUp().setSelectedItem(layers.getActives()[0].getName());
84
		else if (layers.getLayersCount() > 0)
85
			getComboBoxConfigurableLookUp().setSelectedItem(layers.getLayer(0).getName());
84
			if (layers.getActives().length > 0)
85
				getComboBoxConfigurableLookUp().setSelectedItem(layers.getActives()[0].getName());
86
			else if (layers.getLayersCount() > 0)
87
				getComboBoxConfigurableLookUp().setSelectedItem(layers.getLayer(0).getName());
88
		}
86 89
		reloadSubMenu();
87 90
		getComboBoxConfigurableLookUp().setBlockPopupHided(false);
88 91
	}
......
245 248

  
246 249
					if (getLayerSelected() != null) {
247 250
						item.execute(null, new FLayer[] { getLayerSelected() });
248
						reloadSubMenu();
249
					}
251
					} else
252
						item.execute(null, null);
253
					reloadSubMenu();
250 254
					return;
251 255
				}
252 256
			}

Also available in: Unified diff