Revision 20646

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/util/RasterToolsUtil.java
83 83
	}
84 84
	
85 85
	/**
86
	 * A?ade una ventana al gestor de ventanas
87
	 * @param window
88
	 */
89
	public static void addWindow(IWindow window) {
90
		PluginServices.getMDIManager().addWindow(window);
91
	}
92
	
93
	/**
94
	 * Elimina una ventana al gestor de ventanas
95
	 * @param window
96
	 */
97
	public static void closeWindow(IWindow window) {
98
		PluginServices.getMDIManager().closeWindow(window);
99
	}
100
	
101
	/**
86 102
	 * Selecciona los controles del panel de propiedades a partir de los par?mtros
87 103
	 * obtenidos del driver. Este m?todo realiza una transformaci?n entre Params
88 104
	 * obtenido del driver de escritura y los par?metros del panel de propiedades.
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/GeneralToolsModule.java
74 74
				}
75 75
			}
76 76
			PixelncreaseDialog pIncrease = new PixelncreaseDialog();
77
			PluginServices.getMDIManager().addWindow(pIncrease);
77
			RasterToolsUtil.addWindow(pIncrease);
78 78
		}
79 79
	}
80 80

  
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/ui/NewOrSaveLayerPanel.java
1
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
2
 *
3
 * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
4
 *
5
 * This program is free software; you can redistribute it and/or
6
 * modify it under the terms of the GNU General Public License
7
 * as published by the Free Software Foundation; either version 2
8
 * of the License, or (at your option) any later version.
9
 *
10
 * This program is distributed in the hope that it will be useful,
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 * GNU General Public License for more details.
14
 *
15
 * You should have received a copy of the GNU General Public License
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
 */
19
package org.gvsig.rastertools.filter.ui;
20

  
21
import java.awt.Dimension;
22
import java.awt.GridBagConstraints;
23
import java.awt.GridBagLayout;
24
import java.awt.Insets;
25
import java.awt.event.ItemEvent;
26
import java.awt.event.ItemListener;
27
import java.io.File;
28

  
29
import javax.swing.BorderFactory;
30
import javax.swing.ButtonGroup;
31
import javax.swing.JFileChooser;
32
import javax.swing.JLabel;
33
import javax.swing.JPanel;
34
import javax.swing.JRadioButton;
35
import javax.swing.JTextField;
36

  
37
import org.gvsig.raster.RasterLibrary;
38
import org.gvsig.raster.dataset.GeoRasterWriter;
39
import org.gvsig.raster.util.ExtendedFileFilter;
40
import org.gvsig.raster.util.PropertyEvent;
41
import org.gvsig.raster.util.PropertyListener;
42

  
43
import com.iver.andami.PluginServices;
44
import com.iver.andami.Utilities;
45
import com.iver.cit.gvsig.addlayer.fileopen.FileOpenWizard;
46
/**
47
 * Panel para unificar las propiedades de generacion de capas nuevas en ficheros
48
 * o solo en visualizacion.
49
 * 
50
 * @version 10/03/2008
51
 * @author BorSanZa - Borja S?nchez Zamorano (borja.sanchez@iver.es)
52
 */
