Revision 41488

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/panel/MessagePanel.java
3 3
 *
4 4
 * Copyright (C) 2007-2013 gvSIG Association.
5 5
 *
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 3
9
 * of the License, or (at your option) any later version.
6
 * This program is free software; you can redistribute it and/or modify it under
7
 * the terms of the GNU General Public License as published by the Free Software
8
 * Foundation; either version 3 of the License, or (at your option) any later
9
 * version.
10 10
 *
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
 * GNU General Public License for more details.
11
 * This program is distributed in the hope that it will be useful, but WITHOUT
12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13
 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
14
 * details.
15 15
 *
16
 * You should have received a copy of the GNU General Public License
17
 * along with this program; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
 * MA 02110-1301, USA.
16
 * You should have received a copy of the GNU General Public License along with
17
 * this program; if not, write to the Free Software Foundation, Inc., 51
18
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 19
 *
21
 * For any additional information, do not hesitate to contact us
22
 * at info AT gvsig.com, or visit our website www.gvsig.com.
20
 * For any additional information, do not hesitate to contact us at info AT
21
 * gvsig.com, or visit our website www.gvsig.com.
23 22
 */
24 23
package org.gvsig.exportto.swing.impl.panel;
25 24

  
......
27 26
import java.awt.Dimension;
28 27
import java.awt.event.ActionEvent;
29 28
import java.awt.event.ActionListener;
30
import java.util.logging.Level;
29
import java.net.UnknownHostException;
30
import java.util.Iterator;
31 31

  
32 32
import javax.swing.BorderFactory;
33 33
import javax.swing.Box;
......
43 43
import org.gvsig.tools.dynform.DynFormLocator;
44 44
import org.gvsig.tools.dynform.JDynForm;
45 45
import org.gvsig.tools.dynobject.DynObject;
46
import org.gvsig.tools.exception.BaseException;
47
import org.gvsig.tools.exception.BaseRuntimeException;
46 48
import org.gvsig.tools.i18n.I18nManager;
47 49
import org.gvsig.tools.service.ServiceException;
48 50

  
......
67 69
        wm.showWindow(panel, title, WindowManager.MODE.DIALOG);
68 70
    }
69 71

  
72
    public static void showMessage(String title,
73
            String header, Exception ex, Feature feature) {
74
        showMessage(title, header, getMessageAsHTML(ex), feature);
75
    }
76

  
77
    private static class ExceptionIterator implements Iterator {
78

  
79
        Throwable exception;
80

  
81
        ExceptionIterator(Throwable exception) {
82
            this.exception = exception;
83
        }
84

  
85
        public boolean hasNext() {
86
            return this.exception != null;
87
        }
88

  
89
        public Object next() {
90
            Throwable exception = this.exception;
91
            this.exception = exception.getCause();
92
            return exception;
93
        }
94

  
95
        public void remove() {
96
            throw new UnsupportedOperationException();
97
        }
98
    }
99

  
100
    private static String getMessageAsHTML(Exception ex) {
101
        Iterator exceptions = new ExceptionIterator(ex);
102
        StringBuilder html = new StringBuilder();
103

  
104
        html.append("<ul>\n");
105
        while (exceptions.hasNext()) {
106
            Throwable ex1 = ((Throwable) exceptions.next());
107
            String message = null;
108
            if (ex1 instanceof UnknownHostException) {
109
                message = "Unknown Host " + ex1.getMessage();
110
            } else {
111
                message = ex1.getMessage();
112
            }
113
            if (message != null) {
114
                html.append("<li>");
115
                if (message.toLowerCase().contains(" create ")) {
116
                    message = message.replaceFirst(" create ", "<br>\nCREATE ");
117
                    message = message.replaceAll(",", ",<br>\n");
118
                } else if (message.toLowerCase().contains(" insert ")) {
119
                    message = message.replaceFirst(" insert ", "<br>\nINSERT ");
120
                    message = message.replaceAll(",", ",<br>\n");
121
                }
122
                html.append(message);
123
                html.append("</li>\n");
124
            }
125
        }
126
        html.append("</ul>\n");
127
        return html.toString();
128
    }
