Revision 47037 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/java/org/gvsig/app/project/documents/table/TableOperations.java

View differences:

TableOperations.java
56 56
import org.gvsig.fmap.dal.feature.EditableFeatureType;
57 57
import org.gvsig.fmap.dal.feature.Feature;
58 58
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
59
import org.gvsig.fmap.dal.feature.FeatureQuery;
60
import org.gvsig.fmap.dal.feature.FeatureQueryOrder;
59 61
import org.gvsig.fmap.dal.feature.FeatureSelection;
60 62
import org.gvsig.fmap.dal.feature.FeatureSet;
61 63
import org.gvsig.fmap.dal.feature.FeatureStore;
......
275 277
    }
276 278

  
277 279
    public void deleteAttributes(FeatureTable table) throws DataException {
278
        EditableFeatureType eft
279
                = featureStore.getDefaultFeatureType().getEditable();
280
        FeatureAttributeDescriptor[] selecteds
281
                = table.getSelectedColumnsAttributeDescriptor();
280
        FeatureAttributeDescriptor[] selecteds = table.getSelectedColumnsAttributeDescriptor();
281
        FeatureQuery query = this.tablePanel.getTablePanel().getFeatureQuery();
282
        if(query != null){
283
            FeatureQueryOrder order = query.getOrder();
284
            if(order != null) {
285
                I18nManager i18n = ToolsLocator.getI18nManager();
286
                for (FeatureAttributeDescriptor selected : selecteds) {
287
                    if(order.contains(selected.getName())){
288
                        int n = ToolsSwingLocator.getThreadSafeDialogsManager().confirmDialog(
289
                                i18n.getTranslation(
290
                                        "_You_are_trying_to_remove_the_column_XcolumnNameX_that_is_being_sorted_by_Do_you_wish_to_continue",
291
                                        new String[]{selected.getName()}
292
                                ),
293
                                i18n.getTranslation("_Delete_column"),
294
                                JOptionPane.OK_CANCEL_OPTION,
295
                                JOptionPane.QUESTION_MESSAGE, 
296
                                "_You_are_trying_to_remove_the_column_XcolumnNameX_that_is_being_sorted_by_Do_you_wish_to_continue"
297
                        );
298
                        if (n != JOptionPane.OK_OPTION){
299
                            return;
300
                        }
301
                        try {
302
                            order.remove(order.getIndex(selected.getName()));
303
                        } catch (Throwable t) {
304
                            logger.warn("Can't remove order", t);
305
                        }
306
                    }
307
                }
308
            }
309
        }
310
        EditableFeatureType eft = featureStore.getDefaultFeatureType().getEditable();
282 311
        for (FeatureAttributeDescriptor selected : selecteds) {
283 312
            eft.remove(selected.getName());
284 313
        }
......
310 339

  
311 340
    public void renameAttributes(FeatureTable table) throws DataException {
312 341

  
342
        FeatureAttributeDescriptor[] selecteds = table.getSelectedColumnsAttributeDescriptor();
313 343
        I18nManager i18n = ToolsLocator.getI18nManager();
344
        FeatureQuery query = this.tablePanel.getTablePanel().getFeatureQuery();
345
        if(query != null){
346
            FeatureQueryOrder order = query.getOrder();
347
            if(order != null) {
348
                for (FeatureAttributeDescriptor selected : selecteds) {
349
                    if(order.contains(selected.getName())){
350
                        int n = ToolsSwingLocator.getThreadSafeDialogsManager().confirmDialog(
351
                                i18n.getTranslation(
352
                                        "_You_are_trying_to_rename_the_column_XcolumnNameX_that_is_being_sorted_by_Do_you_wish_to_continue",
353
                                        new String[]{selected.getName()}
354
                                ),
355
                                i18n.getTranslation("_Rename_column"),
356
                                JOptionPane.OK_CANCEL_OPTION,
357
                                JOptionPane.QUESTION_MESSAGE, 
358
                                "_You_are_trying_to_rename_the_column_XcolumnNameX_that_is_being_sorted_by_Do_you_wish_to_continue"
359
                        );
360
                        if (n != JOptionPane.OK_OPTION){
361
                            return;
362
                        }
363
                        try {
364
                            order.remove(order.getIndex(selected.getName()));
365
                        } catch (Throwable t) {
366
                            logger.warn("Can't remove order", t);
367
                        }
368
                    }
369
                }
370
            }
371
        }
372
        
314 373
        FeatureType _ft = featureStore.getDefaultFeatureType();
315 374

  
316
        FeatureAttributeDescriptor[] selecteds
317
                = table.getSelectedColumnsAttributeDescriptor();
318 375

  
319 376
        int maxAttributeNameSize = getMaxAttributeSize();
320 377
        for (int i = selecteds.length - 1; i >= 0; i--) {

Also available in: Unified diff