Revision 1817
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.multifile/src/main/java/org/gvsig/raster/tools/app/multifile/MultifileClientExtension.java | ||
---|---|---|
21 | 21 |
*/ |
22 | 22 |
package org.gvsig.raster.tools.app.multifile; |
23 | 23 |
|
24 |
import java.util.Locale; |
|
25 |
|
|
24 | 26 |
import org.gvsig.andami.plugins.Extension; |
27 |
import org.gvsig.i18n.Messages; |
|
25 | 28 |
import org.gvsig.raster.tools.app.basic.raster.gui.preference.RasterPreferences; |
26 | 29 |
import org.gvsig.raster.tools.app.multifile.panel.BandSelectorPanel; |
27 | 30 |
import org.gvsig.tools.ToolsLocator; |
... | ... | |
46 | 49 |
point = extensionPoints.add("RasterSEPropertiesDialog"); |
47 | 50 |
point.append("Bandas", "", BandSelectorPanel.class); |
48 | 51 |
|
52 |
if (!Messages.hasLocales()) { |
|
53 |
Messages.addLocale(Locale.getDefault()); |
|
54 |
} |
|
55 |
|
|
56 |
Messages.addResourceFamily("org.gvsig.raster.tools.app.multifile.i18n.text", |
|
57 |
MultifileClientExtension.class.getClassLoader(), |
|
58 |
MultifileClientExtension.class.getClass().getName()); |
|
59 |
|
|
49 | 60 |
} |
50 | 61 |
|
51 | 62 |
public void execute(String actionCommand) { |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.multifile/src/main/java/org/gvsig/raster/tools/app/multifile/panel/BandSelectorFileList.java | ||
---|---|---|
33 | 33 |
import javax.swing.JScrollPane; |
34 | 34 |
import javax.swing.ListSelectionModel; |
35 | 35 |
|
36 |
import org.gvsig.gui.beans.Messages; |
|
36 | 37 |
|
38 |
|
|
37 | 39 |
/** |
38 | 40 |
* Panel que contiene la lista de ficheros cargados desde donde se leen las |
39 | 41 |
* bandas visualizadas. Contiene controles para a?adir y eliminar los ficheros, |
... | ... | |
88 | 90 |
*/ |
89 | 91 |
public JButton getJButtonAdd() { |
90 | 92 |
if (addButton == null) { |
91 |
addButton = new JButton("A?adir");
|
|
93 |
addButton = new JButton(Messages.getText("anadir"));
|
|
92 | 94 |
addButton.setPreferredSize(new java.awt.Dimension(80, 25)); |
93 | 95 |
} |
94 | 96 |
return addButton; |
... | ... | |
100 | 102 |
*/ |
101 | 103 |
public JButton getJButtonRemove() { |
102 | 104 |
if (delButton == null) { |
103 |
delButton = new JButton("Eliminar");
|
|
105 |
delButton = new JButton(Messages.getText("eliminar"));
|
|
104 | 106 |
delButton.setPreferredSize(new java.awt.Dimension(80, 25)); |
105 | 107 |
} |
106 | 108 |
return delButton; |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.multifile/src/main/java/org/gvsig/raster/tools/app/multifile/panel/BandSelectorPanel.java | ||
---|---|---|
38 | 38 |
import javax.swing.event.TableModelListener; |
39 | 39 |
import javax.swing.table.DefaultTableModel; |
40 | 40 |
|
41 |
import org.gvsig.andami.PluginServices; |
|
42 | 41 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
43 | 42 |
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation; |
44 | 43 |
import org.gvsig.fmap.dal.coverage.store.props.Transparency; |
45 | 44 |
import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel; |
46 | 45 |
import org.gvsig.gui.beans.table.TableContainer; |
47 | 46 |
import org.gvsig.gui.beans.table.exceptions.NotInitializeException; |
47 |
import org.gvsig.i18n.Messages; |
|
48 | 48 |
import org.gvsig.raster.fmap.layers.FLyrRaster; |
49 | 49 |
import org.gvsig.raster.fmap.layers.IRasterLayerActions; |
50 | 50 |
import org.gvsig.raster.tools.app.basic.RasterToolsUtil; |
... | ... | |
112 | 112 |
add(getButtonsPanel(), gbc); |
113 | 113 |
|
114 | 114 |
this.setPreferredSize(new Dimension(100, 80)); |
115 |
super.setLabel(PluginServices.getText(this, "bands_panel"));
|
|
115 |
super.setLabel(Messages.getText("bands_panel"));
|
|
116 | 116 |
} |
117 | 117 |
|
118 | 118 |
/** |
... | ... | |
151 | 151 |
buttonsPanel = new JPanel(); |
152 | 152 |
buttonsPanel.setLayout(new GridBagLayout()); |
153 | 153 |
JLabel lbandasVisibles = new JLabel(); |
154 |
lbandasVisibles.setText("Bandas");
|
|
154 |
lbandasVisibles.setText(Messages.getText("bands"));
|
|
155 | 155 |
|
156 | 156 |
GridBagConstraints gbc = new GridBagConstraints(); |
157 | 157 |
gbc.insets = new Insets(0, 8, 0, 0); |
... | ... | |
199 | 199 |
*/ |
200 | 200 |
public JButton getSaveButton() { |
201 | 201 |
if(saveButton == null) { |
202 |
saveButton = new JButton(RasterToolsUtil.getText(this, "save"));
|
|
203 |
saveButton.setToolTipText(RasterToolsUtil.getText(this, "save_color_interpretation"));
|
|
202 |
saveButton = new JButton(Messages.getText("save"));
|
|
203 |
saveButton.setToolTipText(Messages.getText("save_color_interpretation"));
|
|
204 | 204 |
saveButton.addActionListener(panelListener); |
205 | 205 |
} |
206 | 206 |
return saveButton; |
... | ... | |
478 | 478 |
} |
479 | 479 |
} |
480 | 480 |
} catch (NotInitializeException e) { |
481 |
RasterToolsUtil.messageBoxError("table_not_initialize", this, e);
|
|
481 |
RasterToolsUtil.messageBoxError(Messages.getText("table_not_initialize"), this, e);
|
|
482 | 482 |
} |
483 | 483 |
return ColorInterpretation.UNDEF_BAND; |
484 | 484 |
} |
... | ... | |
675 | 675 |
try { |
676 | 676 |
addFiles(fLayer.getDataStore()); |
677 | 677 |
} catch (NotInitializeException e) { |
678 |
RasterToolsUtil.messageBoxError("table_not_initialize", this);
|
|
678 |
RasterToolsUtil.messageBoxError(Messages.getText("table_not_initialize"), this);
|
|
679 | 679 |
} |
680 | 680 |
|
681 | 681 |
panelListener.init(fLayer); |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.multifile/src/main/java/org/gvsig/raster/tools/app/multifile/panel/BandSelectorListener.java | ||
---|---|---|
28 | 28 |
import java.io.File; |
29 | 29 |
import java.io.IOException; |
30 | 30 |
import java.util.ArrayList; |
31 |
import java.util.List; |
|
31 | 32 |
|
32 | 33 |
import javax.swing.JOptionPane; |
33 | 34 |
|
... | ... | |
57 | 58 |
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelListener; |
58 | 59 |
import org.gvsig.gui.beans.swing.JFileChooser; |
59 | 60 |
import org.gvsig.gui.beans.table.exceptions.NotInitializeException; |
61 |
import org.gvsig.i18n.Messages; |
|
60 | 62 |
import org.gvsig.raster.fmap.layers.DefaultFLyrRaster; |
61 | 63 |
import org.gvsig.raster.fmap.layers.FLyrRaster; |
62 | 64 |
import org.gvsig.raster.tools.app.basic.RasterExtension; |
... | ... | |
66 | 68 |
import org.gvsig.raster.tools.multifile.io.MultiFileFormat; |
67 | 69 |
import org.gvsig.raster.tools.multifile.io.MultiFileProvider; |
68 | 70 |
import org.gvsig.tools.locator.LocatorException; |
71 |
import org.slf4j.Logger; |
|
72 |
import org.slf4j.LoggerFactory; |
|
69 | 73 |
|
70 | 74 |
/** |
71 | 75 |
* Clase que maneja los eventos del panel BandSetupPanel. Gestiona el a?adir o |
... | ... | |
75 | 79 |
* @author Nacho Brodin (brodin_ign@gva.es) |
76 | 80 |
*/ |
77 | 81 |
public class BandSelectorListener implements ActionListener, ButtonsPanelListener { |
82 |
private Logger log = LoggerFactory.getLogger(BandSelectorListener.class); |
|
78 | 83 |
private BandSelectorPanel bandSetupPanel = null; |
79 | 84 |
private JFileChooser fileChooser = null; |
80 | 85 |
private FLyrRaster fLayer = null; |
81 | 86 |
private boolean enabled = true; |
82 |
private ArrayList<File> fileList = null;
|
|
87 |
private List<File> fileList = null;
|
|
83 | 88 |
|
84 | 89 |
/** |
85 | 90 |
* Constructor |
... | ... | |
165 | 170 |
int aBand = bandSetupPanel.getAssignedBand(RasterDataStore.ALPHA_BAND); |
166 | 171 |
|
167 | 172 |
if (!isCorrectAssignedBand(rBand, gBand, bBand, aBand)) { |
168 |
RasterToolsUtil.messageBoxError("combinacion_no_asignable", bandSetupPanel);
|
|
173 |
RasterToolsUtil.messageBoxError(Messages.getText("combinacion_no_asignable"), bandSetupPanel);
|
|
169 | 174 |
return; |
170 | 175 |
} |
171 | 176 |
|
172 |
RasterToolsUtil.messageBoxYesOrNot("color_interpretation_continue", this);
|
|
177 |
RasterToolsUtil.messageBoxYesOrNot(Messages.getText("color_interpretation_continue"), this);
|
|
173 | 178 |
RasterDataStore dataSource = fLayer.getDataStore(); |
174 | 179 |
if(dataSource == null) { |
175 |
RasterToolsUtil.messageBoxError("error_carga_capa", bandSetupPanel);
|
|
180 |
RasterToolsUtil.messageBoxError(Messages.getText("error_carga_capa"), bandSetupPanel);
|
|
176 | 181 |
return; |
177 | 182 |
} |
178 | 183 |
|
... | ... | |
193 | 198 |
String fileName = fLayer.getDataStore().getName(); |
194 | 199 |
RasterLocator.getManager().getProviderServices().saveObjectToRmfFile(fileName, ci); |
195 | 200 |
} catch (RmfSerializerException exc) { |
196 |
RasterToolsUtil.messageBoxError("error_salvando_rmf", bandSetupPanel, exc);
|
|
201 |
RasterToolsUtil.messageBoxError(Messages.getText("error_salvando_rmf"), bandSetupPanel, exc);
|
|
197 | 202 |
} catch (NotInitializeException exc) { |
198 |
RasterToolsUtil.messageBoxError("table_not_initialize", bandSetupPanel, exc);
|
|
203 |
RasterToolsUtil.messageBoxError(Messages.getText("table_not_initialize"), bandSetupPanel, exc);
|
|
199 | 204 |
} |
200 | 205 |
} |
201 | 206 |
|
... | ... | |
277 | 282 |
boolean exists = false; |
278 | 283 |
for (int j = 0; j < uris.length; j++) { |
279 | 284 |
if (uris[j].endsWith(files[i].getName())) { |
280 |
RasterToolsUtil.messageBoxError( PluginServices.getText( this, "fichero_existe") + ": " + files[i].getAbsolutePath(), bandSetupPanel);
|
|
285 |
RasterToolsUtil.messageBoxError( Messages.getText("fichero_existe") + ": " + files[i].getAbsolutePath(), bandSetupPanel);
|
|
281 | 286 |
exists = true; |
282 | 287 |
break; |
283 | 288 |
} |
... | ... | |
290 | 295 |
//Checks extents |
291 | 296 |
try { |
292 | 297 |
if(!checkNewFile(fileList.get(i).getAbsolutePath())) { |
293 |
JOptionPane.showMessageDialog(null, PluginServices.getText(this, "extents_no_coincidentes") + " " + files[i].getAbsolutePath(), "", JOptionPane.ERROR_MESSAGE);
|
|
298 |
JOptionPane.showMessageDialog(null, Messages.getText("extents_no_coincidentes") + " " + files[i].getAbsolutePath(), "", JOptionPane.ERROR_MESSAGE);
|
|
294 | 299 |
fileList.remove(i); |
295 | 300 |
} |
296 | 301 |
} catch (Exception e) { |
297 |
e.printStackTrace();
|
|
302 |
log.debug("Problems check the bounding boxes", e);
|
|
298 | 303 |
} |
299 | 304 |
} |
300 |
|
|
305 |
|
|
306 |
if(dataStore.isTiled()) { |
|
307 |
if(!RasterToolsUtil.messageBoxYesOrNot(Messages.getText("store_tiled"), this)) { |
|
308 |
return; |
|
309 |
} |
|
310 |
} |
|
311 |
|
|
301 | 312 |
if(dataStore.isMultiFile()) { |
302 | 313 |
for (int i = 0; i < fileList.size(); i++) { |
303 | 314 |
try { |
304 | 315 |
dataStore.addFile(fileList.get(i).getAbsolutePath()); |
305 | 316 |
} catch (InvalidSourceException e) { |
306 |
RasterToolsUtil.messageBoxError("addband_error", bandSetupPanel, e);
|
|
317 |
RasterToolsUtil.messageBoxError(Messages.getText("addband_error"), bandSetupPanel, e);
|
|
307 | 318 |
} |
308 | 319 |
} |
309 | 320 |
|
... | ... | |
374 | 385 |
try { |
375 | 386 |
bandSetupPanel.addFiles(dataStore); |
376 | 387 |
} catch (NotInitializeException ex) { |
377 |
RasterToolsUtil.messageBoxError("table_not_initialize", this, ex);
|
|
388 |
RasterToolsUtil.messageBoxError(Messages.getText("table_not_initialize"), this, ex);
|
|
378 | 389 |
} |
379 | 390 |
|
380 | 391 |
ArrayList<File> uriList = new ArrayList<File>(); |
... | ... | |
385 | 396 |
saveMultiFileLayer(layerName, paramFirstFile.getURI(), uriList); |
386 | 397 |
|
387 | 398 |
} catch (Exception exc) { |
388 |
RasterToolsUtil.messageBoxError("addband_error", bandSetupPanel, exc);
|
|
399 |
RasterToolsUtil.messageBoxError(Messages.getText("addband_error"), bandSetupPanel, exc);
|
|
389 | 400 |
} |
390 | 401 |
} |
391 | 402 |
|
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.multifile/src/main/java/org/gvsig/raster/tools/app/multifile/panel/LayerNameDialog.java | ||
---|---|---|
35 | 35 |
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent; |
36 | 36 |
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelListener; |
37 | 37 |
import org.gvsig.gui.beans.defaultbuttonspanel.DefaultButtonsPanel; |
38 |
import org.gvsig.i18n.Messages; |
|
38 | 39 |
|
39 | 40 |
/** |
40 | 41 |
* <code>LayerNameDialog</code>. |
... | ... | |
96 | 97 |
*/ |
97 | 98 |
public WindowInfo getWindowInfo() { |
98 | 99 |
WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE); |
99 |
m_viewinfo.setTitle(PluginServices.getText(this, "layer_name"));
|
|
100 |
m_viewinfo.setTitle(Messages.getText("layer_name"));
|
|
100 | 101 |
m_viewinfo.setHeight(this.getHeight()); |
101 | 102 |
m_viewinfo.setWidth(this.getWidth()); |
102 | 103 |
m_viewinfo.setX((int)position.getX()); |
... | ... | |
121 | 122 |
private void accept() { |
122 | 123 |
String txt = getNameField().getText(); |
123 | 124 |
if(txt == null || txt.compareTo("") == 0) { |
124 |
JOptionPane.showMessageDialog(null, PluginServices.getText(this, "character_not_valid"), "", JOptionPane.ERROR_MESSAGE);
|
|
125 |
JOptionPane.showMessageDialog(null, Messages.getText("character_not_valid"), "", JOptionPane.ERROR_MESSAGE);
|
|
125 | 126 |
return; |
126 | 127 |
} |
127 | 128 |
|
... | ... | |
134 | 135 |
(byteList[i] > 95 && byteList[i] < 97) || |
135 | 136 |
(byteList[i] > 122 && byteList[i] < 126) || |
136 | 137 |
(byteList[i] > 126)) { |
137 |
JOptionPane.showMessageDialog(null, PluginServices.getText(this, "character_not_valid"), "", JOptionPane.ERROR_MESSAGE);
|
|
138 |
JOptionPane.showMessageDialog(null, Messages.getText("character_not_valid"), "", JOptionPane.ERROR_MESSAGE);
|
|
138 | 139 |
return; |
139 | 140 |
} |
140 | 141 |
} |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.multifile.io/src/main/java/org/gvsig/raster/tools/multifile/io/MultiFileProvider.java | ||
---|---|---|
27 | 27 |
import java.io.File; |
28 | 28 |
import java.io.IOException; |
29 | 29 |
import java.util.ArrayList; |
30 |
import java.util.List; |
|
30 | 31 |
|
31 | 32 |
import org.gvsig.fmap.dal.DALFileLocator; |
32 | 33 |
import org.gvsig.fmap.dal.DALLocator; |
... | ... | |
81 | 82 |
import org.gvsig.tools.ToolsLocator; |
82 | 83 |
import org.gvsig.tools.locator.LocatorException; |
83 | 84 |
import org.gvsig.tools.task.TaskStatus; |
85 |
import org.slf4j.Logger; |
|
86 |
import org.slf4j.LoggerFactory; |
|
84 | 87 |
/** |
85 | 88 |
* A data provider for a multiband image readed from different files |
86 | 89 |
* |
... | ... | |
95 | 98 |
private boolean open = false; |
96 | 99 |
|
97 | 100 |
private DataStoreTransparency fileTransparency = null; |
98 |
//private static final Logger logger = LoggerFactory.getLogger(MultifileProvider.class);
|
|
101 |
private static final Logger logger = LoggerFactory.getLogger(MultiFileProvider.class);
|
|
99 | 102 |
protected static String[] formatList = null; |
100 | 103 |
private ArrayList<RasterProvider> providerList = null; |
101 | 104 |
|
... | ... | |
168 | 171 |
DataStoreProviderServices storeServices) throws NotSupportedExtensionException, OpenException { |
169 | 172 |
|
170 | 173 |
openFromMff(); |
171 |
|
|
174 |
|
|
172 | 175 |
uri = getParameters().getURI(); |
173 | 176 |
providerList = getParameters().getProviders(); |
174 | 177 |
setParam(storeServices, params); |
175 | 178 |
|
179 |
try { |
|
180 |
setFirstProviderToNotTiled(); |
|
181 |
} catch (InvalidSourceException e1) { |
|
182 |
throw new OpenException(e1.getMessage(), e1); |
|
183 |
} |
|
184 |
|
|
176 | 185 |
super.init(); |
177 | 186 |
|
178 | 187 |
try { |
179 | 188 |
loadFromRmf(getRmfBlocksManager()); |
180 | 189 |
} catch (ParsingException e) { |
181 |
//No lee desde rmf
|
|
190 |
logger.debug("Problems reading from RMF", e);
|
|
182 | 191 |
} |
183 | 192 |
|
184 | 193 |
open = true; |
... | ... | |
721 | 730 |
* @return |
722 | 731 |
*/ |
723 | 732 |
private BandList createBandListByProvider(BandList globalBandList, RasterProvider provider) { |
724 |
BandList bandListByFile = new BandListImpl(); |
|
725 |
for (int i = 0; i < provider.getBandCount(); i++) { |
|
726 |
try { |
|
727 |
bandListByFile.addBand(new DatasetBandImpl(provider.getURI(), i, provider.getDataType()[0], provider.getBandCount())); |
|
728 |
} catch (BandNotFoundInListException e1) { |
|
733 |
if(provider.isTiled()) { |
|
734 |
//Si los proveedores que hay por debajo son tileados estos crear?n su propio buffer para escribir |
|
735 |
//cada tile. Por ello no usar? el buffer que viene del store. Esto quiere decir que el BandList ha |
|
736 |
//de ser distinto para que escriba bien en su buffer |
|
737 |
|
|
738 |
//TODO: De momento no se permiten MultiFiles con proveedores tileados. Esto es porque |
|
739 |
//los tiles crean su propio buffer y no escriben en el buffer creado en el Store |
|
740 |
|
|
741 |
} else { |
|
742 |
BandList bandListByFile = new BandListImpl(); |
|
743 |
for (int i = 0; i < provider.getBandCount(); i++) { |
|
744 |
try { |
|
745 |
bandListByFile.addBand(new DatasetBandImpl(provider.getURI(), i, provider.getDataType()[0], provider.getBandCount())); |
|
746 |
} catch (BandNotFoundInListException e1) { |
|
747 |
} |
|
729 | 748 |
} |
730 |
} |
|
731 |
|
|
732 |
boolean areThereBandsToDraw = false;
|
|
733 |
for (int i = 0; i < provider.getBandCount(); i++) {
|
|
734 |
int[] bandsToDrawByProviderBand = globalBandList.getBufferBandToDraw(provider.getURI(), i);
|
|
735 |
if(bandsToDrawByProviderBand != null) {
|
|
736 |
areThereBandsToDraw = true;
|
|
737 |
for (int j = 0; j < bandsToDrawByProviderBand.length; j++) {
|
|
738 |
bandListByFile.getBand(i).addPositionToDrawInBuffer(bandsToDrawByProviderBand[j]);
|
|
749 |
|
|
750 |
boolean areThereBandsToDraw = false; |
|
751 |
for (int i = 0; i < provider.getBandCount(); i++) {
|
|
752 |
int[] bandsToDrawByProviderBand = globalBandList.getBufferBandToDraw(provider.getURI(), i);
|
|
753 |
if(bandsToDrawByProviderBand != null) {
|
|
754 |
areThereBandsToDraw = true;
|
|
755 |
for (int j = 0; j < bandsToDrawByProviderBand.length; j++) {
|
|
756 |
bandListByFile.getBand(i).addPositionToDrawInBuffer(bandsToDrawByProviderBand[j]);
|
|
757 |
}
|
|
739 | 758 |
} |
740 | 759 |
} |
760 |
|
|
761 |
if(areThereBandsToDraw) |
|
762 |
return bandListByFile; |
|
741 | 763 |
} |
742 |
|
|
743 |
if(areThereBandsToDraw) |
|
744 |
return bandListByFile; |
|
745 | 764 |
return null; |
746 | 765 |
} |
747 | 766 |
|
... | ... | |
902 | 921 |
* @see org.gvsig.raster.impl.provider.RasterProvider#addFile(java.lang.String) |
903 | 922 |
*/ |
904 | 923 |
public void addFile(String file) throws InvalidSourceException { |
905 |
/*try { |
|
906 |
RasterProvider provider = loadProvider(file, storeServices); |
|
907 |
if(checkNewProvider(provider)) { |
|
908 |
getParameters().addProvider(provider); |
|
909 |
} else { |
|
910 |
provider.close(); |
|
911 |
} |
|
912 |
} catch (ProviderNotRegisteredException e) { |
|
913 |
throw new InvalidSourceException("Provider not registered", e); |
|
914 |
} catch (InitializeException e) { |
|
915 |
throw new InvalidSourceException("Initialize exception", e); |
|
916 |
}*/ |
|
917 | 924 |
ProviderServices provServ = RasterLocator.getManager().getProviderServices(); |
918 | 925 |
DataManagerProviderServices dataManager = (DataManagerProviderServices)DALLocator.getDataManager(); |
926 |
|
|
927 |
// if(providerList.size() > 0 && providerList.get(0).isTiled()) { |
|
928 |
// //Comentado hasta que se puedan incorporar fuentes tileadas a aun MultiFile |
|
929 |
// //en su lugar se sustituye el primer proveedor tileado por uno sin tilear |
|
930 |
// |
|
931 |
// RasterDataParameters storeParameters = provServ.createParametersForTiledFiled(file); |
|
932 |
// |
|
933 |
// try { |
|
934 |
// RasterProvider newFileProv = (RasterProvider)dataManager.createProvider(storeServices, storeParameters); |
|
935 |
// if(checkNewProvider(newFileProv)) { |
|
936 |
// getParameters().addProvider(newFileProv); |
|
937 |
// } |
|
938 |
// } catch (InitializeException e) { |
|
939 |
// throw new InvalidSourceException("", e); |
|
940 |
// } catch (ProviderNotRegisteredException e) { |
|
941 |
// throw new InvalidSourceException("", e); |
|
942 |
// } |
|
943 |
// } |
|
919 | 944 |
|
920 |
ArrayList<RasterDataParameters> storeParametersList = provServ.createParametersList(file); |
|
945 |
setFirstProviderToNotTiled(); |
|
946 |
|
|
947 |
List<RasterDataParameters> storeParametersList = provServ.createParametersList(file); |
|
948 |
|
|
921 | 949 |
for (int j = 0; j < storeParametersList.size(); j++) { |
922 | 950 |
RasterProvider newFileProv; |
923 | 951 |
try { |
... | ... | |
933 | 961 |
} |
934 | 962 |
} |
935 | 963 |
|
964 |
private void setFirstProviderToNotTiled() throws InvalidSourceException { |
|
965 |
if(providerList == null || providerList.size() <= 0 || !providerList.get(0).isTiled()) |
|
966 |
return; |
|
967 |
|
|
968 |
//Si el primer proveedor es tileado se cambia a no tileado |
|
969 |
DataManagerProviderServices dataManager = (DataManagerProviderServices)DALLocator.getDataManager(); |
|
970 |
ProviderServices provServ = RasterLocator.getManager().getProviderServices(); |
|
971 |
|
|
972 |
RasterDataParameters firstDataParameters = providerList.get(0).getDataParameters(); |
|
973 |
String uri = firstDataParameters.getURI(); |
|
974 |
|
|
975 |
List<RasterDataParameters> storeParametersList = provServ.createParametersList(uri); |
|
976 |
|
|
977 |
for (int j = 0; j < storeParametersList.size(); j++) { |
|
978 |
RasterProvider newFileProv; |
|
979 |
try { |
|
980 |
newFileProv = (RasterProvider)dataManager.createProvider(storeServices, storeParametersList.get(j)); |
|
981 |
if(!newFileProv.isTiled() && checkNewProvider(newFileProv)) { |
|
982 |
getParameters().setFirstProvider(newFileProv); |
|
983 |
} |
|
984 |
} catch (InitializeException e) { |
|
985 |
throw new InvalidSourceException("Error replacing the first provider", e); |
|
986 |
} catch (ProviderNotRegisteredException e) { |
|
987 |
throw new InvalidSourceException("Error replacing the first provider", e); |
|
988 |
} |
|
989 |
} |
|
990 |
} |
|
991 |
|
|
936 | 992 |
/* |
937 | 993 |
* (non-Javadoc) |
938 | 994 |
* @see org.gvsig.raster.impl.provider.RasterProvider#removeFile(java.lang.String) |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.multifile.io/src/main/java/org/gvsig/raster/tools/multifile/io/MultiFileDataParameters.java | ||
---|---|---|
54 | 54 |
public void addProviderNotTiled(DataStoreProvider provider); |
55 | 55 |
|
56 | 56 |
/** |
57 |
* Set the selected provider in the first position |
|
58 |
* @param provider |
|
59 |
*/ |
|
60 |
public void setFirstProvider(DataStoreProvider provider); |
|
61 |
|
|
62 |
/** |
|
57 | 63 |
* Adds a provider to the list |
58 | 64 |
* @param prov |
59 | 65 |
*/ |
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.multifile.io/src/main/java/org/gvsig/raster/tools/multifile/io/MultiFileDataParametersImpl.java | ||
---|---|---|
129 | 129 |
} |
130 | 130 |
} |
131 | 131 |
|
132 |
/* |
|
133 |
* (non-Javadoc) |
|
134 |
* @see org.gvsig.raster.tools.multifile.io.MultiFileDataParameters#addProvider(org.gvsig.fmap.dal.spi.DataStoreProvider) |
|
135 |
*/ |
|
132 |
public void setFirstProvider(DataStoreProvider provider) { |
|
133 |
if(provider instanceof RasterProvider) { |
|
134 |
RasterProvider prov = (RasterProvider)provider; |
|
135 |
if(getProviders() != null) { |
|
136 |
getProviders().set(0, prov); |
|
137 |
} |
|
138 |
} |
|
139 |
} |
|
140 |
|
|
136 | 141 |
public void addProvider(DataStoreProvider provider) { |
137 | 142 |
if(provider instanceof RasterProvider) { |
138 | 143 |
RasterProvider prov = (RasterProvider)provider; |
... | ... | |
146 | 151 |
} |
147 | 152 |
} |
148 | 153 |
|
149 |
/* |
|
150 |
* (non-Javadoc) |
|
151 |
* @see org.gvsig.raster.tools.multifile.io.MultiFileDataParameters#addProvider(org.gvsig.fmap.dal.coverage.store.RasterDataStore) |
|
152 |
*/ |
|
153 | 154 |
public void addProvider(RasterDataStore rasterDataStore) { |
154 | 155 |
if(rasterDataStore instanceof DefaultRasterStore) { |
155 | 156 |
RasterProvider prov = (RasterProvider)((DefaultRasterStore)rasterDataStore).getProvider(); |
... | ... | |
157 | 158 |
} |
158 | 159 |
} |
159 | 160 |
|
160 |
/* |
|
161 |
* (non-Javadoc) |
|
162 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.MultiDimensionalStoreParameters#setFieldLevel(int) |
|
163 |
*/ |
|
164 | 161 |
public void setProviders(ArrayList<RasterProvider> provList) { |
165 | 162 |
setDynValue(MultiFileDataParameters.FIELD_PROVIDERS, provList); |
166 | 163 |
} |
Also available in: Unified diff