129

  
70 130
    public MessagePanel(final String header, final String html, Feature feature) {
71 131
        I18nManager i18nManager = ToolsLocator.getI18nManager();
72 132

  
......
89 149
        scrollPane.setPreferredSize(new Dimension(500, 220));
90 150

  
91 151
        tabs.addTab(i18nManager.getTranslation("_Problem"), scrollPane);
92
        if ( feature != null ) {
152
        if (feature != null) {
93 153
            try {
94 154
                DynObject data = feature.getAsDynObject();
95 155
                JDynForm form = DynFormLocator.getDynFormManager().createJDynForm(data);
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/wizard/DefaultWizardContainer.java
3 3
 *
4 4
 * Copyright (C) 2007-2013 gvSIG Association.
5 5
 *
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 3
9
 * of the License, or (at your option) any later version.
6
 * This program is free software; you can redistribute it and/or modify it under
7
 * the terms of the GNU General Public License as published by the Free Software
8
 * Foundation; either version 3 of the License, or (at your option) any later
9
 * version.
10 10
 *
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
11
 * This program is distributed in the hope that it will be useful, but WITHOUT
12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13
 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
14
 * details.
15 15
 *
16
 * You should have received a copy of the GNU General Public License
17
 * along with this program; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
 * MA  02110-1301, USA.
16
 * You should have received a copy of the GNU General Public License along with
17
 * this program; if not, write to the Free Software Foundation, Inc., 51
18
 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20 19
 *
21
 * For any additional information, do not hesitate to contact us
22
 * at info AT gvsig.com, or visit our website www.gvsig.com.
20
 * For any additional information, do not hesitate to contact us at info AT
21
 * gvsig.com, or visit our website www.gvsig.com.
23 22
 */
24 23
package org.gvsig.exportto.swing.impl.wizard;
25 24

  
26 25
import javax.swing.JPanel;
26
import org.gvsig.exportto.swing.impl.panel.MessagePanel;
27 27

  
28 28
import org.slf4j.Logger;
29 29
import org.slf4j.LoggerFactory;
......
33 33
import org.gvsig.gui.beans.wizard.panel.NotContinueWizardException;
34 34
import org.gvsig.gui.beans.wizard.panel.OptionPanel;
35 35
import org.gvsig.i18n.Messages;
36
import org.gvsig.tools.ToolsLocator;
37
import org.gvsig.tools.i18n.I18nManager;
36 38

  
37 39
/**
38 40
 * @author gvSIG Team
39 41
 * @version $Id$
40
 * 
42
 *
41 43
 */
42 44
public class DefaultWizardContainer implements OptionPanel {
43 45

  
44 46
    private static final Logger LOG = LoggerFactory
45
        .getLogger(DefaultWizardContainer.class);
47
            .getLogger(DefaultWizardContainer.class);
46 48

  
47 49
    private ExporttoSwingProviderPanel exporttoSwingProviderPanel = null;
48 50

  
49 51
    public DefaultWizardContainer(
50
        ExporttoSwingProviderPanel exporttoSwingProviderPanel) {
52
            ExporttoSwingProviderPanel exporttoSwingProviderPanel) {
51 53
        super();
52 54
        this.exporttoSwingProviderPanel = exporttoSwingProviderPanel;
53 55
    }
......
60 62
        try {
61 63
            if (!this.exporttoSwingProviderPanel.isValidPanel()) {
62 64
                throw new NotContinueWizardException(
63
                    Messages.getText("_Invalid_values_in_form"),
64
                    exporttoSwingProviderPanel.asJComponent(),
65
                    false);
65
                        Messages.getText("_Invalid_values_in_form"),
66
                        exporttoSwingProviderPanel.asJComponent(),
67
                        false);
66 68
            }
67 69
        } catch (ExporttoPanelValidationException e) {
68 70
            LOG.info("Invalid form values.");
69 71
            throw new NotContinueWizardException(
70
                Messages.getText("_Invalid_values_in_form"),
71
                e, exporttoSwingProviderPanel.asJComponent());
72
                    Messages.getText("_Invalid_values_in_form"),
73
                    e, exporttoSwingProviderPanel.asJComponent());
72 74
        }
73 75
    }
74 76

  
......
78 80
    }
79 81

  
80 82
    public void updatePanel() {
81

  
83
        try {
84
            this.exporttoSwingProviderPanel.enterPanel();
85
        } catch (Exception ex) {
86
            LOG.warn("Fail the call to enterPanel.", ex);
87
            I18nManager i18nManager = ToolsLocator.getI18nManager();
88
            MessagePanel.showMessage(
89
                    i18nManager.getTranslation("_Warning"),
90
                    i18nManager.getTranslation("_There_have_been_problems_filling_data_in_panel") +
91
                            " (" + this.exporttoSwingProviderPanel.getPanelTitle() +")" ,
92
                    ex,
93
                    null
94
            );
95
        }
82 96
    }
83 97

  
84 98
    public JPanel getJPanel() {
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/exportto/swing/impl/DefaultJExporttoServicePanel.java
272 272

  
273 273
    private void showError(ExporttoServiceException e) {
274 274
        I18nManager i18nManager = ToolsLocator.getI18nManager();
275
        Iterator exceptions = e.iterator();
276
	StringBuilder html = new StringBuilder();
277
        
278
        html.append("<ul>\n");
279
        while (exceptions.hasNext()) {
280
            Throwable ex = ((Throwable) exceptions.next());
281
            String message = null;
282
            if( ex instanceof UnknownHostException ) {
283
                message = "Unknown Host " + ex.getMessage();
284
            } else {
285
                message = ex.getMessage();
286
            }
287
            if( message!=null ) {
288
                html.append("<li>");
289
                if( message.toLowerCase().contains(" create ") ) {
290
                    message = message.replaceFirst(" create ", "<br>\nCREATE ");
291
                    message = message.replaceAll(",", ",<br>\n");
292
                } else if( message.toLowerCase().contains(" insert ")) {
293
                    message = message.replaceFirst(" insert ", "<br>\nINSERT ");
294
                    message = message.replaceAll(",", ",<br>\n");
295
                }
296
                html.append(message);
297
                html.append("</li>\n");
298
            }
299
	}
300
        html.append("</ul>\n");
301 275
        MessagePanel.showMessage(
302 276
                i18nManager.getTranslation("_Warning"), 
303 277
                i18nManager.getTranslation("_There_have_been_problems_exporting_data"), 
304
                html.toString(), 
278
                e, 
305 279
                e.getFeature()
306 280
        );
307 281
    }
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.generic/src/main/java/org/gvsig/exportto/swing/prov/generic/panel/AbstractExporttoGenericPanel.java
53 53
    public JComponent asJComponent() {
54 54
        return this;
55 55
    }
56

  
57
    public void enterPanel() {
58
        // Default do nothing
59
    }
56 60
    
57 61
    
62
    
58 63
}
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.file/src/main/java/org/gvsig/exportto/swing/prov/file/panel/SelectFileOptionPanel.java
75 75
        }
76 76
    }
77 77

  
78
    @Override
79 78
    public String getPanelTitle() {
80 79
        return EXPORTTO_SWING_MANAGER.getTranslation("Seleccionar_fichero");
81 80
    }
......
83 82
    public File getSelectedFile() {
84 83
        return selectFileOptionPanel.getSelectedFile();
85 84
    }
86

  
87
    @Override
85
    
86
    public void enterPanel() {
87
        // Default do nothing
88
    }
89
    
88 90
    public boolean isValidPanel() throws ExporttoPanelValidationException {
89 91
        File file = selectFileOptionPanel.getSelectedFile();
90 92
        if ((file == null) || (file.equals(""))) {
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/ExporttoJDBCProvider.java
7 7
package org.gvsig.exportto.swing.prov.jdbc;
8 8

  
9 9
import org.gvsig.exportto.swing.spi.ExporttoSwingProvider;
10
import org.gvsig.fmap.dal.feature.FeatureStore;
10 11
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
11 12

  
12 13
/**
......
14 15
 * @author jjdelcerro
15 16
 */
16 17
public interface ExporttoJDBCProvider extends ExporttoSwingProvider {
17
    
18 18

  
19

  
20 19
    public JDBCServerExplorerParameters getExplorerParameters();
21 20
    
22 21
    public String getSchema();
......
34 33
    public String getStoreName();
35 34

  
36 35
    public String getExplorerName();
36
    
37
    public FeatureStore getSource();
38
    
39
    public boolean getTryToFixGeometry();
37 40

  
38 41
}
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/AbstractExporttoJDBCProvider.java
34 34
import org.gvsig.exportto.swing.spi.ExporttoSwingProviderPanel;
35 35
import org.gvsig.fmap.dal.feature.FeatureStore;
36 36
import org.gvsig.fmap.dal.feature.FeatureType;
37
import org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorerParameters;
38 37
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
39 38
import org.gvsig.tools.service.spi.AbstractProvider;
40 39
import org.gvsig.tools.service.spi.ProviderServices;
......
78 77
        }
79 78
        this.connectionPanel = new JDBCConnectionPanel(this);
80 79
        this.selectTableNamePanel = new SelectTableNamePanel(this);
81
        this.selectPkPanel = new SelectPkPanel(this,ftype);
80
        this.selectPkPanel = new SelectPkPanel(this);
82 81
        this.checkGeometriesPanel = new CheckGeometriesPanel(this);
83 82

  
84 83
        this.panels.add(this.connectionPanel);
......
95 94
        return this.panels.get(index);
96 95
    }
97 96

  
97
    public FeatureStore getSource() {
98
        return this.sourceStore;
99
    }
100
    
98 101
    public ExporttoService createExporttoService() {
99 102
        JDBCServerExplorerParameters explorerParameters = this.getExplorerParameters();
100 103
        explorerParameters.setSchema(this.getSchema());
......
106 109
                this.projection,
107 110
                this.canCreatetable(),
108 111
                this.getGeometryChecks(),
109
                this.getGeometryChecksAction()
112
                this.getGeometryChecksAction(),
113
                this.getTryToFixGeometry()
110 114
        );
111 115
    }
112 116

  
......
137 141
    public int getGeometryChecksAction() {
138 142
        return this.checkGeometriesPanel.getGeometryChecksAction();
139 143
    }
140

  
144
    
145
    public boolean getTryToFixGeometry() {
146
        return this.checkGeometriesPanel.getTryToFixGeometry();
147
    }
148
    
