Revision 3306 org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/workspace/tables/WorkspaceChangesTable.java

View differences:

WorkspaceChangesTable.java
317 317
    }
318 318

  
319 319
    public DisposableFeatureSetIterable getSelectedsWithoutAddEntity(VCSGisWorkspace workspace) {
320
        return getSelectedsWithoutAddEntity(workspace, null);
321
//        FeatureStore store = null;
322
//        try {
323
//            store = workspace.getFeatureStore(TABLE_NAME);
324
//            FeatureQuery query = store.createFeatureQuery();
325
//
326
//            //FIXME: No enviar al servidor cambios repetidos sobre la misma feature
327
//            query.setFilter("\""+SELECTED+"\" AND \""+OPERATION+"\" <> "+OP_ADD_ENTITY);
328
//            query.retrievesAllAttributes();
329
//            DisposableFeatureSetIterable changes = store.getFeatureSet(query).iterable();
330
//            if( changes.isEmpty() ) {
331
//                DisposeUtils.disposeQuietly(changes);
332
//                return null;
333
//            }
334
//            return changes;
335
//        } catch (Exception ex) {
336
//            throw new RuntimeException("Can't retrieve all changes.", ex);
337
//        } finally {
338
//            if( store!=null ) {
339
//                DisposeUtils.dispose(store);
340
//            }
341
//        }
342
    }
343
    
344
    public DisposableFeatureSetIterable getSelectedsWithoutAddEntity(VCSGisWorkspace workspace, String entityCode) {
320 345
        FeatureStore store = null;
321 346
        try {
322 347
            store = workspace.getFeatureStore(TABLE_NAME);
323 348
            FeatureQuery query = store.createFeatureQuery();
324 349

  
325
            //FIXME: No enviar al servidor cambios repetidos sobre la misma feature
326
            query.setFilter("\""+SELECTED+"\" AND \""+OPERATION+"\" <> "+OP_ADD_ENTITY);
350
            if( !StringUtils.isBlank(entityCode) ) {
351
                query.setFilter("\""+COD_ENTITY+"\" ='"+entityCode+"' AND \""+SELECTED+"\" AND \""+OPERATION+"\" <> "+OP_ADD_ENTITY);
352
            } else {
353
                query.setFilter("\""+SELECTED+"\" AND \""+OPERATION+"\" <> "+OP_ADD_ENTITY);
354
            }
327 355
            query.retrievesAllAttributes();
328 356
            DisposableFeatureSetIterable changes = store.getFeatureSet(query).iterable();
329 357
            if( changes.isEmpty() ) {

Also available in: Unified diff