Revision 18014

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceOverviews.java
29 29
import javax.swing.JLabel;
30 30

  
31 31
import org.gvsig.addo.Jaddo;
32
import org.gvsig.raster.Configuration;
32 33
import org.gvsig.raster.util.PanelBase;
33
import org.gvsig.rastertools.Configuration;
34 34
/**
35 35
 *
36 36
 * @version 14/12/2007
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceLoadLayer.java
35 35
import javax.swing.JRadioButton;
36 36
import javax.swing.ListCellRenderer;
37 37

  
38
import org.gvsig.raster.Configuration;
38 39
import org.gvsig.raster.datastruct.ColorTable;
39 40
import org.gvsig.raster.datastruct.serializer.ColorTableLibraryPersistence;
40 41
import org.gvsig.raster.gui.preferences.combocolortable.PaintItem;
41 42
import org.gvsig.raster.gui.preferences.combocolortable.PreferenceColorTableIconPainter;
42 43
import org.gvsig.raster.util.PanelBase;
43
import org.gvsig.rastertools.Configuration;
44 44
/**
45 45
 *
46 46
 * @version 14/12/2007
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceGeneral.java
28 28
import javax.swing.JComboBox;
29 29
import javax.swing.JLabel;
30 30

  
31
import org.gvsig.raster.Configuration;
31 32
import org.gvsig.raster.RasterLibrary;
32 33
import org.gvsig.raster.util.PanelBase;
33
import org.gvsig.rastertools.Configuration;
34 34
/**
35 35
 *
36 36
 * @version 12/12/2007
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceCache.java
34 34
import javax.swing.text.DefaultFormatterFactory;
35 35
import javax.swing.text.NumberFormatter;
36 36

  
37
import org.gvsig.raster.Configuration;
37 38
import org.gvsig.raster.RasterLibrary;
38 39
import org.gvsig.raster.util.PanelBase;
39
import org.gvsig.rastertools.Configuration;
40 40
/**
41 41
 *
42 42
 * @version 14/12/2007
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceTemporal.java
32 32
import javax.swing.JTextField;
33 33

  
34 34
import org.gvsig.gui.beans.swing.JFileChooser;
35
import org.gvsig.raster.Configuration;
35 36
import org.gvsig.raster.RasterLibrary;
36 37
import org.gvsig.raster.util.PanelBase;
37
import org.gvsig.rastertools.Configuration;
38 38

  
39 39
import com.iver.andami.PluginServices;
40 40
/**
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/preferences/panels/PreferenceNoData.java
30 30
import javax.swing.text.DefaultFormatterFactory;
31 31
import javax.swing.text.NumberFormatter;
32 32

  
33
import org.gvsig.raster.Configuration;
33 34
import org.gvsig.raster.RasterLibrary;
34 35
import org.gvsig.raster.util.PanelBase;
35
import org.gvsig.rastertools.Configuration;
36 36
/**
37 37
 * Panel para la gesti?n del valor NoData en el panel de preferencias de gvSIG.
38 38
 *
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/gui/wizards/FileOpenRaster.java
26 26

  
27 27
import org.cresques.cts.IProjection;
28 28
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
29
import org.gvsig.raster.Configuration;
29 30
import org.gvsig.raster.util.RasterToolsUtil;
30 31
import org.gvsig.raster.util.RasterUtilities;
31
import org.gvsig.rastertools.Configuration;
32 32
import org.gvsig.rastertools.RasterModule;
33 33
import org.gvsig.rastertools.geolocation.ui.GeoLocationOpeningRasterDialog;
34 34
import org.gvsig.rastertools.raw.ui.main.OpenRawFileDefaultView;
trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/util/RasterToolsUtil.java
29 29
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
30 30
import org.gvsig.gui.beans.propertiespanel.PropertiesComponent;
31 31
import org.gvsig.gui.beans.propertiespanel.PropertyStruct;
32
import org.gvsig.raster.Configuration;
32 33
import org.gvsig.raster.dataset.Params;
33 34
import org.gvsig.raster.dataset.Params.Param;
34
import org.gvsig.rastertools.Configuration;
35 35

  
36 36
import com.iver.andami.PluginServices;
37 37
import com.iver.andami.ui.mdiManager.IWindow;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/analysisview/ViewRasterAnalysisTocMenuEntry.java
27 27

  
28 28
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
29 29
import org.gvsig.fmap.raster.layers.ILayerState;
30
import org.gvsig.rastertools.Configuration;
30
import org.gvsig.raster.Configuration;
31 31
import org.gvsig.rastertools.pixelincrease.PixelncreaseDialog;
32 32

  
33 33
import com.iver.andami.PluginServices;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveraster/ui/listener/SaveRasterDialogListener.java
30 30
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent;
31 31
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelListener;
32 32
import org.gvsig.gui.beans.propertiespanel.PropertiesPanel;
33
import org.gvsig.raster.Configuration;
33 34
import org.gvsig.raster.RasterLibrary;
34 35
import org.gvsig.raster.buffer.IQueryableRaster;
35 36
import org.gvsig.raster.dataset.GeoRasterWriter;
......
38 39
import org.gvsig.raster.dataset.io.RasterDriverException;
39 40
import org.gvsig.raster.util.RasterToolsUtil;
40 41
import org.gvsig.raster.util.RasterUtilities;
41
import org.gvsig.rastertools.Configuration;
42 42
import org.gvsig.rastertools.saveraster.operations.RasterizerLayer;
43 43
import org.gvsig.rastertools.saveraster.operations.SaveRasterActions;
44 44
import org.gvsig.rastertools.saveraster.operations.SaveRasterProcess;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/georeferencing/ui/launcher/FileSelectionPanel.java
29 29
import javax.swing.JTextField;
30 30

  
31 31
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
32
import org.gvsig.raster.Configuration;
32 33
import org.gvsig.raster.dataset.RasterDataset;
33 34
import org.gvsig.raster.util.ExtendedFileFilter;
34 35
import org.gvsig.raster.util.RasterToolsUtil;
35
import org.gvsig.rastertools.Configuration;
36 36

  
37 37
import com.iver.cit.gvsig.exceptions.layers.LoadLayerException;
38 38

  
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/saveas/SaveAsActions.java
22 22

  
23 23
import javax.swing.JFrame;
24 24

  
25
import org.gvsig.raster.util.RasterToolsUtil;
25 26
import org.gvsig.raster.util.RasterUtilities;
26 27
import org.gvsig.rastertools.IProcessActions;
27 28
import org.gvsig.rastertools.saveraster.ui.info.EndInfoPanel;
28

  
29
import com.iver.andami.PluginServices;
30 29
/**
31 30
 * Acciones que ejecuta el proceso de salvado.
32 31
 *
......
39 38
	 * @see org.gvsig.rastertools.IProcessActions#end(java.lang.Object)
40 39
	 */
