Revision 23811

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/FilterListener.java
63 63
 * @author BorSanZa - Borja S?nchez Zamorano (borja.sanchez@iver.es)
64 64
 */
65 65
public class FilterListener implements ActionListener, TreeListComponentListener, TreeListChangeListener, PropertiesComponentListener, FilterUIListener, IProcessActions {
66
	private FilterPanel filterDialog  = null;
66
	private FilterPanel filterPanel  = null;
67 67
	private int          actualParam  = -1;
68 68
	private ArrayList    paramsList   = new ArrayList();
69 69

  
......
71 71
	 * Construye un FilterListener especificando el FilterPanel asociado
72 72
	 * @param filterDialog
73 73
	 */
74
	public FilterListener(FilterPanel filterDialog) {
75
		this.filterDialog = filterDialog;
74
	public FilterListener(FilterPanel filterPanel) {
75
		this.filterPanel = filterPanel;
76 76
	}
77 77
	
78 78
	/**
......
82 82
		if (actualParam == -1)
83 83
			return;
84 84

  
85
		ArrayList listValues = getFilterDialog().getPropertiesComponent().getValues();
85
		ArrayList listValues = getFilterPanel().getPropertiesComponent().getValues();
86 86

  
87 87
		Params params = ((ParamStruct) paramsList.get(actualParam)).getFilterParam();
88 88
		for (int j = 0; j < listValues.size(); j++) {
......
126 126
				RasterToolsUtil.loadPropertiesFromWriterParams(propertiesComponent, params, new String[]{"FilterName"});
127 127
			}
128 128
		}
129
		getFilterDialog().setNewPropertiesComponent(propertiesComponent, filter);
129
		getFilterPanel().setNewPropertiesComponent(propertiesComponent, filter);
130 130
	}
131 131

  
132 132
	/**
......
152 152
	 */
153 153
	public void actionChangeProperties(EventObject e) {
154 154
		RefreshDataProperties();
155
		getFilterDialog().refreshPreview();
155
		getFilterPanel().refreshPreview();
156 156
	}
157 157

  
158 158
	/*
......
168 168
	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
169 169
	 */
170 170
	public void actionPerformed(ActionEvent e) {
171
		getFilterDialog().refreshPreview();
171
		getFilterPanel().refreshPreview();
172 172
	}
173 173

  
174 174
	/*
......
176 176
	 * @see org.gvsig.gui.beans.treelist.listeners.TreeListComponentListener#elementAdded(org.gvsig.gui.beans.treelist.event.TreeListEvent)
177 177
	 */
178 178
	public void elementAdded(TreeListEvent e) {
179
		getFilterDialog().refreshPreview();
179
		getFilterPanel().refreshPreview();
180 180
	}
181 181

  
182 182
	/*
......
184 184
	 * @see org.gvsig.gui.beans.treelist.listeners.TreeListComponentListener#elementMoved(org.gvsig.gui.beans.treelist.event.TreeListEvent)
185 185
	 */
186 186
	public void elementMoved(TreeListEvent e) {
187
		getFilterDialog().refreshPreview();
187
		getFilterPanel().refreshPreview();
188 188
	}
189 189

  
190 190
	/*
......
192 192
	 * @see org.gvsig.gui.beans.treelist.listeners.TreeListComponentListener#elementRemoved(org.gvsig.gui.beans.treelist.event.TreeListEvent)
193 193
	 */
194 194
	public void elementRemoved(TreeListEvent e) {
195
		getFilterDialog().refreshPreview();
195
		getFilterPanel().refreshPreview();
196 196
	}
197 197

  
198 198
	/**
......
216 216
		RasterFilterListManager stackManager = new RasterFilterListManager(filterList);
217 217

  
218 218
		// Conservamos filtros no visibles ya existentes
219
		ArrayList filtersInit = getFilterDialog().getFilterStatus();
219
		ArrayList filtersInit = getFilterPanel().getFilterStatus();
220 220
		for (int i = 0; i < filtersInit.size(); i++) {
221 221
			// Si es visible no hacemos nada
222 222
			if (((RasterFilter) filtersInit.get(i)).isVisible())
......
258 258
		}
259 259

  
260 260
		// Metemos los filtros seleccionados en el panel
261
		ListModel list = getFilterDialog().getMainPanel().getTreeListContainer().getListModel();
261
		ListModel list = getFilterPanel().getMainPanel().getTreeListContainer().getListModel();
262 262
		for (int i = 0; i < list.getSize(); i++) {
263
			Hashtable hastTable = getFilterDialog().getMainPanel().getTreeListContainer().getMap();
263
			Hashtable hastTable = getFilterPanel().getMainPanel().getTreeListContainer().getMap();
264 264
			for (int j = 0; j < paramsList.size(); j++) {
265 265
				boolean active = true;
266 266
				Param param = ((ParamStruct) paramsList.get(j)).getFilterParam().getParamById("enabled");
......
298 298
	public void drawImage(IRasterRendering rendering) {
299 299
		rendering.getRenderFilterList().clear();
300 300

  
301
		if (getFilterDialog().getCBShowFilters().isSelected()) {
301
		if (getFilterPanel().getCBShowFilters().isSelected()) {
302 302
			RasterFilterList filterList = rendering.getRenderFilterList();
303 303
			RasterFilterListManager stackManager = new RasterFilterListManager(filterList);
304 304

  
......
323 323
	 * Que acciones se ejecutaran al haber presionado el bot?n aceptar o aplicar
324 324
	 */
325 325
	public void accept() {
326
		IRasterDataSource raster = ((FLyrRasterSE) getFilterDialog().getLayer()).getDataSource();
326
		IRasterDataSource raster = ((FLyrRasterSE) getFilterPanel().getLayer()).getDataSource();
327 327
		if (raster == null)
328 328
			return;
329 329

  
330 330
		String path = null;
331
		if (!getFilterDialog().getNewLayerPanel().isOnlyViewSelected()) {
332
			path = getFilterDialog().getNewLayerPanel().getFileSelected();
331
		if (!getFilterPanel().getNewLayerPanel().isOnlyViewSelected()) {
332
			path = getFilterPanel().getNewLayerPanel().getFileSelected();
333 333
			if (path == null)
334 334
				return;
335 335
		}
336 336

  
337 337
		//Rendering rendering = ((FLyrRasterSE) getFilterPanel().getLayer()).getRender();
338
		IRasterRendering rendering = (IRasterRendering) getFilterDialog().getLayer();
338
		IRasterRendering rendering = (IRasterRendering) getFilterPanel().getLayer();
339 339

  
340 340
		// Array para guardar los filtros que se van a usar en forma de ParamStruct
341 341
		ArrayList listFilterUsed = applyFilters(rendering);
342 342

  
343
		if (filterDialog.getNewLayerPanel().isOnlyViewSelected()) {
343
		if (filterPanel.getNewLayerPanel().isOnlyViewSelected()) {
344 344
			try {
345 345
				FilterProcess.addSelectedFilters(rendering.getRenderFilterList(), listFilterUsed);
346
				((FLyrRasterSE) getFilterDialog().getLayer()).setRenderFilterList(rendering.getRenderFilterList());
347
				getFilterDialog().getLayer().getMapContext().invalidate();
346
				((FLyrRasterSE) getFilterPanel().getLayer()).setRenderFilterList(rendering.getRenderFilterList());
347
				getFilterPanel().getLayer().getMapContext().invalidate();
348 348
			} catch (FilterTypeException e) {
349 349
				RasterToolsUtil.messageBoxError(PluginServices.getText(this, "error_adding_filters"), this, e);
350 350
			}
......
363 363
	 * Devuelve el FilterPanel asociado al FilterListener
364 364
	 * @return
365 365
	 */
366
	public FilterPanel getFilterDialog() {
367
		return filterDialog;
366
	public FilterPanel getFilterPanel() {
367
		return filterPanel;
368 368
	}
369 369

  
370 370
	/**
......
372 372
	 * Este m?todo es llamado por el thread TailRasterProcess al finalizar.
373 373
	 */
374 374
	public void loadLayerInToc(String fileName) {
375
		if (!getFilterDialog().getNewLayerPanel().isNewLayerSelected())
375
		if (!getFilterPanel().getNewLayerPanel().isNewLayerSelected())
376 376
			return;
377 377
		if(!new File(fileName).exists())
378 378
			return;
379 379
		try {
380
			RasterToolsUtil.loadLayer(getFilterDialog().getViewName(), fileName, null);
380
			RasterToolsUtil.loadLayer(getFilterPanel().getViewName(), fileName, null);
381 381
		} catch (RasterNotLoadException e) {
382 382
			RasterToolsUtil.messageBoxError("error_cargar_capa", this, e);
383 383
		}
384 384

  
385
		if(filterDialog != null)
386
			filterDialog.updateNewLayerText();
385
		if(filterPanel != null)
386
			filterPanel.updateNewLayerText();
387 387
	}
388 388

  
389 389
	/*

Also available in: Unified diff