Revision 44058 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCStoreProviderBase.java

View differences:

JDBCStoreProviderBase.java
6 6
import java.util.Collections;
7 7
import java.util.Iterator;
8 8
import java.util.List;
9
import java.util.logging.Level;
10 9
import org.apache.commons.lang3.BooleanUtils;
11 10
import org.apache.commons.lang3.StringUtils;
12 11
import org.cresques.cts.IProjection;
......
23 22
import org.gvsig.fmap.dal.exception.ReadException;
24 23
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
25 24
import org.gvsig.fmap.dal.feature.EditableFeatureType;
26
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
27 25
import org.gvsig.fmap.dal.feature.FeatureQuery;
28 26
import org.gvsig.fmap.dal.feature.FeatureRule;
29 27
import org.gvsig.fmap.dal.feature.FeatureRules;
......
39 37
import org.gvsig.fmap.dal.resource.spi.ResourceConsumer;
40 38
import org.gvsig.fmap.dal.resource.spi.ResourceProvider;
41 39
import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
42
//import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorerBase;
43 40
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
44 41
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
45 42
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
......
62 59
import org.slf4j.Logger;
63 60
import org.slf4j.LoggerFactory;
64 61

  
62
@SuppressWarnings("UseSpecificCatch")
65 63
public class JDBCStoreProviderBase
66 64
        extends AbstractFeatureStoreProvider
67 65
        implements ResourceConsumer, JDBCStoreProvider {
68 66

  
69
    final static private Logger logger = LoggerFactory.getLogger(JDBCStoreProviderBase.class);
67
    final static private Logger LOGGER = LoggerFactory.getLogger(JDBCStoreProviderBase.class);
70 68

  
71 69
    public class CountValue implements CalculatedValue<Long> {
72 70
        
......
76 74
        public void calculate() {
77 75
            JDBCStoreParameters params = getParameters();
78 76
            CountOperation count = getOperations().createCount(
79
                    params.getDBName(),
80
                    params.getSchema(),
81
                    params.getTable(),
82
                    params.getSQL(),
77
                    getOperations().createTableReference(params),
83 78
                    params.getBaseFilter(), 
84 79
                    null
85 80
            );
......
121 116
                JDBCStoreParameters params = getParameters();
122 117
                CalculateEnvelopeOfColumnOperation calculateEnvelopeOfColumn = 
123 118
                    getOperations().createCalculateEnvelopeOfColumn(
124
                        params.getSQL(), 
125
                        params.getDBName(),
126
                        params.getSchema(), 
127
                        params.getTable(), 
119
                        getOperations().createTableReference(params),
128 120
                        columnName, 
129 121
                        params.getBaseFilter(), 
130 122
                        params.getWorkingArea(), 
......
164 156
                JDBCStoreParameters params = getParameters();
165 157
                CanModifyTableOperation canModifyTable = 
166 158
                    getOperations().createCanModifyTableOperation(
167
                        params.getDBName(),
168
                        params.getSchema(), 
169
                        params.getTable()
159
                        getOperations().createTableReference(params)
170 160
                    );
171 161
                this.value = (boolean) canModifyTable.perform();
172 162
            } catch(Exception ex) {
......
198 188

  
199 189
    protected AppendOperation appendOperation = null;
200 190
    
191
    @SuppressWarnings({"OverridableMethodCallInConstructor", "CallToThreadStartDuringObjectConstruction"})
201 192
    protected JDBCStoreProviderBase(
202 193
            JDBCStoreParameters params,
203 194
            DataStoreProviderServices storeServices,
......
214 205
                    Thread thread = new Thread(new Runnable() {
215 206
                        @Override
216 207
                        public void run() {
217
                            logger.debug("Precalculating envelope of '"+getSourceId()+"'.");
208
                            LOGGER.debug("Precalculating envelope of '"+getSourceId()+"'.");
218 209
                            getEnvelopeValue().get();
219 210
                        }
220 211
                    }, "PrecalculateEnvelopeOfDBTable");
......
223 214
                }
224 215
           }
225 216
        } catch(Exception ex) {
226
            logger.warn("Probems precalculating the envelope of table '"+this.getSourceId()+"'.", ex);
217
            LOGGER.warn("Probems precalculating the envelope of table '"+this.getSourceId()+"'.", ex);
227 218
        }
228 219
    }
229 220

  
......
425 416
            try {
426 417
                r = new DummyResource(this.getName());
427 418
            } catch (InitializeException ex) {
428
                logger.warn("Can't create DummyResource",ex);
419
                LOGGER.warn("Can't create DummyResource",ex);
429 420
                // Do nothing
430 421
            }
431 422
        }
......
463 454
        FetchFeatureTypeOperation fetchFeatureType = 
464 455
             this.getOperations().createFetchFeatureType(
465 456
                type,
466
                params.getDBName(),
467
                params.getSchema(),
468
                params.getTable(),
457
                this.getOperations().createTableReference(params),
469 458
                primaryKeys,
470 459
                params.getDefaultGeometryField(),
471 460
                params.getCRS()
......
494 483
            this.getOperations().createFetchFeatureProviderByReference(
495 484
                reference, 
496 485
                featureType, 
497
                params.getDBName(),
498
                params.getSchema(), 
499
                params.getTable()
486
                this.getOperations().createTableReference(params)
500 487
            );
501 488
        FeatureProvider feature = (FeatureProvider) fetchFeatureProviderByReference.perform();
502 489
        return feature;
......
515 502
        FeatureType type = this.getFeatureStore().getDefaultFeatureType();
516 503
        JDBCStoreParameters params = this.getParameters();
517 504
        PerformChangesOperation performChanges = this.getOperations().createPerformChanges(
518
                params.getDBName(),
519
                params.getSchema(), 
520
                params.getTable(), 
505
                this.getOperations().createTableReference(params),
521 506
                type, 
522 507
                deleteds, 
523 508
                inserteds, 
......
554 539
            FeatureType type = this.getFeatureStore().getDefaultFeatureType();
555 540
            JDBCStoreParameters params = this.getParameters();
556 541
            this.appendOperation = this.getOperations().createAppend(
557
                params.getDBName(),
558
                params.getSchema(), 
559
                params.getTable(), 
542
                this.getOperations().createTableReference(params),
560 543
                type 
561 544
            );
562 545
        }

Also available in: Unified diff