Project

General

Profile

« Previous | Next » 

Revision dea4cffc

Added by Katja Luther over 4 years ago

ref #8385: add allowOverride to AbcdProvider PreferencePage

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusAndNamedAreaVocabularies.java
253 253

  
254 254
        commandHandlerString = "eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler";
255 255
        commandHandlerStringStatus = "eu.etaxonomy.taxeditor.store.open.OpenDistributionStatusWizardHandler";
256
        setApply(true);
256
       // setApply(true);
257 257
    }
258 258

  
259 259
    /**
......
295 295
            }
296 296

  
297 297
        }
298

  
298 299
        prefStatus = null;
299 300
        prefAreaVoc = null;
300
        setApply(true);
301 301
        refresh();
302
        setApply(true);
303

  
302 304
    }
303 305

  
304 306
    @Override
......
306 308
        if (!isApply()){
307 309
            return true;
308 310
        }
309

  
311
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
310 312
        if (prefStatus == null){
311
            List<CdmPreference> prefsToDelete =PreferencesUtil.getPreference(PreferencePredicate.AvailableDistributionStatus);
313
            List<CdmPreference> prefsToDelete =cache.getAllForPredicate(PreferencePredicate.AvailableDistributionStatus.getKey());
312 314
            PreferencesUtil.removeFromDB(prefsToDelete);
313 315
        }
314 316
        if (prefAreaVoc == null){
315
            List<CdmPreference> prefsToDelete =PreferencesUtil.getPreference(PreferencePredicate.AvailableDistributionAreaVocabularies);
317
            List<CdmPreference> prefsToDelete =cache.getAllForPredicate(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
316 318
            PreferencesUtil.removeFromDB(prefsToDelete);
317 319
        }
318 320
        List<CdmPreference> toDelete = new ArrayList<>();
......
332 334
    @Optional
333 335
    public void updateView(@UIEventTopic(WorkbenchEventConstants.REFRESH_DATASOURCE)boolean refresh){
334 336
        if(refresh){
337
            getValues();
335 338
            refresh();
336 339
        }
337 340
    }
......
342 345
        if (event != null
343 346
                && PreferencesUtil.PREFERRED_TERMS_CHANGE.equals(event
344 347
                        .getProperty())) {
348
            getValues();
345 349
            refresh();
346 350
        }
347 351
    }
......
350 354
     *
351 355
     */
352 356
    private void refresh() {
353
        getValues();
357
        //getValues();
354 358
        table.removeAll();
355
        Iterator<CdmPreference> prefIterator = prefStatus.iterator();
356
        CdmPreference pref;
357
        while (prefIterator.hasNext()){
358
            pref = prefIterator.next();
359
            createTableRow(pref);
359
        if (prefStatus != null){
360
            Iterator<CdmPreference> prefIterator = prefStatus.iterator();
361
            CdmPreference pref;
362
            while (prefIterator.hasNext()){
363
                pref = prefIterator.next();
364
                createTableRow(pref);
360 365

  
366
            }
361 367
        }
362 368
        table.redraw();
363 369
        table.pack();

Also available in: Unified diff