41 40
	public void end(Object params) {
42
		if(	params instanceof Object[] &&
43
			((Object[])params).length == 2 &&
44
			((Object[])params)[0] instanceof String &&
45
			((Object[])params)[1] instanceof Long) {
41
		if (params instanceof Object[] &&
42
				((Object[]) params).length == 2 &&
43
				((Object[]) params)[0] instanceof String &&
44
				((Object[]) params)[1] instanceof Long) {
46 45

  
47
			String fName = (String)((Object[])params)[0];
48
			long milis = ((Long)((Object[])params)[1]).longValue();
46
			String fName = (String) ((Object[]) params)[0];
47
			long milis = ((Long) ((Object[]) params)[1]).longValue();
49 48

  
50 49
			setEndInfo(fName, milis);
51 50
		}
......
63 62
		if (fName.endsWith("ecw") ||
64 63
				fName.endsWith("jp2") ||
65 64
				fName.endsWith("jpg") ||
66
				fName.endsWith("jpeg"))
65
				fName.endsWith("jpeg")) {
67 66
			compression = "Yes";
68
		else
67
		} else {
69 68
			compression = "No";
69
		}
70 70

  
71 71
		EndInfoPanel info = new EndInfoPanel();
72 72
		info.addFile(fName, RasterUtilities.formatTime(milis), RasterUtilities.formatFileSize(f.length()), compression);
73 73

  
74
		JFrame endJFrame = new JFrame(PluginServices.getText(this, "Stats"));
74
		JFrame endJFrame = new JFrame(RasterToolsUtil.getText(this, "Stats"));
75 75
		endJFrame.setResizable(false);
76 76
		endJFrame.setAlwaysOnTop(true);
77 77
		endJFrame.add(info);
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/FilterProcess.java
22 22
import java.io.IOException;
23 23
import java.util.ArrayList;
24 24

  
25
import org.gvsig.raster.Configuration;
25 26
import org.gvsig.raster.buffer.BufferFactory;
26 27
import org.gvsig.raster.buffer.RasterBuffer;
27 28
import org.gvsig.raster.dataset.GeoRasterWriter;
......
38 39
import org.gvsig.raster.grid.filter.RasterFilterListManager;
39 40
import org.gvsig.raster.util.RasterToolsUtil;
40 41
import org.gvsig.raster.util.RasterUtilities;
41
import org.gvsig.rastertools.Configuration;
42 42
import org.gvsig.rastertools.RasterProcess;
43 43
import org.gvsig.rastertools.clipping.WriterBufferServer;
44 44
import org.gvsig.rastertools.filter.FilterListener.ParamStruct;
......
78 78

  
79 79
		IRasterDataSource dsetCopy = null;
80 80
		try {
81
			insertLineLog(PluginServices.getText(this, "leyendo_raster"));
81
			insertLineLog(RasterToolsUtil.getText(this, "leyendo_raster"));
82 82
			dsetCopy = rasterDataSource.newDataset();
83 83
			BufferFactory bufferFactory = new BufferFactory(dsetCopy);
84 84
			if (!RasterBuffer.loadInMemory(dsetCopy))
......
95 95
			rasterFilterList = grid.getFilterList();
96 96
			addSelectedFilters(rasterFilterList, listFilterUsed);
97 97

  
98
			insertLineLog(PluginServices.getText(this, "aplicando_filtros"));
98
			insertLineLog(RasterToolsUtil.getText(this, "aplicando_filtros"));
99 99

  
100 100
			grid.setNoDataValue(rasterDataSource.getNoDataValue(0));
101 101

  
102 102
			grid.applyFilters();
103 103

  
104
			insertLineLog(PluginServices.getText(this, "guardando_capa"));
104
			insertLineLog(RasterToolsUtil.getText(this, "guardando_capa"));
105 105

  
106 106
			buffer = grid.getRasterBuf();
107 107

  
......
127 127
	
128 128
				manager.addClient(ser);
129 129
				try {
130
					RasterUtilities.copyFile(manager.getPath(), manager.getPath() + "~");
131 130
					manager.write(true);
132 131
				} catch (FileNotFoundException e) {
132
					RasterToolsUtil.messageBoxError("error_salvando_rmf", this, e);
133 133
				} catch (IOException e) {
134
	
134
					RasterToolsUtil.messageBoxError("error_salvando_rmf", this, e);
135 135
				}
136 136
				manager.removeClient(ser.getClass());
137 137
			}
......
139 139
			externalActions.end(filename);
140 140

  
141 141
		} catch (NotSupportedExtensionException e) {
142
			RasterToolsUtil.messageBoxError(PluginServices.getText(this, "error_writer_notsupportedextension"), this, e);
142
			RasterToolsUtil.messageBoxError("error_writer_notsupportedextension", this, e);
143 143
		} catch (RasterDriverException e) {
144
			RasterToolsUtil.messageBoxError(PluginServices.getText(this, "error_writer"), this, e);
144
			RasterToolsUtil.messageBoxError("error_writer", this, e);
145 145
		} catch (IOException e) {
146
			RasterToolsUtil.messageBoxError(PluginServices.getText(this, "error_writer"), this, e);
146
			RasterToolsUtil.messageBoxError("error_writer", this, e);
147 147
		} catch (FilterTypeException e) {
148
			RasterToolsUtil.messageBoxError(PluginServices.getText(this, "error_adding_filters"), this, e);
148
			RasterToolsUtil.messageBoxError("error_adding_filters", this, e);
149 149
		}
150 150
	}
151 151

  
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/RasterModule.java
23 23

  
24 24
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
25 25
import org.gvsig.fmap.raster.layers.StatusLayerRaster;
26
import org.gvsig.raster.Configuration;
27
import org.gvsig.raster.ConfigurationEvent;
28
import org.gvsig.raster.ConfigurationListener;
26 29
import org.gvsig.raster.RasterLibrary;
27 30
import org.gvsig.raster.gui.preferences.RasterPreferences;
28 31
import org.gvsig.raster.gui.properties.dialog.RasterPropertiesTocMenuEntry;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/colortable/ui/ColorTablePanel.java
49 49
import org.gvsig.raster.grid.filter.bands.ColorTableFilter;
50 50
import org.gvsig.raster.grid.render.Rendering;
51 51
import org.gvsig.raster.util.RasterToolsUtil;
52
import org.gvsig.raster.util.RasterUtilities;
53 52
import org.gvsig.rastertools.colortable.ColorTableListener;
54 53
import org.gvsig.rastertools.colortable.data.ColorTableData;
55 54
import org.gvsig.rastertools.colortable.library.ColorTableLibraryEvent;
......
100 99
	public ColorTablePanel(ColorTableDialog colorTableDialog) {
101 100
		super(ButtonsPanel.BUTTONS_NONE);
102 101
		this.colorTableDialog = colorTableDialog;
103
		getButtonsPanel().addButton(PluginServices.getText(this, "equidistar"), ButtonsPanel.BUTTON_LAST + 3);
104
		getButtonsPanel().addButton(PluginServices.getText(this, "guardar_predeterminado"), ButtonsPanel.BUTTON_LAST + 2);
102
		getButtonsPanel().addButton(RasterToolsUtil.getText(this, "equidistar"), ButtonsPanel.BUTTON_LAST + 3);
103
		getButtonsPanel().addButton(RasterToolsUtil.getText(this, "guardar_predeterminado"), ButtonsPanel.BUTTON_LAST + 2);
105 104
		getButtonsPanel().addApply();
106 105
		getButtonsPanel().addAccept();
107 106
		getButtonsPanel().addCancel();
......
140 139
		if (tabbedPane == null) {
141 140
			tabbedPane = new JTabbedPane();
142 141

  
143
			tabbedPane.addTab(PluginServices.getText(this, "tabla"), getTabTable().getPanel());
144
			tabbedPane.addTab(PluginServices.getText(this, "rampa"), getTabInterpolated().getPanel());
142
			tabbedPane.addTab(RasterToolsUtil.getText(this, "tabla"), getTabTable().getPanel());
143
			tabbedPane.addTab(RasterToolsUtil.getText(this, "rampa"), getTabInterpolated().getPanel());
145 144
			getColorTableListener().setLastColorTableUI(getTabTable());
146 145
			tabbedPane.addChangeListener(this);
147 146
		}
......
182 181
		if (jPanelPreview == null) {
183 182
			jPanelPreview = new JPanel();
184 183
			JPanel jsubpanel2 = new JPanel();
185
			jPanelPreview.setBorder(javax.swing.BorderFactory.createTitledBorder(null, PluginServices.getText(this, "vista_previa"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, null));
184
			jPanelPreview.setBorder(javax.swing.BorderFactory.createTitledBorder(null, RasterToolsUtil.getText(this, "vista_previa"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, null));
186 185
			jPanelPreview.setLayout(new BorderLayout());
187 186
			jsubpanel2.setBorder(javax.swing.BorderFactory.createEmptyBorder(8, 8, 8, 8));
188 187
			jsubpanel2.setLayout(new BorderLayout());
......
200 199
	public JPanel getPanelListView() {
201 200
		if (jPanelListView == null) {
202 201
			jPanelListView = new JPanel();
203
			jPanelListView.setBorder(javax.swing.BorderFactory.createTitledBorder(null, PluginServices.getText(this, "libreria"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, null));
202
			jPanelListView.setBorder(javax.swing.BorderFactory.createTitledBorder(null, RasterToolsUtil.getText(this, "libreria"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, null));
204 203
			jPanelListView.setLayout(new BorderLayout());
205 204
			
206 205
			jPanelListView.add(getColorTableLibraryPanel().getPanel());
......
318 317
			return;
319 318
		manager.addClient(ser);
320 319
		try {
321
			RasterUtilities.copyFile(manager.getPath(), manager.getPath() + "~");
322
			manager.write();
320
			manager.write(true);
323 321
		} catch (FileNotFoundException e) {
324
			e.printStackTrace();
322
			RasterToolsUtil.messageBoxError("error_salvando_rmf", this, e);
325 323
		} catch (IOException e) {
326
			e.printStackTrace();
324
			RasterToolsUtil.messageBoxError("error_salvando_rmf", this, e);
327 325
		}
328 326
		manager.removeClient(ser.getClass());
329 327
	}
......
401 399
			}
402 400

  
403 401
			ColorTable colorTable = new ColorTable();
404
			colorTable.setName(PluginServices.getText(this, "tabla_actual"));
402
			colorTable.setName(RasterToolsUtil.getText(this, "tabla_actual"));
405 403
			colorTable.createPaletteFromColorItems(gridPalette.getColorItems(), false);
406 404
			colorTable.setInterpolated(gridPalette.isInterpolated());
407 405
			getGeneralPanel().setCheckBoxInterpolated(gridPalette.isInterpolated());
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/overviews/OverviewsProcess.java
24 24
import org.gvsig.addo.Jaddo;
25 25
import org.gvsig.addo.WritingException;
26 26
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
27
import org.gvsig.rastertools.Configuration;
27
import org.gvsig.raster.Configuration;
28 28
import org.gvsig.rastertools.RasterProcess;
29 29

  
30 30
import com.iver.andami.PluginServices;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/control/PanSharpeningControl.java
15 15
import org.gvsig.gui.beans.panelGroup.AbstractPanelGroup;
16 16
import org.gvsig.gui.beans.slidertext.listeners.SliderEvent;
17 17
import org.gvsig.gui.beans.slidertext.listeners.SliderListener;
18
import org.gvsig.raster.Configuration;
18 19
import org.gvsig.raster.dataset.RasterDataset;
19 20
import org.gvsig.raster.grid.filter.FilterTypeException;
20 21
import org.gvsig.raster.grid.filter.RasterFilter;
......
25 26
import org.gvsig.raster.hierarchy.IRasterDataset;
26 27
import org.gvsig.raster.hierarchy.IRasterProperties;
27 28
import org.gvsig.raster.util.RasterToolsUtil;
28
import org.gvsig.rastertools.Configuration;
29 29
import org.gvsig.rastertools.RasterModule;
30 30
import org.gvsig.rastertools.properties.panels.PanSharpeningPanel;
31 31

  
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/control/TransparencyListener.java
22 22
import java.util.EventObject;
23 23

  
24 24
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
25
import org.gvsig.raster.Configuration;
25 26
import org.gvsig.raster.datastruct.TransparencyRange;
26 27
import org.gvsig.raster.grid.GridTransparency;
27 28
import org.gvsig.raster.grid.filter.RasterFilterListManager;
28 29
import org.gvsig.raster.gui.properties.dialog.RasterPropertiesTocMenuEntry;
29 30
import org.gvsig.raster.hierarchy.IRasterProperties;
30
import org.gvsig.rastertools.Configuration;
31 31
import org.gvsig.rastertools.RasterModule;
32 32
import org.gvsig.rastertools.properties.panels.NoDataPanel;
33 33
import org.gvsig.rastertools.properties.panels.TransparencyPanel;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/panels/InfoPanel.java
29 29

  
30 30
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
31 31
import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel;
32
import org.gvsig.raster.Configuration;
32 33
import org.gvsig.raster.RasterLibrary;
33 34
import org.gvsig.raster.dataset.io.RasterDriverException;
34 35
import org.gvsig.raster.dataset.properties.DatasetMetadata;
35 36
import org.gvsig.raster.datastruct.Extent;
36 37
import org.gvsig.raster.hierarchy.IRasterProperties;
37 38
import org.gvsig.raster.util.RasterUtilities;
38
import org.gvsig.rastertools.Configuration;
39 39

  
40 40
import com.iver.andami.PluginServices;
41 41
import com.iver.cit.gvsig.fmap.layers.FLayer;
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/panels/NoDataPanel.java
39 39
import javax.swing.text.NumberFormatter;
40 40

  
41 41
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
42
import org.gvsig.raster.Configuration;
43
import org.gvsig.raster.ConfigurationEvent;
44
import org.gvsig.raster.ConfigurationListener;
42 45
import org.gvsig.raster.dataset.io.rmf.RmfBlocksManager;
43 46
import org.gvsig.raster.datastruct.serializer.NoDataRmfSerializer;
44 47
import org.gvsig.raster.hierarchy.IRasterProperties;
45 48
import org.gvsig.raster.util.PanelBase;
46
import org.gvsig.rastertools.Configuration;
47
import org.gvsig.rastertools.ConfigurationEvent;
48
import org.gvsig.rastertools.ConfigurationListener;
49 49
import org.gvsig.rastertools.properties.panels.interfaces.INoDataPanel;
50 50
/**
51 51
 * Panel para la gestion del valor NoData en el panel de propiedades

Also available in: Unified diff