Revision 1151

View differences:

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/GenericToolBarModule.java
203 203
	@SuppressWarnings("deprecation")
204 204
	public boolean isVisible() {
205 205
		org.gvsig.andami.ui.mdiManager.IWindow f = PluginServices.getMDIManager().getActiveWindow();
206
		if (f == null) {
206
		if (f == null || !(f instanceof AbstractViewPanel)) {
207 207
			setToolBarVisible(false);
208 208
			return false;
209 209
		}
210
		
211
		if (getGenericToolBarPanel() != null)
212
			getGenericToolBarPanel().setLayers(null);
213
		AbstractViewPanel vista = (AbstractViewPanel) f;
214
		ViewDocument model = vista.getModel();
215
		MapContext mapa = model.getMapContext();
216
		if (mapa.getLayers().getLayersCount() > 0) {
217
			if (getGenericToolBarPanel() != null) {
218
				getGenericToolBarPanel().setLayers(mapa.getLayers());
219
			}
220
		}
221
		
222
		setToolBarVisible(true);
223
		return true;
210 224

  
211
		if (f instanceof AbstractViewPanel) {
225
		/*if (f instanceof AbstractViewPanel) {
212 226
			AbstractViewPanel vista = (AbstractViewPanel) f;
213 227
			ViewDocument model = vista.getModel();
214 228
			MapContext mapa = model.getMapContext();
......
222 236
		}
223 237

  
224 238
		setToolBarVisible(false);
225
		return false;
239
		return false;*/
226 240
	}
227 241

  
228 242
	public void execute(String actionCommand) {}
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
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
			}
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/RasterToolsUtil.java
96 96
	 * en la lista es de abajo a arriba las que aparecen en el TOC.
97 97
	 */
98 98
	public static ArrayList<FLayer> getLayerList(FLayers srcLyrs, ArrayList<FLayer> destLyrs) {
99
		if(srcLyrs == null)
100
			return null;
99 101
		if(destLyrs == null)
100 102
			destLyrs = new ArrayList<FLayer>();
101 103
		for (int i = 0; i < srcLyrs.getLayersCount(); i++) {

Also available in: Unified diff