53
public class NewOrSaveLayerPanel extends JPanel implements PropertyListener {
54
	private static final long serialVersionUID = 3921564127360827156L;
55
	private JRadioButton jRBOnlyView       = null;
56
	private JRadioButton jRBNewLayer       = null;
57
	private JRadioButton jRBFileGenerate   = null;
58
	private JRadioButton jRBOpenMemory     = null;
59

  
60
	private JPanel       jPNameFile        = null;
61
	private JLabel       labelFilename     = null;
62
	private JTextField   filenameTextField = null;
63
	private boolean      compress          = false;
64

  
65
	/**
66
	 * Constructor de un NewOrSaveLayerPanel
67
	 */
68
	public NewOrSaveLayerPanel() {
69
		initialize();
70
		translate();
71
	}
72

  
73
	/**
74
	 * Seccion donde ir?n todas las traducciones invariables del componente
75
	 */
76
	private void translate() {
77
		getRadioOnlyView().setText(PluginServices.getText(this, "solo_visualizacion"));
78
		getRadioNewLayer().setText(PluginServices.getText(this, "capa_nueva"));
79
		getRadioFileGenerate().setText(PluginServices.getText(this, "generar_fichero"));
80
		getRadioOpenMemory().setText(PluginServices.getText(this, "abrir_memoria"));
81
		getLabelFilename().setText(PluginServices.getText(this, "nombre_capa") + ":");
82
	}
83
	
84
	private void initialize() {
85
		ButtonGroup buttonGroup1;
86
		ButtonGroup buttonGroup2;
87
		GridBagConstraints gridBagConstraints;
88

  
89
		setLayout(new GridBagLayout());
90
		
91
		buttonGroup1 = new ButtonGroup();
92
		buttonGroup1.add(getRadioOnlyView());
93

  
94
		gridBagConstraints = new GridBagConstraints();
95
		gridBagConstraints.gridx = 0;
96
		gridBagConstraints.gridy = 0;
97
		gridBagConstraints.anchor = GridBagConstraints.WEST;
98
		gridBagConstraints.insets = new Insets(3, 3, 3, 3);
99
		add(getRadioOnlyView(), gridBagConstraints);
100

  
101
		buttonGroup1.add(getRadioNewLayer());
102

  
103
		gridBagConstraints = new GridBagConstraints();
104
		gridBagConstraints.gridx = 0;
105
		gridBagConstraints.gridy = 1;
106
		gridBagConstraints.anchor = GridBagConstraints.WEST;
107
		gridBagConstraints.insets = new Insets(3, 3, 3, 3);
108
		add(getRadioNewLayer(), gridBagConstraints);
109
		
110
		JPanel jPanel2 = new JPanel();
111
		jPanel2.setLayout(new GridBagLayout());
112

  
113
		jPanel2.setBorder(BorderFactory.createTitledBorder(""));
114
		buttonGroup2 = new ButtonGroup();
115
		buttonGroup2.add(getRadioFileGenerate());
116
		gridBagConstraints = new GridBagConstraints();
117
		gridBagConstraints.anchor = GridBagConstraints.WEST;
118
		gridBagConstraints.insets = new Insets(3, 3, 3, 3);
119
		gridBagConstraints.weightx = 1.0;
120
		jPanel2.add(getRadioFileGenerate(), gridBagConstraints);
121

  
122
		buttonGroup2.add(getRadioOpenMemory());
123
		gridBagConstraints = new GridBagConstraints();
124
		gridBagConstraints.gridx = 0;
125
		gridBagConstraints.gridy = 1;
126
		gridBagConstraints.anchor = GridBagConstraints.WEST;
127
		gridBagConstraints.insets = new Insets(3, 3, 3, 3);
128
		jPanel2.add(getRadioOpenMemory(), gridBagConstraints);
129
		
130
		gridBagConstraints = new GridBagConstraints();
131
		gridBagConstraints.gridx = 0;
132
		gridBagConstraints.gridy = 2;
133
		gridBagConstraints.anchor = GridBagConstraints.WEST;
134
		gridBagConstraints.insets = new Insets(3, 3, 3, 3);
135
		add(jPanel2, gridBagConstraints);
136
	}
137
	
138
	/**
139
	 * Poner los estados de los RadioButton en caso de que cambien de valor
140
	 * @param evt
141
	 */
142
	private void jRBNewLayerStateChanged(ItemEvent evt) {
143
		if (getRadioNewLayer().getSelectedObjects() != null) {
144
			getRadioFileGenerate().setEnabled(true);
145
			getRadioOpenMemory().setEnabled(true);
146
			if (getRadioOpenMemory().getSelectedObjects() != null)
147
				setFilenameEnabled(true);
148
			else
149
				setFilenameEnabled(false);
150
		} else {
151
			getRadioFileGenerate().setEnabled(false);
152
			getRadioOpenMemory().setEnabled(false);
153
			setFilenameEnabled(false);
154
		}
155
	}
156

  
157
	/**
158
	 * Poner los estados de los RadioButton en caso de que cambien de valor
159
	 * @param evt
160
	 */
161
	private void jRBOpenMemoryStateChanged(ItemEvent evt) {
162
		if (getRadioOpenMemory().getSelectedObjects() != null) {
163
			setFilenameEnabled(true);
164
		} else {
165
			setFilenameEnabled(false);
166
		}
167
	}
168
	
169
	/**
170
	 * Especifica si se generara solo en la vista o se guardara en un fichero
171
	 * @param enabled
172
	 */
173
	public void setOnlyView(boolean enabled) {
174
		getRadioOnlyView().setSelected(enabled);
175
	}
176

  
177
	/**
178
	 * Devuelve el JRadioButton de Abrir en memoria
179
	 * @return
180
	 */
181
	public JRadioButton getRadioOpenMemory() {
182
		if (jRBOpenMemory == null) {
183
			jRBOpenMemory = new JRadioButton();
184
			jRBOpenMemory.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
185
			jRBOpenMemory.setMargin(new Insets(0, 0, 0, 0));
186

  
187
			jRBOpenMemory.addItemListener(new ItemListener() {
188
				public void itemStateChanged(ItemEvent evt) {
189
					jRBOpenMemoryStateChanged(evt);
190
				}
191
			});
192
			jRBOpenMemory.setSelected(true);
193
		}
194
		return jRBOpenMemory;
195
	}
196
	
197
	/**
198
	 * Devuelve el JRadioButton de generar fichero
199
	 * @return
200
	 */
201
	public JRadioButton getRadioFileGenerate() {
202
		if (jRBFileGenerate == null) {
203
			jRBFileGenerate = new JRadioButton();
204
			jRBFileGenerate.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
205
			jRBFileGenerate.setMargin(new Insets(0, 0, 0, 0));
206
		}
207
		return jRBFileGenerate;
208
	}
209
	
210
	/**
211
	 * Devuelve el JRadioButton de Solo vista
212
	 * @return
213
	 */
214
	public JRadioButton getRadioOnlyView() {
215
		if (jRBOnlyView == null) {
216
			jRBOnlyView = new JRadioButton();
217
			jRBOnlyView.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
218
			jRBOnlyView.setMargin(new Insets(0, 0, 0, 0));
219
		}
220
		return jRBOnlyView;
221
	}
222
	
223
	/**
224
	 * Devuelve el JRadioButton de nueva capa
225
	 * @return
226
	 */
227
	public JRadioButton getRadioNewLayer() {
228
		if (jRBNewLayer == null) {
229
			jRBNewLayer = new JRadioButton();
230
			jRBNewLayer.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
231
			jRBNewLayer.setMargin(new Insets(0, 0, 0, 0));
232
			jRBNewLayer.addItemListener(new ItemListener() {
233
				public void itemStateChanged(ItemEvent evt) {
234
					jRBNewLayerStateChanged(evt);
235
				}
236
			});
237
			jRBNewLayer.setSelected(true);
238
		}
239
		return jRBNewLayer;
240
	}
241
	
242
	/**
243
	 * This method initializes filenameTextField
244
	 *
245
	 * @return javax.swing.JTextField
246
	 */
247
	public JTextField getFilenameTextField() {
248
		if (filenameTextField == null) {
249
			filenameTextField = new JTextField();
250
			filenameTextField.setPreferredSize(new Dimension(150, filenameTextField.getPreferredSize().height));
251
			RasterLibrary.addOnlyLayerNameListener(this);
252
		}
253
		return filenameTextField;
254
	}
255

  
256
	public JLabel getLabelFilename() {
257
		if (labelFilename == null) {
258
			labelFilename = new JLabel();
259
		}
260
		return labelFilename;
261
	}
262

  
263
	/**
264
	 * This method initializes jPNameFile
265
	 *
266
	 * @return javax.swing.JPanel
267
	 */
268
	public JPanel getFileNamePanel() {
269
		if (jPNameFile == null) {
270
			jPNameFile = new JPanel();
271
			jPNameFile.add(getLabelFilename());
272
			jPNameFile.add(getFilenameTextField());
273
			updateNewLayerText();
274
		}
275
		return jPNameFile;
276
	}
277
	
278
	
279
	/**
280
	 * Especificar el nombre de la nueva capa para el recuadro de texto asignando
281
	 * en cada llamada un nombre consecutivo.
282
	 */
283
	public void updateNewLayerText() {
284
		getFilenameTextField().setText(RasterLibrary.getOnlyLayerName());
285
	}
286
	
287
	/**
288
	 * Establece si esta habilitado o no el cuadro de texto de entrada de nombre de
289
	 * fichero
290
	 * @param value
291
	 */
292
	public void setFilenameEnabled(boolean value) {
293
		getFilenameTextField().setEnabled(value);
294
		getLabelFilename().setEnabled(value);
295
	}
296

  
297
	/**
298
	 * Cuando alguien ha cambiado la propiedad del nombre de la 
299
	 * capa se actualiza autom?ticamente
300
	 */
301
	public void actionValueChanged(PropertyEvent e) {
302
		updateNewLayerText();
303
	}
304
	
305
	/**
306
	 * Asigna un valor para el par?metro que informa de si el raster de salida hay
307
	 * que comprimirlo o no. Este valor es necesario cuando el raster de salida 
308
	 * es mayor de 4G ya que no se puede crear un tiff tan grande.
309
	 * @param compress true para comprimir el raster de salida y false para no hacerlo.
310
	 */
311
	public void setCompress(boolean compress) {
312
		this.compress = compress;
313
	}
314
	
315
	/**
316
	 * Devuelve la ruta del fichero donde se va a guardar, en caso de guardarse
317
	 * en memoria, calcula el nombre sin preguntar y devuelve la ruta.
318
	 * @return
319
	 */
320
	public String getFileSelected() {
321
		String path = "";
322
		if (getRadioFileGenerate().isSelected()) {
323
			JFileChooser chooser = new JFileChooser(FileOpenWizard.getLastPath());
324
			chooser.setDialogTitle(PluginServices.getText(this, "seleccionar_fichero"));
325

  
326
			// A?adimos las extensiones que hayan sido registradas en el driver
327
			String[] extList = GeoRasterWriter.getDriversExtensions();
328
			for (int i = 0; i < extList.length; i++)
329
				chooser.addChoosableFileFilter(new ExtendedFileFilter(extList[i]));
330

  
331
			if (chooser.showOpenDialog(this) != JFileChooser.APPROVE_OPTION)
332
				return null;
333

  
334
			FileOpenWizard.setLastPath(chooser.getSelectedFile().getPath().substring(0, chooser.getSelectedFile().getPath().lastIndexOf(File.separator)));
335

  
336
			ExtendedFileFilter fileFilter = (ExtendedFileFilter) chooser.getFileFilter();
337
			path = fileFilter.getNormalizedFilename(chooser.getSelectedFile());
338
		} else {
339

  
340
			String file = getFilenameTextField().getText();
341
			if (file.compareTo(RasterLibrary.getOnlyLayerName()) == 0)
342
				RasterLibrary.usesOnlyLayerName();
343

  
344
			if (!compress)
345
				path = Utilities.createTempDirectory() + File.separator + file + ".tif";
346
			else
347
				path = Utilities.createTempDirectory() + File.separator + file + ".jp2";
348
			updateNewLayerText();
349
		}
350
		return path;
351
	}
352

  
353
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/ui/FilterPanel.java
35 35
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
36 36
import org.gvsig.gui.beans.propertiespanel.PropertiesComponent;
37 37
import org.gvsig.gui.beans.treelist.TreeListContainer;
38
import org.gvsig.raster.beans.createlayer.CreateLayerPanel;
38 39
import org.gvsig.raster.beans.previewbase.IPreviewRenderProcess;
39 40
import org.gvsig.raster.beans.previewbase.ParamStruct;
40 41
import org.gvsig.raster.beans.previewbase.PreviewBasePanel;
......
73 74
	private JPanel              jPanelOptions       = null;
74 75
	private FilterMainPanel     filterMain          = null;
75 76
	private FilterDialog        filterDialog        = null;
76
	private NewOrSaveLayerPanel newLayerPanel       = null;
77
	private CreateLayerPanel    newLayerPanel       = null;
77 78

  
78 79
	/**
79 80
	 * Constructor
......
163 164
		return jPanelOptions;
164 165
	}
165 166
	
166
	public NewOrSaveLayerPanel getNewLayerPanel() {
167
	public CreateLayerPanel getNewLayerPanel() {
167 168
		if (newLayerPanel == null) {
168
			newLayerPanel = new NewOrSaveLayerPanel();
169
			newLayerPanel = new CreateLayerPanel();
169 170
		}
170 171
		return newLayerPanel;
171 172
	}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/FilterTocMenuEntry.java
24 24
import org.gvsig.fmap.raster.layers.ILayerState;
25 25
import org.gvsig.fmap.raster.layers.IRasterLayerActions;
26 26
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
27
import org.gvsig.raster.util.RasterToolsUtil;
27 28
import org.gvsig.rastertools.filter.ui.FilterDialog;
28 29

  
29
import com.iver.andami.PluginServices;
30 30
import com.iver.cit.gvsig.fmap.layers.FLayer;
31 31
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
32 32
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
......
84 84
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
85 85
	 */
86 86
	public String getText() {
87
		return PluginServices.getText(this, "filtros");
87
		return RasterToolsUtil.getText(this, "filtros");
88 88
	}
89 89

  
90 90
	/*
......
127 127
			return;
128 128

  
129 129
		FilterDialog rasterFilterDialog = new FilterDialog(selectedItems[0], 720, 400);
130
		PluginServices.getMDIManager().addWindow(rasterFilterDialog);
130
		RasterToolsUtil.addWindow(rasterFilterDialog);
131 131
	}
132 132
	
133 133
	/*
......
135 135
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
136 136
	 */
137 137
	public Icon getIcon() {
138
		return PluginServices.getIconTheme().get("filter-icon");
138
		return RasterToolsUtil.getIcon("filter-icon");
139 139
	}
140 140
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/colortable/ColorTableTocMenuEntry.java
24 24
import org.gvsig.fmap.raster.layers.ILayerState;
25 25
import org.gvsig.fmap.raster.layers.IRasterLayerActions;
26 26
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
27
import org.gvsig.raster.util.RasterToolsUtil;
27 28
import org.gvsig.rastertools.colortable.ui.ColorTableDialog;
28 29

  
29
import com.iver.andami.PluginServices;
30 30
import com.iver.cit.gvsig.fmap.layers.FLayer;
31 31
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
32 32
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
......
85 85
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
86 86
	 */
87 87
	public String getText() {
88
		return PluginServices.getText(this, "tablas_color");
88
		return RasterToolsUtil.getText(this, "tablas_color");
89 89
	}
90 90

  
91 91
	/*
......
128 128
	 */
129 129
	public void execute(ITocItem item, FLayer[] selectedItems) {
130 130
		ColorTableDialog colorTableDialog = new ColorTableDialog(selectedItems[0], 660, 465);
131
		PluginServices.getMDIManager().addWindow(colorTableDialog);
131
		RasterToolsUtil.addWindow(colorTableDialog);
132 132
	}
133 133
	
134 134
	/*
......
136 136
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
137 137
	 */
138 138
	public Icon getIcon() {
139
		return PluginServices.getIconTheme().get("colortable-icon");
139
		return RasterToolsUtil.getIcon("colortable-icon");
140 140
	}
141 141
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/roi/ui/ROIManagerTocMenuEntry.java
46 46
import org.gvsig.fmap.raster.layers.ILayerState;
47 47
import org.gvsig.raster.grid.GridException;
48 48
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
49
import org.gvsig.raster.util.RasterToolsUtil;
49 50

  
50
import com.iver.andami.PluginServices;
51 51
import com.iver.cit.gvsig.fmap.layers.FLayer;
52 52
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
53 53
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
......
104 104
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
105 105
	 */
106 106
	public String getText() {
107
		return PluginServices.getText(this, "regiones_interes");
107
		return RasterToolsUtil.getText(this, "regiones_interes");
108 108
	}
109 109

  
110 110
	/*
......
159 159
			roiManagerDialog.setLayer(selectedItems[0]);
160 160
		} catch (GridException e) {
161 161
		}
162
		PluginServices.getMDIManager().addWindow(roiManagerDialog);
162
		RasterToolsUtil.addWindow(roiManagerDialog);
163 163
	}
164 164
	
165 165
	/*
......
167 167
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
168 168
	 */
169 169
	public Icon getIcon() {
170
		return PluginServices.getIconTheme().get("rois-icon");
170
		return RasterToolsUtil.getIcon("rois-icon");
171 171
	}
172 172
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/raw/ui/main/OpenRawFileDefaultView.java
20 20

  
21 21
import java.io.File;
22 22

  
23
import org.gvsig.raster.util.RasterToolsUtil;
23 24
import org.gvsig.rastertools.raw.ui.listener.OpenRawFileDefaultViewListener;
24 25

  
25
import com.iver.andami.PluginServices;
26 26
import com.iver.andami.ui.mdiManager.IWindow;
27 27
import com.iver.andami.ui.mdiManager.WindowInfo;
28 28
/**
......
41 41
	public OpenRawFileDefaultView(String rawFileName){
42 42
		super(rawFileName);
43 43
		setActionListener(new OpenRawFileDefaultViewListener(this));
44
		PluginServices.getMDIManager().addWindow(this);	
44
		RasterToolsUtil.addWindow(this);	
45 45
	}
46 46

  
47 47
	/*
......
50 50
	 */
51 51
	public WindowInfo getWindowInfo() {
52 52
		WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODALDIALOG);
53
		m_viewinfo.setTitle(PluginServices.getText(this, "open_raw_file"));
53
		m_viewinfo.setTitle(RasterToolsUtil.getText(this, "open_raw_file"));
54 54
		m_viewinfo.setHeight(270);
55 55
		m_viewinfo.setWidth(540);
56 56
		return m_viewinfo;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/RasterBarToolsModule.java
80 80
				if(!isOpen) {
81 81
					Point posit = RasterToolsUtil.iwindowPosition((int)gld.getSizeWindow().getWidth(), (int)gld.getSizeWindow().getHeight());
82 82
					gld.setPosition((int)posit.getX(), (int)posit.getY());
83
					PluginServices.getMDIManager().addWindow(gld);
83
					RasterToolsUtil.addWindow(gld);
84 84
				}
85 85
				gld.init(mapCtrl);
86 86
			loadGeoPanListener(mapCtrl, sbl, gld);
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/RasterPropertiesTocMenuEntry.java
27 27
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
28 28
import org.gvsig.raster.util.RasterToolsUtil;
29 29

  
30
import com.iver.andami.PluginServices;
30
//import com.iver.andami.PluginServices;
31 31
import com.iver.andami.ui.mdiManager.WindowInfo;
32 32
import com.iver.cit.gvsig.fmap.layers.FLayer;
33 33
import com.iver.cit.gvsig.panelGroup.PanelGroupDialog;
......
96 96
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
97 97
	 */
98 98
	public String getText() {
99
		return PluginServices.getText(this, "propiedades_raster");
99
		return RasterToolsUtil.getText(this, "propiedades_raster");
100 100
	}
101 101

  
102 102
	/*
......
147 147
			TabbedPanel panelGroup = (TabbedPanel) manager.getPanelGroup(lyr);
148 148
			PanelGroupLoaderFromExtensionPoint loader = new PanelGroupLoaderFromExtensionPoint("RasterSEPropertiesDialog");
149 149

  
150
			properties = new PanelGroupDialog(lyr.getName() ,PluginServices.getText(this, "propiedades_raster"), 550, 450, (byte) (WindowInfo.MODELESSDIALOG | WindowInfo.RESIZABLE | WindowInfo.MAXIMIZABLE), panelGroup);
150
			properties = new PanelGroupDialog(lyr.getName() ,RasterToolsUtil.getText(this, "propiedades_raster"), 550, 450, (byte) (WindowInfo.MODELESSDIALOG | WindowInfo.RESIZABLE | WindowInfo.MAXIMIZABLE), panelGroup);
151 151
			properties.loadPanels(loader);
152 152
			enableEvents = true;
153
			PluginServices.getMDIManager().addWindow(properties);
153
			RasterToolsUtil.addWindow(properties);
154 154
		} catch (Exception e) {
155 155
			RasterToolsUtil.messageBoxInfo("error_props_tabs", this, e);
156 156
		} finally  {
......
163 163
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
164 164
	 */
165 165
	public Icon getIcon() {
166
		return PluginServices.getIconTheme().get("properties-icon");
166
		return RasterToolsUtil.getIcon("properties-icon");
167 167
	}
168 168
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/histogram/HistogramPanelListener.java
19 19
package org.gvsig.rastertools.histogram;
20 20

  
21 21
import java.awt.Color;
22
import java.awt.Component;
23 22
import java.awt.event.ActionEvent;
24 23
import java.awt.event.ActionListener;
25 24
import java.beans.PropertyChangeEvent;
......
197 196
			ArrayList comboSource = getHistogramPanel().getComboSource();
198 197
			for (int i = 0; i < comboSource.size(); i++) {
199 198
				String name = (String) ((ArrayList) comboSource.get(i)).get(1);
200
				if (name.compareTo(PluginServices.getText(this, "datos_visualizados")) == 0) {
199
				if (name.compareTo(RasterToolsUtil.getText(this, "datos_visualizados")) == 0) {
201 200
					((ArrayList) comboSource.get(i)).remove(0);
202 201
					((ArrayList) comboSource.get(i)).add(0, ((FLyrRasterSE) lyr).getRender().getLastRenderBuffer());
203 202
				}
204
				if (name.compareTo(PluginServices.getText(this, "imagen_completa")) == 0) {
203
				if (name.compareTo(RasterToolsUtil.getText(this, "imagen_completa")) == 0) {
205 204
					((ArrayList) comboSource.get(i)).remove(0);
206 205
					((ArrayList) comboSource.get(i)).add(0, ((FLyrRasterSE) lyr).getDataSource());
207 206
				}
......
241 240
//	        	-------Mostrar un fileChooser------------------
242 241
				String fName;
243 242
				JFileChooser chooser = new JFileChooser();
244
				chooser.setDialogTitle(PluginServices.getText(this, "guardar_tabla"));
243
				chooser.setDialogTitle(RasterToolsUtil.getText(this, "guardar_tabla"));
245 244

  
246 245
				int returnVal = chooser.showOpenDialog(getHistogramPanel());
247 246
				if (returnVal == JFileChooser.APPROVE_OPTION) {
......
308 307
					Table t = new Table();
309 308
					t.setModel(projectTable);
310 309
					//projectTable.setAndamiWindow(t);
311
					PluginServices.getMDIManager().addWindow(t);
310
					RasterToolsUtil.addWindow(t);
312 311
				}
313 312
			} catch (IOException e1) {
314
				JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),getHistogramPanel().getName() + " " + PluginServices.getText(this,"table_not_create"));
313
				JOptionPane.showMessageDialog(null, getHistogramPanel().getName() + " " + RasterToolsUtil.getText(this,"table_not_create"));
315 314
			} catch (DriverLoadException e1) {
316
				JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),getHistogramPanel().getName() + " " + PluginServices.getText(this,"table_not_create"));
315
				JOptionPane.showMessageDialog(null, getHistogramPanel().getName() + " " + RasterToolsUtil.getText(this,"table_not_create"));
317 316
			} catch (NoSuchTableException e1) {
318
				JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),getHistogramPanel().getName() + " " + PluginServices.getText(this,"table_not_create"));
317
				JOptionPane.showMessageDialog(null, getHistogramPanel().getName() + " " + RasterToolsUtil.getText(this,"table_not_create"));
319 318
			} catch (ReadDriverException e1) {
320
				JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),getHistogramPanel().getName() + " " + PluginServices.getText(this,"table_not_create"));
319
				JOptionPane.showMessageDialog(null, getHistogramPanel().getName() + " " + RasterToolsUtil.getText(this,"table_not_create"));
321 320
			}
322 321
		}
323 322
	}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/histogram/HistogramTocMenuEntry.java
27 27
import org.gvsig.raster.util.RasterToolsUtil;
28 28
import org.gvsig.rastertools.histogram.ui.HistogramDialog;
29 29

  
30
import com.iver.andami.PluginServices;
31 30
import com.iver.cit.gvsig.fmap.layers.FLayer;
32 31
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
33 32
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
......
84 83
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
85 84
	 */
86 85
	public String getText() {
87
		return PluginServices.getText(this, "histograma");
86
		return RasterToolsUtil.getText(this, "histograma");
88 87
	}
89 88

  
90 89
	/*
......
139 138
																											// histograma
140 139
			histogramDialog.setVisible(true);
141 140

  
142
			PluginServices.getMDIManager().addWindow(histogramDialog);
141
			RasterToolsUtil.addWindow(histogramDialog);
143 142
		} catch (Exception e) {
144
			RasterToolsUtil.messageBoxError(PluginServices.getText(this, "histogram_error"), this, e);
143
			RasterToolsUtil.messageBoxError(RasterToolsUtil.getText(this, "histogram_error"), this, e);
145 144
			return;
146 145
		}
147 146
	}
......
151 150
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
152 151
	 */
153 152
	public Icon getIcon() {
154
		return PluginServices.getIconTheme().get("histogram-icon");
153
		return RasterToolsUtil.getIcon("histogram-icon");
155 154
	}
156 155
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/generictoolbar/GenericToolBarModule.java
34 34
import org.gvsig.rastertools.histogram.HistogramTocMenuEntry;
35 35
import org.gvsig.rastertools.overviews.OverviewsTocMenuEntry;
36 36
import org.gvsig.rastertools.properties.RasterPropertiesTocMenuEntry;
37
import org.gvsig.rastertools.reproject.ReprojectTocMenuEntry;
37 38
import org.gvsig.rastertools.roi.ui.ROIManagerTocMenuEntry;
38 39
import org.gvsig.rastertools.saveas.SaveAsTocMenuEntry;
39 40

  
......
139 140
		extensionPoints.add("GenericToolBarMenu", "FilterPanel", FilterTocMenuEntry.getSingleton());
140 141
		extensionPoints.add("GenericToolBarMenu", "EnhancedPanel", EnhancedTocMenuEntry.getSingleton());
141 142
		extensionPoints.add("GenericToolBarMenu", "GeoLocation", GeoLocationTocMenuEntry.getSingleton());
143
		extensionPoints.add("GenericToolBarMenu", "Reproject", ReprojectTocMenuEntry.getSingleton());
142 144

  
143 145
		if (getGenericToolBarPanel() != null)
144 146
			getGenericToolBarPanel().reloadMenuGroup();
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/geolocation/GeoLocationTocMenuEntry.java
101 101
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
102 102
	 */
103 103
	public String getText() {
104
		return PluginServices.getText(this, "geolocation");
104
		return RasterToolsUtil.getText(this, "geolocation");
105 105
	}
106 106
	
107 107
	/*
......
161 161
		if(!isOpen) {
162 162
			Point posit = RasterToolsUtil.iwindowPosition((int)gld.getSizeWindow().getWidth(), (int)gld.getSizeWindow().getHeight());
163 163
			gld.setPosition((int)posit.getX(), (int)posit.getY());
164
			PluginServices.getMDIManager().addWindow(gld);
164
			RasterToolsUtil.addWindow(gld);
165 165
		}
166 166
		
167 167
		gld.init(mapCtrl);
......
191 191
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
192 192
	 */
193 193
	public Icon getIcon() {
194
		return PluginServices.getIconTheme().get("geolocalization-icon");
194
		return RasterToolsUtil.getIcon("geolocalization-icon");
195 195
	}
196 196

  
197 197
	public void propertyChange(PropertyChangeEvent evt) {}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/clipping/ClippingTocMenuEntry.java
24 24
import org.gvsig.fmap.raster.layers.ILayerState;
25 25
import org.gvsig.fmap.raster.layers.IRasterLayerActions;
26 26
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
27
import org.gvsig.raster.util.RasterToolsUtil;
27 28
import org.gvsig.rastertools.clipping.ui.ClippingDialog;
28 29

  
29
import com.iver.andami.PluginServices;
30 30
import com.iver.cit.gvsig.fmap.layers.FLayer;
31 31
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
32 32
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
......
85 85
	 * @see com.iver.cit.gvsig.project.documents.IContextMenuAction#getText()
86 86
	 */
87 87
	public String getText() {
88
		return PluginServices.getText(this, "recorte");
88
		return RasterToolsUtil.getText(this, "recorte");
89 89
	}
90 90

  
91 91
	/*
......
135 135

  
136 136
		ClippingDialog clippingDialog = new ClippingDialog(420, 290);
137 137
		clippingDialog.setLayer((FLyrRasterSE)fLayer);
138
		PluginServices.getMDIManager().addWindow(clippingDialog);
138
		RasterToolsUtil.addWindow(clippingDialog);
139 139
	}
140 140

  
141 141
	/*
......
143 143
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
144 144
	 */
145 145
	public Icon getIcon() {
146
		return PluginServices.getIconTheme().get("clipping-icon");
146
		return RasterToolsUtil.getIcon("clipping-icon");
147 147
	}
148 148
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/analysisview/ViewRasterAnalysisTocMenuEntry.java
18 18
 */
19 19
package org.gvsig.rastertools.analysisview;
20 20

  
21
import java.awt.Component;
22 21
import java.beans.PropertyChangeEvent;
23 22
import java.beans.PropertyChangeListener;
24 23
import java.util.ArrayList;
......
29 28
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
30 29
import org.gvsig.fmap.raster.layers.ILayerState;
31 30
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
31
import org.gvsig.raster.util.RasterToolsUtil;
32 32
import org.gvsig.rastertools.pixelincrease.PixelncreaseDialog;
33 33

  
34 34
import com.iver.andami.PluginServices;
......
100 100
	 */
101 101
	public String getText() {
102 102
		if (!onView)
103
			return PluginServices.getText(this, "analysisview");
103
			return RasterToolsUtil.getText(this, "analysisview");
104 104
		else
105
			return PluginServices.getText(this, "closeanalysisview");
105
			return RasterToolsUtil.getText(this, "closeanalysisview");
106 106
	}
107 107
	
108 108
	/*
......
150 150
		// obtenemos el mapcontrol del localizador
151 151
		for (int i = 0; i < w.length; i++) {
152 152
			if (w[i] instanceof PixelncreaseDialog)
153
				PluginServices.getMDIManager().closeWindow(w[i]);
153
				RasterToolsUtil.closeWindow(w[i]);
154 154
			if (w[i] instanceof View && w[i].equals(activeWindow))
155 155
				mcCurrentLoc = ((View) w[i]).getMapOverview();
156 156
			if (w[i] instanceof View)
......
160 160
		if (!onView) {
161 161
			// Abrimos el inspector de pixeles
162 162
			PixelncreaseDialog pIncrease = new PixelncreaseDialog();
163
			PluginServices.getMDIManager().addWindow(pIncrease);
163
			RasterToolsUtil.addWindow(pIncrease);
164 164

  
165 165
			// Cargamos el raster en el localizador
166 166
			mcCurrentLoc.getMapContext().beginAtomicEvent();
......
174 174
				rasterNameInLoc = lyr.getName();
175 175
				mcCurrentLoc.getMapContext().getLayers().addLayer(lyr);
176 176
			} catch (LoadLayerException e) {
177
				JOptionPane.showMessageDialog((Component) PluginServices.getMainFrame(), PluginServices.getText(this, "coordenadas_erroneas"));
177
				JOptionPane.showMessageDialog(null, RasterToolsUtil.getText(this, "coordenadas_erroneas"));
178 178
			}
179 179
			mcCurrentLoc.getMapContext().endAtomicEvent();
180 180
		} else {
......
197 197
	 * @see org.gvsig.rastertools.generictoolbar.IGenericToolBarMenuItem#getIcon()
198 198
	 */
199 199
	public Icon getIcon() {
200
		return PluginServices.getIconTheme().get("analisis-icon");
200
		return RasterToolsUtil.getIcon("analisis-icon");
201 201
	}
202 202

  
203 203
	public void propertyChange(PropertyChangeEvent evt) {}

Also available in: Unified diff