141 149
    public String getExplorerName() {
142 150
        return this.connectionPanel.getServerExplorerParameters().getExplorerName();
143 151
    }
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/ExporrtoJDBCService.java
45 45
import org.gvsig.fmap.geom.Geometry;
46 46
import org.gvsig.tools.dispose.DisposableIterator;
47 47
import org.gvsig.tools.task.AbstractMonitorableTask;
48
import org.slf4j.Logger;
49
import org.slf4j.LoggerFactory;
48 50

  
49 51
/**
50 52
 * @author gvSIG Team
......
54 56
public class ExporrtoJDBCService extends AbstractMonitorableTask implements
55 57
        ExporttoService {
56 58

  
59
    private static final Logger logger = LoggerFactory.getLogger(ExporrtoJDBCService.class);
60

  
57 61
    public static final int CHECK_NONE = 0;
58 62
    public static final int CHECK_IF_CORRUPT = 1;
59 63
    public static final int CHECK_IF_VALID = 2;
......
70 74
    private final int geometryChecksAction;
71 75
    private final IProjection tarjetProjection;
72 76
    private final boolean canCreateTable;
77
    private final boolean tryToFixGeometries;
73 78

  
74 79
    private ExporttoServiceFinishAction exporttoServiceFinishAction = null;
75 80

  
......
80 85
            IProjection tarjetProjection,
81 86
            boolean canCreatetable,
82 87
            int geometryChecks,
83
            int geometryChecksAction) {
88
            int geometryChecksAction,
89
            boolean tryToFixGeometries) {
84 90
        this.source = source;
85 91
        this.explorerParameters = explorerParameters;
86 92
        this.tableName = tablename;
......
89 95
        this.canCreateTable = canCreatetable;
90 96
        this.geometryChecks = geometryChecks;
91 97
        this.geometryChecksAction = geometryChecksAction;
98
        this.tryToFixGeometries = tryToFixGeometries;
92 99
    }
93 100

  
94 101
    protected void createTable(JDBCServerExplorer explorer) throws Exception {
95 102

  
96
        FeatureType targetFeatureType ;
97
        EditableFeatureType targetEditableFeatureType ;
103
        FeatureType targetFeatureType;
104
        EditableFeatureType targetEditableFeatureType;
98 105

  
99 106
        targetFeatureType = source.getDefaultFeatureType().getCopy();
100 107
        targetEditableFeatureType = targetFeatureType.getEditable();
101 108

  
102 109
        if (this.pkname != null) {
103
            EditableFeatureAttributeDescriptor pk
104
                    = targetEditableFeatureType.add(this.pkname, DataTypes.LONG);
105
            pk.setIsPrimaryKey(true);
106
            pk.setIsAutomatic(true);
110
            EditableFeatureAttributeDescriptor pk = (EditableFeatureAttributeDescriptor) targetEditableFeatureType.get(pkname);
111
            if (pk == null) {
112
                pk = targetEditableFeatureType.add(this.pkname, DataTypes.LONG);
113
                pk.setIsPrimaryKey(true);
114
                pk.setIsAutomatic(true);
115
            } else {
116
                pk.setIsPrimaryKey(true);
117
            }
107 118
        }
108 119

  
109 120
        // ======================================================
......
118 129
        NewFeatureStoreParameters createTableParams = (NewFeatureStoreParameters) explorer.getAddParameters();
119 130

  
120 131
        createTableParams.setDefaultFeatureType(targetEditableFeatureType);
121

  
132
        //createTableParams.setTable(this.tableName); // ?????
122 133
        explorer.add(explorer.getStoreName(), createTableParams, true);
123 134
    }
124 135

  
......
136 147
        DisposableIterator it = null;
137 148
        EditableFeature targetFeature = null;
138 149
        FeatureStore target = null;
139
        
150

  
140 151
        try {
141
            
152

  
142 153
            // ======================================
143 154
            // Reprojection 
144 155
            FeatureAttributeDescriptor geo_att = source.getDefaultFeatureType().getDefaultGeometryAttribute();
......
156 167
            }
157 168
            // ============================================
158 169

  
159
            
160 170
            DataManager dataManager = DALLocator.getDataManager();
161 171

  
162 172
            JDBCServerExplorer explorer = (JDBCServerExplorer) dataManager.openServerExplorer(
......
189 199
                targetFeature = target.createNewFeature(targetFeatureType, feature);
190 200

  
191 201
                Geometry geometry = targetFeature.getDefaultGeometry();
192
                switch (this.geometryChecks) {
193
                    case CHECK_IF_CORRUPT:
194
                        geometryCheck = geometry.getValidationStatus();
195
                        if (geometryCheck.getStatusCode() == Geometry.ValidationStatus.CURRUPTED) {
196
                            switch (this.geometryChecksAction) {
197
                                case ACTION_SET_GEOMETRY_TO_NULL:
198
                                    targetFeature.setDefaultGeometry(null);
199
                                    break;
200
                                case ACTION_SKIP_FEATURE:
201
                                    continue;
202
                                case ACTION_ABORT:
203
                                default:
204
                                    throw new InvalidGeometryException(targetFeature, geometryCheck.getMessage());
202
                if (geometry != null) {
203
                    switch (this.geometryChecks) {
204
                        case CHECK_IF_CORRUPT:
205
                            geometryCheck = geometry.getValidationStatus();
206
                            if (geometryCheck.getStatusCode() == Geometry.ValidationStatus.CURRUPTED) {
207
                                switch (this.geometryChecksAction) {
208
                                    case ACTION_SET_GEOMETRY_TO_NULL:
209
                                        targetFeature.setDefaultGeometry(null);
210
                                        break;
211
                                    case ACTION_SKIP_FEATURE:
212
                                        continue;
213
                                    case ACTION_ABORT:
214
                                    default:
215
                                        throw new InvalidGeometryException(targetFeature, geometryCheck.getMessage());
216
                                }
205 217
                            }
206
                        }
207 218

  
208
                        break;
219
                            break;
209 220

  
210
                    case CHECK_IF_VALID:
211
                        geometryCheck = geometry.getValidationStatus();
212
                        if (!geometryCheck.isValid()) {
213
                            switch (this.geometryChecksAction) {
214
                                case ACTION_SET_GEOMETRY_TO_NULL:
215
                                    targetFeature.setDefaultGeometry(null);
216
                                    break;
217
                                case ACTION_SKIP_FEATURE:
218
                                    continue;
219
                                case ACTION_ABORT:
220
                                default:
221
                                    throw new InvalidGeometryException(targetFeature, geometryCheck.getMessage());
221
                        case CHECK_IF_VALID:
222
                            geometryCheck = geometry.getValidationStatus();
223
                            if (!geometryCheck.isValid()) {
224
                                Geometry g = null;
225
                                if (this.tryToFixGeometries) {
226
                                    g = geometry.makeValid();
227
                                    if (g != null) {
228
                                        targetFeature.setDefaultGeometry(g);
229
                                    }
230
                                }
231
                                if (g == null) {
232
                                    switch (this.geometryChecksAction) {
233
                                        case ACTION_SET_GEOMETRY_TO_NULL:
234
                                            targetFeature.setDefaultGeometry(null);
235
                                            break;
236
                                        case ACTION_SKIP_FEATURE:
237
                                            continue;
238
                                        case ACTION_ABORT:
239
                                        default:
240
                                            throw new InvalidGeometryException(targetFeature, geometryCheck.getMessage());
241
                                    }
242
                                }
222 243
                            }
223
                        }
224 244

  
225
                        break;
226
                    case CHECK_NONE:
227
                    default:
228
                        break;
245
                            break;
246
                        case CHECK_NONE:
247
                        default:
248
                            break;
249
                    }
250
                    // ================================================
251
                    // Reprojection 
252
                    if (geo_att != null && coord_trans != null) {
253
                        reproj_geom = targetFeature.getDefaultGeometry();
254
                        reproj_geom = reproj_geom.cloneGeometry();
255
                        reproj_geom.reProject(coord_trans);
256
                        targetFeature.setDefaultGeometry(reproj_geom);
257
                    }
258
                    // ================================================
229 259
                }
230 260

  
231
                // ================================================
232
                // Reprojection 
233
                if (geo_att != null && coord_trans != null) {
234
                    reproj_geom = targetFeature.getDefaultGeometry();
235
                    reproj_geom = reproj_geom.cloneGeometry();
236
                    reproj_geom.reProject(coord_trans);
237
                    targetFeature.setDefaultGeometry(reproj_geom);
238
                }
239
                // ================================================
240 261
                target.insert(targetFeature);
241 262
                this.taskStatus.setCurValue(featureCount);
242 263

  
......
255 276
            }
256 277

  
257 278
        } catch (Exception e) {
279
            logger.warn("Can't export data.", e);
258 280
            taskStatus.message(e.getMessage());
259 281
            throw new ExporttoServiceException(e, targetFeature);
260 282

  
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/panel/CheckGeometriesPanelLayout.java
29 29
    private void initComponents() {
30 30
        java.awt.GridBagConstraints gridBagConstraints;
31 31

  
32
        buttonGroup1 = new javax.swing.ButtonGroup();
32 33
        lblHeader = new javax.swing.JLabel();
33 34
        lblCheckIsCorrupt = new javax.swing.JLabel();
34 35
        rdbCheckNone = new javax.swing.JRadioButton();
......
37 38
        rdbCheckIsValid = new javax.swing.JRadioButton();
38 39
        lblCheckIsvalid = new javax.swing.JLabel();
39 40
        cboActionIsValid = new javax.swing.JComboBox();
41
        filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767));
42
        filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(16, 0), new java.awt.Dimension(16, 0), new java.awt.Dimension(16, 32767));
43
        chkTryFixGeometry = new javax.swing.JCheckBox();
40 44

  
41 45
        java.awt.GridBagLayout layout = new java.awt.GridBagLayout();
42 46
        layout.columnWidths = new int[] {0, 5, 0, 5, 0, 5, 0};
43
        layout.rowHeights = new int[] {0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0};
47
        layout.rowHeights = new int[] {0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0};
44 48
        setLayout(layout);
45 49

  
46 50
        lblHeader.setText("Validacion de la informacion geometrica");
......
50 54
        gridBagConstraints.gridwidth = 3;
51 55
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
52 56
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
57
        gridBagConstraints.weightx = 0.1;
53 58
        add(lblHeader, gridBagConstraints);
54 59

  
55 60
        lblCheckIsCorrupt.setText("Cuando la geometria este corrupta;");
......
60 65
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
61 66
        add(lblCheckIsCorrupt, gridBagConstraints);
62 67

  
68
        buttonGroup1.add(rdbCheckNone);
63 69
        rdbCheckNone.setText("No realizar ninguna comprobacion sobre las geometrias");
64 70
        gridBagConstraints = new java.awt.GridBagConstraints();
65 71
        gridBagConstraints.gridx = 2;
......
67 73
        gridBagConstraints.gridwidth = 3;
68 74
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
69 75
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
76
        gridBagConstraints.weightx = 0.1;
70 77
        add(rdbCheckNone, gridBagConstraints);
71 78

  
79
        buttonGroup1.add(rdbCheckIsCorrupt);
72 80
        rdbCheckIsCorrupt.setText("Comprobar que la geometria no este corrupta");
73 81
        gridBagConstraints = new java.awt.GridBagConstraints();
74 82
        gridBagConstraints.gridx = 2;
75 83
        gridBagConstraints.gridy = 6;
76 84
        gridBagConstraints.gridwidth = 3;
77 85
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
86
        gridBagConstraints.weightx = 0.1;
78 87
        add(rdbCheckIsCorrupt, gridBagConstraints);
79 88

  
80 89
        gridBagConstraints = new java.awt.GridBagConstraints();
......
84 93
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
85 94
        add(cboActionIsCorrupt, gridBagConstraints);
86 95

  
96
        buttonGroup1.add(rdbCheckIsValid);
87 97
        rdbCheckIsValid.setText("Comprobar la validez de las geometrias antes de insertarlas");
88 98
        gridBagConstraints = new java.awt.GridBagConstraints();
89 99
        gridBagConstraints.gridx = 2;
......
91 101
        gridBagConstraints.gridwidth = 3;
92 102
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
93 103
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
104
        gridBagConstraints.weightx = 0.1;
94 105
        add(rdbCheckIsValid, gridBagConstraints);
95 106

  
96 107
        lblCheckIsvalid.setText("Cuando la geometria no sea valida:");
......
103 114

  
104 115
        gridBagConstraints = new java.awt.GridBagConstraints();
105 116
        gridBagConstraints.gridx = 4;
117
        gridBagConstraints.gridy = 18;
118
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
119
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
120
        add(cboActionIsValid, gridBagConstraints);
121
        gridBagConstraints = new java.awt.GridBagConstraints();
122
        gridBagConstraints.gridx = 2;
123
        gridBagConstraints.gridy = 20;
124
        gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
125
        gridBagConstraints.weighty = 0.1;
126
        add(filler1, gridBagConstraints);
127
        gridBagConstraints = new java.awt.GridBagConstraints();
128
        gridBagConstraints.gridx = 2;
129
        gridBagConstraints.gridy = 0;
130
        add(filler2, gridBagConstraints);
131

  
132
        chkTryFixGeometry.setText("Intentar reparar la geometria");
133
        gridBagConstraints = new java.awt.GridBagConstraints();
134
        gridBagConstraints.gridx = 4;
106 135
        gridBagConstraints.gridy = 16;
107 136
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
108 137
        gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
109
        add(cboActionIsValid, gridBagConstraints);
138
        add(chkTryFixGeometry, gridBagConstraints);
110 139
    }// </editor-fold>//GEN-END:initComponents
111 140

  
112 141

  
113 142
    // Variables declaration - do not modify//GEN-BEGIN:variables
143
    protected javax.swing.ButtonGroup buttonGroup1;
114 144
    protected javax.swing.JComboBox cboActionIsCorrupt;
115 145
    protected javax.swing.JComboBox cboActionIsValid;
146
    protected javax.swing.JCheckBox chkTryFixGeometry;
147
    protected javax.swing.Box.Filler filler1;
148
    protected javax.swing.Box.Filler filler2;
116 149
    protected javax.swing.JLabel lblCheckIsCorrupt;
117 150
    protected javax.swing.JLabel lblCheckIsvalid;
118 151
    protected javax.swing.JLabel lblHeader;
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/panel/CheckGeometriesPanel.java
76 76
    public boolean isValidPanel() throws ExporttoPanelValidationException {
77 77
        return true;
78 78
    }
79

  
79
    
80
    public void enterPanel() {
81
        // Default do nothing
82
    }
83
    
80 84
    public JComponent asJComponent() {
81 85
        return this;
82 86
    }
......
108 112
        }
109 113
    }
110 114

  
115
    public boolean getTryToFixGeometry() {
116
        return this.chkTryFixGeometry.isSelected();
117
    }
118
    
111 119
    private void onChangeRadioButtons() {
112 120
        if( this.rdbCheckNone.isSelected() ) {
113 121
            this.cboActionIsCorrupt.setEnabled(false);
114 122
            this.cboActionIsValid.setEnabled(false);
123
            this.chkTryFixGeometry.setEnabled(false);
115 124
        } else if( this.rdbCheckIsCorrupt.isSelected() ) {
116 125
            this.cboActionIsCorrupt.setEnabled(true);
117 126
            this.cboActionIsValid.setEnabled(false);
127
            this.chkTryFixGeometry.setEnabled(false);
118 128
        } else if( this.rdbCheckIsValid.isSelected()) {
119 129
            this.cboActionIsCorrupt.setEnabled(false);
120 130
            this.cboActionIsValid.setEnabled(true);
131
            this.chkTryFixGeometry.setEnabled(true);
121 132
        }
122 133
    }
123 134
}
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.jdbc/src/main/java/org/gvsig/exportto/swing/prov/jdbc/panel/CheckGeometriesPanelLayout.form
1 1
<?xml version="1.0" encoding="UTF-8" ?>
2 2

  
3 3
<Form version="1.8" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4
  <NonVisualComponents>
5
    <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
6
    </Component>
7
  </NonVisualComponents>
4 8
  <AuxValues>
5 9
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
6 10
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
......
20 24
      </Properties>
21 25
      <Constraints>
22 26
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
23
          <GridBagConstraints gridX="2" gridY="2" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
27
          <GridBagConstraints gridX="2" gridY="2" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.1" weightY="0.0"/>
24 28
        </Constraint>
25 29
      </Constraints>
26 30
    </Component>
......
36 40
    </Component>
37 41
    <Component class="javax.swing.JRadioButton" name="rdbCheckNone">
38 42
      <Properties>
43
        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
44
          <ComponentRef name="buttonGroup1"/>
45
        </Property>
39 46
        <Property name="text" type="java.lang.String" value="No realizar ninguna comprobacion sobre las geometrias"/>
40 47
      </Properties>
41 48
      <Constraints>
42 49
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
43
          <GridBagConstraints gridX="2" gridY="4" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
50
          <GridBagConstraints gridX="2" gridY="4" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.1" weightY="0.0"/>
44 51
        </Constraint>
45 52
      </Constraints>
46 53
    </Component>
47 54
    <Component class="javax.swing.JRadioButton" name="rdbCheckIsCorrupt">
48 55
      <Properties>
56
        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
57
          <ComponentRef name="buttonGroup1"/>
58
        </Property>
49 59
        <Property name="text" type="java.lang.String" value="Comprobar que la geometria no este corrupta"/>
50 60
      </Properties>
51 61
      <Constraints>
52 62
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
53
          <GridBagConstraints gridX="2" gridY="6" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
63
          <GridBagConstraints gridX="2" gridY="6" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.1" weightY="0.0"/>
54 64
        </Constraint>
55 65
      </Constraints>
56 66
    </Component>
......
68 78
    </Component>
69 79
    <Component class="javax.swing.JRadioButton" name="rdbCheckIsValid">
70 80
      <Properties>
81
        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
82
          <ComponentRef name="buttonGroup1"/>
83
        </Property>
71 84
        <Property name="text" type="java.lang.String" value="Comprobar la validez de las geometrias antes de insertarlas"/>
72 85
      </Properties>
73 86
      <Constraints>
74 87
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
75
          <GridBagConstraints gridX="2" gridY="12" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
88
          <GridBagConstraints gridX="2" gridY="12" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.1" weightY="0.0"/>
76 89
        </Constraint>
77 90
      </Constraints>
78 91
    </Component>
......
94 107
      </Properties>
95 108
      <Constraints>
96 109
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
110
          <GridBagConstraints gridX="4" gridY="18" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
111
        </Constraint>
112
      </Constraints>
113
    </Component>
114
    <Component class="javax.swing.Box$Filler" name="filler1">
115
      <Properties>
116
        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
117
          <Dimension value="[0, 32767]"/>
118
        </Property>
119
      </Properties>
120
      <AuxValues>
121
        <AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.VerticalGlue"/>
122
      </AuxValues>
123
      <Constraints>
124
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
125
          <GridBagConstraints gridX="2" gridY="20" gridWidth="1" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.1"/>
126
        </Constraint>
127
      </Constraints>
128
    </Component>
129
    <Component class="javax.swing.Box$Filler" name="filler2">
130
      <Properties>
131
        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
132
          <Dimension value="[16, 32767]"/>
133
        </Property>
134
        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
135
          <Dimension value="[16, 0]"/>
136
        </Property>
137
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
138
          <Dimension value="[16, 0]"/>
139
        </Property>
140
      </Properties>
141
      <AuxValues>
142
        <AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.HorizontalStrut"/>
143
      </AuxValues>
144
      <Constraints>
145
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
146
          <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
147
        </Constraint>
148
      </Constraints>
149
    </Component>
150
    <Component class="javax.swing.JCheckBox" name="chkTryFixGeometry">
151
      <Properties>
152
        <Property name="text" type="java.lang.String" value="Intentar reparar la geometria"/>
153
      </Properties>
154
      <Constraints>
155
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
97 156
          <GridBagConstraints gridX="4" gridY="16" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="21" weightX="0.0" weightY="0.0"/>
98 157
        </Constraint>
99 158
      </Constraints>
......
137 196
        <CodeExpression id="3">
138 197
          <ExpressionOrigin>
139 198
            <Value type="[I" editor="org.netbeans.modules.form.layoutsupport.delegates.GridBagLayoutSupport$IntArrayPropertyEditor">
140
              <PropertyValue value="[0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0]"/>
199
              <PropertyValue value="[0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0, 5, 0]"/>
141 200
            </Value>
142 201
          </ExpressionOrigin>
143 202
        </CodeExpression>
......
237 296
      </Parameters>
238 297
    </CodeStatement>
239 298
    <CodeStatement>
299
      <CodeExpression id="5_gridBagConstraints"/>
300
      <StatementProvider type="CodeField">
301
        <CodeField name="weightx" class="java.awt.GridBagConstraints"/>
302
      </StatementProvider>
303
      <Parameters>
304
        <CodeExpression id="11">
305
          <ExpressionOrigin>
306
            <Value type="double" value="0.1"/>
307
          </ExpressionOrigin>
308
        </CodeExpression>
309
      </Parameters>
310
    </CodeStatement>
311
    <CodeStatement>
240 312
      <CodeExpression id="4"/>
241 313
      <StatementProvider type="CodeMethod">
242 314
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
243 315
      </StatementProvider>
244 316
      <Parameters>
245
        <CodeExpression id="11_lblHeader">
317
        <CodeExpression id="12_lblHeader">
246 318
          <CodeVariable name="lblHeader" type="8196" declaredType="javax.swing.JLabel"/>
247 319
          <ExpressionOrigin>
248 320
            <ExpressionProvider type="ComponentRef">
......
254 326
      </Parameters>
255 327
    </CodeStatement>
256 328
    <CodeStatement>
257
      <CodeExpression id="12_gridBagConstraints">
329
      <CodeExpression id="13_gridBagConstraints">
258 330
        <CodeVariable name="gridBagConstraints"/>
259 331
        <ExpressionOrigin>
260 332
          <ExpressionProvider type="CodeConstructor">
......
263 335
        </ExpressionOrigin>
264 336
      </CodeExpression>
265 337
      <StatementProvider type="CodeExpression">
266
        <CodeExpression id="12_gridBagConstraints"/>
338
        <CodeExpression id="13_gridBagConstraints"/>
267 339
      </StatementProvider>
268 340
    </CodeStatement>
269 341
    <CodeStatement>
270
      <CodeExpression id="12_gridBagConstraints"/>
342
      <CodeExpression id="13_gridBagConstraints"/>
271 343
      <StatementProvider type="CodeField">
272 344
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
273 345
      </StatementProvider>
274 346
      <Parameters>
275
        <CodeExpression id="13">
347
        <CodeExpression id="14">
276 348
          <ExpressionOrigin>
277 349
            <Value type="int" value="4"/>
278 350
          </ExpressionOrigin>
......
280 352
      </Parameters>
281 353
    </CodeStatement>
282 354
    <CodeStatement>
283
      <CodeExpression id="12_gridBagConstraints"/>
355
      <CodeExpression id="13_gridBagConstraints"/>
284 356
      <StatementProvider type="CodeField">
285 357
        <CodeField name="gridy" class="java.awt.GridBagConstraints"/>
286 358
      </StatementProvider>
287 359
      <Parameters>
288
        <CodeExpression id="14">
360
        <CodeExpression id="15">
289 361
          <ExpressionOrigin>
290 362
            <Value type="int" value="8"/>
291 363
          </ExpressionOrigin>
......
293 365
      </Parameters>
294 366
    </CodeStatement>
295 367
    <CodeStatement>
296
      <CodeExpression id="12_gridBagConstraints"/>
368
      <CodeExpression id="13_gridBagConstraints"/>
297 369
      <StatementProvider type="CodeField">
298 370
        <CodeField name="fill" class="java.awt.GridBagConstraints"/>
299 371
      </StatementProvider>
300 372
      <Parameters>
301
        <CodeExpression id="15">
373
        <CodeExpression id="16">
302 374
          <ExpressionOrigin>
303 375
            <Value type="int" value="2"/>
304 376
          </ExpressionOrigin>
......
306 378
      </Parameters>
307 379
    </CodeStatement>
308 380
    <CodeStatement>
309
      <CodeExpression id="12_gridBagConstraints"/>
381
      <CodeExpression id="13_gridBagConstraints"/>
310 382
      <StatementProvider type="CodeField">
311 383
        <CodeField name="anchor" class="java.awt.GridBagConstraints"/>
312 384
      </StatementProvider>
313 385
      <Parameters>
314
        <CodeExpression id="16">
386
        <CodeExpression id="17">
315 387
          <ExpressionOrigin>
316 388
            <Value type="int" value="21"/>
317 389
          </ExpressionOrigin>
......
324 396
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
325 397
      </StatementProvider>
326 398
      <Parameters>
327
        <CodeExpression id="17_lblCheckIsCorrupt">
399
        <CodeExpression id="18_lblCheckIsCorrupt">
328 400
          <CodeVariable name="lblCheckIsCorrupt" type="8196" declaredType="javax.swing.JLabel"/>
329 401
          <ExpressionOrigin>
330 402
            <ExpressionProvider type="ComponentRef">
......
332 404
            </ExpressionProvider>
333 405
          </ExpressionOrigin>
334 406
        </CodeExpression>
335
        <CodeExpression id="12_gridBagConstraints"/>
407
        <CodeExpression id="13_gridBagConstraints"/>
336 408
      </Parameters>
337 409
    </CodeStatement>
338 410
    <CodeStatement>
339
      <CodeExpression id="18_gridBagConstraints">
411
      <CodeExpression id="19_gridBagConstraints">
340 412
        <CodeVariable name="gridBagConstraints"/>
341 413
        <ExpressionOrigin>
342 414
          <ExpressionProvider type="CodeConstructor">
......
345 417
        </ExpressionOrigin>
346 418
      </CodeExpression>
347 419
      <StatementProvider type="CodeExpression">
348
        <CodeExpression id="18_gridBagConstraints"/>
420
        <CodeExpression id="19_gridBagConstraints"/>
349 421
      </StatementProvider>
350 422
    </CodeStatement>
351 423
    <CodeStatement>
352
      <CodeExpression id="18_gridBagConstraints"/>
424
      <CodeExpression id="19_gridBagConstraints"/>
353 425
      <StatementProvider type="CodeField">
354 426
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
355 427
      </StatementProvider>
356 428
      <Parameters>
357
        <CodeExpression id="19">
429
        <CodeExpression id="20">
358 430
          <ExpressionOrigin>
359 431
            <Value type="int" value="2"/>
360 432
          </ExpressionOrigin>
......
362 434
      </Parameters>
363 435
    </CodeStatement>
364 436
    <CodeStatement>
365
      <CodeExpression id="18_gridBagConstraints"/>
437
      <CodeExpression id="19_gridBagConstraints"/>
366 438
      <StatementProvider type="CodeField">
367 439
        <CodeField name="gridy" class="java.awt.GridBagConstraints"/>
368 440
      </StatementProvider>
369 441
      <Parameters>
370
        <CodeExpression id="20">
442
        <CodeExpression id="21">
371 443
          <ExpressionOrigin>
372 444
            <Value type="int" value="4"/>
373 445
          </ExpressionOrigin>
......
375 447
      </Parameters>
376 448
    </CodeStatement>
377 449
    <CodeStatement>
378
      <CodeExpression id="18_gridBagConstraints"/>
450
      <CodeExpression id="19_gridBagConstraints"/>
379 451
      <StatementProvider type="CodeField">
380 452
        <CodeField name="gridwidth" class="java.awt.GridBagConstraints"/>
381 453
      </StatementProvider>
382 454
      <Parameters>
383
        <CodeExpression id="21">
455
        <CodeExpression id="22">
384 456
          <ExpressionOrigin>
385 457
            <Value type="int" value="3"/>
386 458
          </ExpressionOrigin>
......
388 460
      </Parameters>
389 461
    </CodeStatement>
390 462
    <CodeStatement>
391
      <CodeExpression id="18_gridBagConstraints"/>
463
      <CodeExpression id="19_gridBagConstraints"/>
392 464
      <StatementProvider type="CodeField">
393 465
        <CodeField name="fill" class="java.awt.GridBagConstraints"/>
394 466
      </StatementProvider>
395 467
      <Parameters>
396
        <CodeExpression id="22">
468
        <CodeExpression id="23">
397 469
          <ExpressionOrigin>
398 470
            <Value type="int" value="2"/>
399 471
          </ExpressionOrigin>
......
401 473
      </Parameters>
402 474
    </CodeStatement>
403 475
    <CodeStatement>
404
      <CodeExpression id="18_gridBagConstraints"/>
476
      <CodeExpression id="19_gridBagConstraints"/>
405 477
      <StatementProvider type="CodeField">
406 478
        <CodeField name="anchor" class="java.awt.GridBagConstraints"/>
407 479
      </StatementProvider>
408 480
      <Parameters>
409
        <CodeExpression id="23">
481
        <CodeExpression id="24">
410 482
          <ExpressionOrigin>
411 483
            <Value type="int" value="21"/>
412 484
          </ExpressionOrigin>
......
414 486
      </Parameters>
415 487
    </CodeStatement>
416 488
    <CodeStatement>
489
      <CodeExpression id="19_gridBagConstraints"/>
490
      <StatementProvider type="CodeField">
491
        <CodeField name="weightx" class="java.awt.GridBagConstraints"/>
492
      </StatementProvider>
493
      <Parameters>
494
        <CodeExpression id="25">
495
          <ExpressionOrigin>
496
            <Value type="double" value="0.1"/>
497
          </ExpressionOrigin>
498
        </CodeExpression>
499
      </Parameters>
500
    </CodeStatement>
501
    <CodeStatement>
417 502
      <CodeExpression id="4"/>
418 503
      <StatementProvider type="CodeMethod">
419 504
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
420 505
      </StatementProvider>
421 506
      <Parameters>
422
        <CodeExpression id="24_rdbCheckNone">
507
        <CodeExpression id="26_rdbCheckNone">
423 508
          <CodeVariable name="rdbCheckNone" type="8196" declaredType="javax.swing.JRadioButton"/>
424 509
          <ExpressionOrigin>
425 510
            <ExpressionProvider type="ComponentRef">
......
427 512
            </ExpressionProvider>
428 513
          </ExpressionOrigin>
429 514
        </CodeExpression>
430
        <CodeExpression id="18_gridBagConstraints"/>
515
        <CodeExpression id="19_gridBagConstraints"/>
431 516
      </Parameters>
432 517
    </CodeStatement>
433 518
    <CodeStatement>
434
      <CodeExpression id="25_gridBagConstraints">
519
      <CodeExpression id="27_gridBagConstraints">
435 520
        <CodeVariable name="gridBagConstraints"/>
436 521
        <ExpressionOrigin>
437 522
          <ExpressionProvider type="CodeConstructor">
......
440 525
        </ExpressionOrigin>
441 526
      </CodeExpression>
442 527
      <StatementProvider type="CodeExpression">
443
        <CodeExpression id="25_gridBagConstraints"/>
528
        <CodeExpression id="27_gridBagConstraints"/>
444 529
      </StatementProvider>
445 530
    </CodeStatement>
446 531
    <CodeStatement>
447
      <CodeExpression id="25_gridBagConstraints"/>
532
      <CodeExpression id="27_gridBagConstraints"/>
448 533
      <StatementProvider type="CodeField">
449 534
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
450 535
      </StatementProvider>
451 536
      <Parameters>
452
        <CodeExpression id="26">
537
        <CodeExpression id="28">
453 538
          <ExpressionOrigin>
454 539
            <Value type="int" value="2"/>
455 540
          </ExpressionOrigin>
......
457 542
      </Parameters>
458 543
    </CodeStatement>
459 544
    <CodeStatement>
460
      <CodeExpression id="25_gridBagConstraints"/>
545
      <CodeExpression id="27_gridBagConstraints"/>
461 546
      <StatementProvider type="CodeField">
462 547
        <CodeField name="gridy" class="java.awt.GridBagConstraints"/>
463 548
      </StatementProvider>
464 549
      <Parameters>
465
        <CodeExpression id="27">
550
        <CodeExpression id="29">
466 551
          <ExpressionOrigin>
467 552
            <Value type="int" value="6"/>
468 553
          </ExpressionOrigin>
......
470 555
      </Parameters>
471 556
    </CodeStatement>
472 557
    <CodeStatement>
473
      <CodeExpression id="25_gridBagConstraints"/>
558
      <CodeExpression id="27_gridBagConstraints"/>
474 559
      <StatementProvider type="CodeField">
475 560
        <CodeField name="gridwidth" class="java.awt.GridBagConstraints"/>
476 561
      </StatementProvider>
477 562
      <Parameters>
478
        <CodeExpression id="28">
563
        <CodeExpression id="30">
479 564
          <ExpressionOrigin>
480 565
            <Value type="int" value="3"/>
481 566
          </ExpressionOrigin>
......
483 568
      </Parameters>
484 569
    </CodeStatement>
485 570
    <CodeStatement>
486
      <CodeExpression id="25_gridBagConstraints"/>
571
      <CodeExpression id="27_gridBagConstraints"/>
487 572
      <StatementProvider type="CodeField">
488 573
        <CodeField name="anchor" class="java.awt.GridBagConstraints"/>
489 574
      </StatementProvider>
490 575
      <Parameters>
491
        <CodeExpression id="29">
576
        <CodeExpression id="31">
492 577
          <ExpressionOrigin>
493 578
            <Value type="int" value="21"/>
494 579
          </ExpressionOrigin>
......
496 581
      </Parameters>
497 582
    </CodeStatement>
498 583
    <CodeStatement>
584
      <CodeExpression id="27_gridBagConstraints"/>
585
      <StatementProvider type="CodeField">
586
        <CodeField name="weightx" class="java.awt.GridBagConstraints"/>
587
      </StatementProvider>
588
      <Parameters>
589
        <CodeExpression id="32">
590
          <ExpressionOrigin>
591
            <Value type="double" value="0.1"/>
592
          </ExpressionOrigin>
593
        </CodeExpression>
594
      </Parameters>
595
    </CodeStatement>
596
    <CodeStatement>
499 597
      <CodeExpression id="4"/>
500 598
      <StatementProvider type="CodeMethod">
501 599
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
502 600
      </StatementProvider>
503 601
      <Parameters>
504
        <CodeExpression id="30_rdbCheckIsCorrupt">
602
        <CodeExpression id="33_rdbCheckIsCorrupt">
505 603
          <CodeVariable name="rdbCheckIsCorrupt" type="8196" declaredType="javax.swing.JRadioButton"/>
506 604
          <ExpressionOrigin>
507 605
            <ExpressionProvider type="ComponentRef">
......
509 607
            </ExpressionProvider>
510 608
          </ExpressionOrigin>
511 609
        </CodeExpression>
512
        <CodeExpression id="25_gridBagConstraints"/>
610
        <CodeExpression id="27_gridBagConstraints"/>
513 611
      </Parameters>
514 612
    </CodeStatement>
515 613
    <CodeStatement>
516
      <CodeExpression id="31_gridBagConstraints">
614
      <CodeExpression id="34_gridBagConstraints">
517 615
        <CodeVariable name="gridBagConstraints"/>
518 616
        <ExpressionOrigin>
519 617
          <ExpressionProvider type="CodeConstructor">
......
522 620
        </ExpressionOrigin>
523 621
      </CodeExpression>
524 622
      <StatementProvider type="CodeExpression">
525
        <CodeExpression id="31_gridBagConstraints"/>
623
        <CodeExpression id="34_gridBagConstraints"/>
526 624
      </StatementProvider>
527 625
    </CodeStatement>
528 626
    <CodeStatement>
529
      <CodeExpression id="31_gridBagConstraints"/>
627
      <CodeExpression id="34_gridBagConstraints"/>
530 628
      <StatementProvider type="CodeField">
531 629
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
532 630
      </StatementProvider>
533 631
      <Parameters>
534
        <CodeExpression id="32">
632
        <CodeExpression id="35">
535 633
          <ExpressionOrigin>
536 634
            <Value type="int" value="4"/>
537 635
          </ExpressionOrigin>
......
539 637
      </Parameters>
540 638
    </CodeStatement>
541 639
    <CodeStatement>
542
      <CodeExpression id="31_gridBagConstraints"/>
640
      <CodeExpression id="34_gridBagConstraints"/>
543 641
      <StatementProvider type="CodeField">
544 642
        <CodeField name="gridy" class="java.awt.GridBagConstraints"/>
545 643
      </StatementProvider>
546 644
      <Parameters>
547
        <CodeExpression id="33">
645
        <CodeExpression id="36">
548 646
          <ExpressionOrigin>
549 647
            <Value type="int" value="10"/>
550 648
          </ExpressionOrigin>
......
552 650
      </Parameters>
553 651
    </CodeStatement>
554 652
    <CodeStatement>
555
      <CodeExpression id="31_gridBagConstraints"/>
653
      <CodeExpression id="34_gridBagConstraints"/>
556 654
      <StatementProvider type="CodeField">
557 655
        <CodeField name="fill" class="java.awt.GridBagConstraints"/>
558 656
      </StatementProvider>
559 657
      <Parameters>
560
        <CodeExpression id="34">
658
        <CodeExpression id="37">
561 659
          <ExpressionOrigin>
562 660
            <Value type="int" value="2"/>
563 661
          </ExpressionOrigin>
......
565 663
      </Parameters>
566 664
    </CodeStatement>
567 665
    <CodeStatement>
568
      <CodeExpression id="31_gridBagConstraints"/>
666
      <CodeExpression id="34_gridBagConstraints"/>
569 667
      <StatementProvider type="CodeField">
570 668
        <CodeField name="anchor" class="java.awt.GridBagConstraints"/>
571 669
      </StatementProvider>
572 670
      <Parameters>
573
        <CodeExpression id="35">
671
        <CodeExpression id="38">
574 672
          <ExpressionOrigin>
575 673
            <Value type="int" value="21"/>
576 674
          </ExpressionOrigin>
......
583 681
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
584 682
      </StatementProvider>
585 683
      <Parameters>
586
        <CodeExpression id="36_cboActionIsCorrupt">
684
        <CodeExpression id="39_cboActionIsCorrupt">
587 685
          <CodeVariable name="cboActionIsCorrupt" type="8196" declaredType="javax.swing.JComboBox"/>
588 686
          <ExpressionOrigin>
589 687
            <ExpressionProvider type="ComponentRef">
......
591 689
            </ExpressionProvider>
592 690
          </ExpressionOrigin>
593 691
        </CodeExpression>
594
        <CodeExpression id="31_gridBagConstraints"/>
692
        <CodeExpression id="34_gridBagConstraints"/>
595 693
      </Parameters>
596 694
    </CodeStatement>
597 695
    <CodeStatement>
598
      <CodeExpression id="37_gridBagConstraints">
696
      <CodeExpression id="40_gridBagConstraints">
599 697
        <CodeVariable name="gridBagConstraints"/>
600 698
        <ExpressionOrigin>
601 699
          <ExpressionProvider type="CodeConstructor">
......
604 702
        </ExpressionOrigin>
605 703
      </CodeExpression>
606 704
      <StatementProvider type="CodeExpression">
607
        <CodeExpression id="37_gridBagConstraints"/>
705
        <CodeExpression id="40_gridBagConstraints"/>
608 706
      </StatementProvider>
609 707
    </CodeStatement>
610 708
    <CodeStatement>
611
      <CodeExpression id="37_gridBagConstraints"/>
709
      <CodeExpression id="40_gridBagConstraints"/>
612 710
      <StatementProvider type="CodeField">
613 711
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
614 712
      </StatementProvider>
615 713
      <Parameters>
616
        <CodeExpression id="38">
714
        <CodeExpression id="41">
617 715
          <ExpressionOrigin>
618 716
            <Value type="int" value="2"/>
619 717
          </ExpressionOrigin>
......
621 719
      </Parameters>
622 720
    </CodeStatement>
623 721
    <CodeStatement>
624
      <CodeExpression id="37_gridBagConstraints"/>
722
      <CodeExpression id="40_gridBagConstraints"/>
625 723
      <StatementProvider type="CodeField">
626 724
        <CodeField name="gridy" class="java.awt.GridBagConstraints"/>
627 725
      </StatementProvider>
628 726
      <Parameters>
629
        <CodeExpression id="39">
727
        <CodeExpression id="42">
630 728
          <ExpressionOrigin>
631 729
            <Value type="int" value="12"/>
632 730
          </ExpressionOrigin>
......
634 732
      </Parameters>
635 733
    </CodeStatement>
636 734
    <CodeStatement>
637
      <CodeExpression id="37_gridBagConstraints"/>
735
      <CodeExpression id="40_gridBagConstraints"/>
638 736
      <StatementProvider type="CodeField">
639 737
        <CodeField name="gridwidth" class="java.awt.GridBagConstraints"/>
640 738
      </StatementProvider>
641 739
      <Parameters>
642
        <CodeExpression id="40">
740
        <CodeExpression id="43">
643 741
          <ExpressionOrigin>
644 742
            <Value type="int" value="3"/>
645 743
          </ExpressionOrigin>
......
647 745
      </Parameters>
648 746
    </CodeStatement>
649 747
    <CodeStatement>
650
      <CodeExpression id="37_gridBagConstraints"/>
748
      <CodeExpression id="40_gridBagConstraints"/>
651 749
      <StatementProvider type="CodeField">
652 750
        <CodeField name="fill" class="java.awt.GridBagConstraints"/>
653 751
      </StatementProvider>
654 752
      <Parameters>
655
        <CodeExpression id="41">
753
        <CodeExpression id="44">
656 754
          <ExpressionOrigin>
657 755
            <Value type="int" value="2"/>
658 756
          </ExpressionOrigin>
......
660 758
      </Parameters>
661 759
    </CodeStatement>
662 760
    <CodeStatement>
663
      <CodeExpression id="37_gridBagConstraints"/>
761
      <CodeExpression id="40_gridBagConstraints"/>
664 762
      <StatementProvider type="CodeField">
665 763
        <CodeField name="anchor" class="java.awt.GridBagConstraints"/>
666 764
      </StatementProvider>
667 765
      <Parameters>
668
        <CodeExpression id="42">
766
        <CodeExpression id="45">
669 767
          <ExpressionOrigin>
670 768
            <Value type="int" value="21"/>
671 769
          </ExpressionOrigin>
......
673 771
      </Parameters>
674 772
    </CodeStatement>
675 773
    <CodeStatement>
774
      <CodeExpression id="40_gridBagConstraints"/>
775
      <StatementProvider type="CodeField">
776
        <CodeField name="weightx" class="java.awt.GridBagConstraints"/>
777
      </StatementProvider>
778
      <Parameters>
779
        <CodeExpression id="46">
780
          <ExpressionOrigin>
781
            <Value type="double" value="0.1"/>
782
          </ExpressionOrigin>
783
        </CodeExpression>
784
      </Parameters>
785
    </CodeStatement>
786
    <CodeStatement>
676 787
      <CodeExpression id="4"/>
677 788
      <StatementProvider type="CodeMethod">
678 789
        <CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
679 790
      </StatementProvider>
680 791
      <Parameters>
681
        <CodeExpression id="43_rdbCheckIsValid">
792
        <CodeExpression id="47_rdbCheckIsValid">
682 793
          <CodeVariable name="rdbCheckIsValid" type="8196" declaredType="javax.swing.JRadioButton"/>
683 794
          <ExpressionOrigin>
684 795
            <ExpressionProvider type="ComponentRef">
......
686 797
            </ExpressionProvider>
687 798
          </ExpressionOrigin>
688 799
        </CodeExpression>
689
        <CodeExpression id="37_gridBagConstraints"/>
800
        <CodeExpression id="40_gridBagConstraints"/>
690 801
      </Parameters>
691 802
    </CodeStatement>
692 803
    <CodeStatement>
693
      <CodeExpression id="44_gridBagConstraints">
804
      <CodeExpression id="48_gridBagConstraints">
694 805
        <CodeVariable name="gridBagConstraints"/>
695 806
        <ExpressionOrigin>
696 807
          <ExpressionProvider type="CodeConstructor">
......
699 810
        </ExpressionOrigin>
700 811
      </CodeExpression>
701 812
      <StatementProvider type="CodeExpression">
702
        <CodeExpression id="44_gridBagConstraints"/>
813
        <CodeExpression id="48_gridBagConstraints"/>
703 814
      </StatementProvider>
704 815
    </CodeStatement>
705 816
    <CodeStatement>
706
      <CodeExpression id="44_gridBagConstraints"/>
817
      <CodeExpression id="48_gridBagConstraints"/>
707 818
      <StatementProvider type="CodeField">
708 819
        <CodeField name="gridx" class="java.awt.GridBagConstraints"/>
709 820
      </StatementProvider>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff