Revision 43891 branches/org.gvsig.desktop-2018a/org.gvsig.desktop.plugin/org.gvsig.geodb.app/org.gvsig.geodb.app.mainplugin/src/main/java/org/gvsig/geodb/vectorialdb/wizard/WizardVectorialDB.java

View differences:

WizardVectorialDB.java
27 27
import java.util.ArrayList;
28 28
import java.util.List;
29 29
import org.apache.commons.lang3.StringUtils;
30
import org.cresques.cts.ICoordTrans;
30 31

  
31 32
import org.cresques.cts.IProjection;
32 33
import org.slf4j.Logger;
......
36 37
import org.gvsig.andami.ui.mdiManager.IWindow;
37 38
import org.gvsig.app.prepareAction.PrepareContext;
38 39
import org.gvsig.app.prepareAction.PrepareContextView;
39
import org.gvsig.app.project.documents.view.gui.DefaultViewPanel;
40
import org.gvsig.app.project.documents.view.gui.IView;
40 41
import org.gvsig.fmap.dal.DALLocator;
41 42
import org.gvsig.fmap.dal.DataManager;
42 43
import org.gvsig.fmap.dal.DataStoreParameters;
......
45 46
import org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorer;
46 47
import org.gvsig.fmap.dal.store.db.DBStoreParameters;
47 48
import org.gvsig.fmap.geom.primitive.Envelope;
49
import org.gvsig.fmap.mapcontext.BaseCreateLayerParameters;
48 50
import org.gvsig.fmap.mapcontext.MapContext;
49 51
import org.gvsig.fmap.mapcontext.MapContextLocator;
50 52
import org.gvsig.fmap.mapcontext.MapContextManager;
......
67 69
    private static final Logger logger = LoggerFactory.getLogger(WizardVectorialDB.class);
68 70

  
69 71
    private static final String GEODB_WIZARD_TAB_NAME = "GeoDB";
70
    private DefaultViewPanel view = null;
72
    private IView view = null;
71 73

  
72 74
    private PrepareContextView prepareContext;
73 75

  
......
88 90
            return;
89 91
        }
90 92

  
91
        if ((iw instanceof DefaultViewPanel)) {
92
            view = (DefaultViewPanel) iw;
93
        if ((iw instanceof IView)) {
94
            view = (IView) iw;
93 95
            setMapCtrl(view.getMapControl());
94 96
        }
95 97
    }
......
139 141
            for (int i = 0; i < count; i++) {
140 142
                TablesListItemVectorial item = (TablesListItemVectorial) selected[i];
141 143

  
142
                dbParameters[i] = getParameterForTable(item);
144
                dbParameters[i] = (DBStoreParameters) getParameterForTable(item).getDataParameters();
143 145
            }
144 146

  
145 147
            return dbParameters;
......
177 179
            for (int i = 0; i < tables.length; i++) {
178 180
                table = tables[i];
179 181
                UserTableSettingsPanel userTableSettingsPanel = table.getUserTableSettingsPanel();
180
                parameter = getParameterForTable(table);
182
                BaseCreateLayerParameters layerParameter = getParameterForTable(table);
183
                parameter = (DBStoreParameters) layerParameter.getDataParameters();
181 184
                if (i == 0) {
182 185
                    String dbname = parameter.getDBName();
183 186
                    if (StringUtils.isEmpty(dbname)) {
......
202 205

  
203 206
                    layer = mapContextManager.createLayer(
204 207
                            userTableSettingsPanel.getUserLayerName(),
205
                            store
208
                            store,
209
                            layerParameter
206 210
                    );
207 211
                    all_layers.add(layer);
208 212
                } catch (Exception e) {
......
259 263
                return null;
260 264

  
261 265
            }
262
//            if ( needCalculateEnvelope ) {
263
//        		Envelope env = null;
264
//                for( FLayer theLayer : all_layers) {
265
//                    try {
266
//                        if (env == null) {
267
//                            env = theLayer.getFullEnvelope();
268
//                        } else {
269
//                            env.add(theLayer.getFullEnvelope());
270
//                        }
271
//                    } catch(Exception ex) {
272
//                        // Ignore
273
//                    }
274
//                    
275
//                }                
276
//                mapControl.getViewPort().setEnvelope(env);
277
//            }            
278 266

  
279 267
        } finally {
280 268
            // Dispose all created layers. If they have been included into
......
317 305
    }
318 306

  
319 307
    @Override
320
    protected DBStoreParameters getParameterForTable(TablesListItem table) {
308
    protected BaseCreateLayerParameters getParameterForTable(TablesListItem table) {
321 309
        DBStoreParameters parameters = table.getParameters();
322 310

  
323 311
        UserTableSettingsVectorialPanel userTableSettingsPanel = (UserTableSettingsVectorialPanel) table
......
356 344
        // =========================
357 345

  
358 346
        IProjection proj_selected_by_user = userTableSettingsPanel.getProjection();
347
        ICoordTrans coordTrans = userTableSettingsPanel.getCoordTrans();
359 348
        parameters.setCRS(proj_selected_by_user);
360 349

  
361
        return parameters;
350
        // TODO: Ver que pasa con la trasformacion
351
        BaseCreateLayerParameters layerParameters = new BaseCreateLayerParameters(
352
                parameters,
353
                false,
354
                coordTrans
355
        );
362 356

  
357
        return layerParameters;
363 358
    }
364 359

  
365 360
}

Also available in: Unified diff