Revision 400

View differences:

trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.ogr.mainplugin/src/main/java/org/gvsig/gdal/app/ogr/mainplugin/gui/OGRWizarPanel.java
33 33
import org.gvsig.fmap.dal.DataStoreParameters;
34 34
import org.gvsig.gdal.prov.ogr.OGRDataStoreParameters;
35 35
import org.gvsig.tools.ToolsLocator;
36
import org.gvsig.tools.exception.BaseException;
37 36
import org.gvsig.tools.i18n.I18nManager;
38 37
import org.slf4j.Logger;
39 38
import org.slf4j.LoggerFactory;
......
51 50

  
52 51
    private static final String TAB_NAME = "OGR";
53 52

  
54
    private JOGRDataExplorer component;
53
    private final JOGRDataExplorer component;
55 54

  
56 55
    /**
57 56
     * 
......
71 70

  
72 71
    @Override
73 72
    public void execute() {
73
        I18nManager i18n = ToolsLocator.getI18nManager();
74 74

  
75 75
        String connectionString = this.component.getConnectionString();
76 76

  
......
78 78
            return;
79 79
        }
80 80

  
81
        List<DataStoreParameters> layerProperties = null;
81
        List<DataStoreParameters> layerProperties;
82 82
        try {
83 83
            layerProperties = this.component.getSelectedLayerProperties();
84
        } catch (BaseException e) {
85
            LOG.error("Can not get properties of selected layers", e);
84
        } catch (Throwable e) {
85
            LOG.warn("Can not get properties of selected layers", e);
86 86

  
87
            I18nManager i18nManager = ToolsLocator.getI18nManager();
88 87
            JOptionPane.showMessageDialog(component.asJComponent(),
89
                i18nManager.getTranslation("error_getting_selected_layer_properties"),
90
                i18nManager.getTranslation("error"), JOptionPane.ERROR_MESSAGE);
88
                i18n.getTranslation("error_getting_selected_layer_properties"),
89
                i18n.getTranslation("error"), JOptionPane.ERROR_MESSAGE);
91 90
            return;
92 91
        }
93

  
92
        
93
        if( layerProperties==null || layerProperties.isEmpty() ) {
94
            JOptionPane.showMessageDialog(component.asJComponent(),
95
                i18n.getTranslation("_You_must_select_at_least_one_layer")+"\n\n"+
96
                        i18n.getTranslation("_Make_sure_that_in_addition_to_selecting_a_file_click_on_the_open_button_and_you_have_selected_at_least_one_layer_from_the_list"),
97
                i18n.getTranslation("_Warning"), 
98
                JOptionPane.WARNING_MESSAGE);
99
            return;
100
        }
94 101
        for (DataStoreParameters parameters : layerProperties) {
95 102

  
96 103
            OGRDataStoreParameters ogrParameters = (OGRDataStoreParameters) parameters;
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.ogr.mainplugin/src/main/java/org/gvsig/gdal/app/ogr/mainplugin/gui/JOGRDataExplorerController.java
28 28
import java.io.File;
29 29
import java.util.ArrayList;
30 30
import java.util.Arrays;
31
import java.util.Collections;
31 32
import java.util.List;
32 33
import java.util.Locale;
33 34
import java.util.prefs.Preferences;
......
38 39
import javax.swing.ListSelectionModel;
39 40
import javax.swing.event.ListSelectionEvent;
40 41
import javax.swing.event.ListSelectionListener;
42
import javax.swing.table.TableModel;
41 43

  
42 44
import org.apache.commons.lang.StringUtils;
43 45
import org.apache.commons.lang3.ArrayUtils;
......
403 405
        ProviderNotRegisteredException {
404 406

  
405 407
        OGRDataStoreParameterTableModel model = getOGRTableModel();
406

  
408
        if( model == null ) {
409
            return Collections.EMPTY_LIST;
410
        }
407 411
        int[] selectedRows = layerTable.getSelectedRows();
408 412
        List<DataStoreParameters> parameters = new ArrayList<DataStoreParameters>();
409 413
        for (int i = 0; i < selectedRows.length; i++) {
......
424 428
    }
425 429

  
426 430
    private OGRDataStoreParameterTableModel getOGRTableModel() {
427
        return (OGRDataStoreParameterTableModel) layerTable.getModel();
431
        TableModel model = layerTable.getModel();
432
        if( model instanceof OGRDataStoreParameterTableModel) {
433
            return (OGRDataStoreParameterTableModel) model;
434
        }
435
        return null;
428 436
    }
429 437
}
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.ogr.mainplugin/src/main/resources-plugin/i18n/text.properties
1
connection_string_can_not_be_empty= La cadena de conexi?n no puede estar vac?a
2
connection_string= Cadena de conexi?n
1
connection_string_can_not_be_empty= La cadena de conexi\u00f3n no puede estar vac\u00eda
2
connection_string= Cadena de conexi\u00f3n
3 3
error_creating_properties_panel= Error creando panel de propiedades
4
error_getting_layers_from_connection_string=Error al obtener las capas desde la cadena de conexi?n 
4
error_getting_layers_from_connection_string=Error al obtener las capas desde la cadena de conexi\u00f3n 
5 5
error_getting_OGR_provider=Error al obtener el proveedor OGR
6 6
error_getting_selected_layer_properties = Error al obtener las propiedades de la capas seleccionadas 
7
error_opening_connection_string=Error al abrir la cadena de conexi?n
8
feature_number= N?mero de fen?menos
7
error_opening_connection_string=Error al abrir la cadena de conexi\u00f3n
8
feature_number= N\u00famero de fen\u00f3menos
9
_You_must_select_at_least_one_layer=Debe seleccionar al menos una capa.
10
_Make_sure_that_in_addition_to_selecting_a_file_click_on_the_open_button_and_you_have_selected_at_least_one_layer_from_the_list=Aseg\u00farese de que adem\u00e1s de seleccionar un archivo, haya hecho clic en el bot\u00f3n "abrir" y haya seleccionado al menos una capa de la lista.
trunk/org.gvsig.gdal/org.gvsig.gdal.app/org.gvsig.gdal.app.ogr.mainplugin/src/main/resources-plugin/i18n/text_en.properties
5 5
error_getting_OGR_provider=Error getting OGR provider
6 6
error_getting_selected_layer_properties=Error getting selected layer properties
7 7
error_opening_connection_string=Error opening connection string
8
feature_number= Feature number
8
feature_number= Feature number
9
_You_must_select_at_least_one_layer=You must select at least one layer.
10
_Make_sure_that_in_addition_to_selecting_a_file_click_on_the_open_button_and_you_have_selected_at_least_one_layer_from_the_list=Make sure that in addition to selecting a file, click on the "open" button and have selected at least one layer from the list.

Also available in: Unified diff