Project

General

Profile

« Previous | Next » 

Revision e00acade

Added by Katja Luther about 5 years ago

use same saving strategie for local name details pref as for db name details pref

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
840 840

  
841 841

  
842 842
		//Name Details
843
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS), true);
844
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE), true);
845
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP), true);
846
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_HYBRID), true);
847
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_LSID), true);
848
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP), true);
849
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_NAMECACHE), true);
850
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE), true);
851
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE), true);
852
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS), true);
853
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE), true);
854
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_RANK), true);
855
		getPreferenceStore().setDefault(createPreferenceString(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION), true);
843
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());
844

  
856 845
		//Navigator preferences
857 846
		getPreferenceStore().setDefault(createPreferenceString(SORT_NODES), NavigatorOrderEnum.RankAndNameOrder.getKey());
858 847

  
......
868 857
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.ShowNamespaceInSource.getKey()), Boolean.valueOf(EditorPreferencePredicate.ShowNamespaceInSource.getDefaultValue().toString()));
869 858
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.ShowIdInSource.getKey()), Boolean.valueOf(EditorPreferencePredicate.ShowIdInSource.getDefaultValue().toString()));
870 859
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(EditorPreferencePredicate.DisableMultiClassification.getDefaultValue().toString()));
871
		getPreferenceStore().setDefault(createPreferenceString(DISABLE_SEC), false);
872
		getPreferenceStore().setDefault(createPreferenceString(SHOW_SEC_DETAILS), true);
860

  
873 861
	}
874 862

  
875 863
	/**
......
1399 1387
        NameDetailsConfigurator config = new NameDetailsConfigurator(true);
1400 1388
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
1401 1389
        CdmPreference preference = null;
1402

  
1390
        String value;
1403 1391
        if (!local) {
1404 1392
            preference = cache.get(EditorPreferencePredicate.NameDetailsView.getKey());
1405 1393
            if (preference == null){
......
1407 1395
            }
1408 1396

  
1409 1397
            setBooleanValue(ALLOW_OVERRIDE_NAME_DETAILS, preference.isAllowOverride());
1410

  
1398
            value = preference.getValue();
1399
            config.setAllowOverride(preference.isAllowOverride());
1411 1400
            //the preference value is build like this:
1412 1401
            //<section1>:true;<section2>:false....
1402
        }else{
1403
            value = getStringValue(EditorPreferencePredicate.NameDetailsView.getKey(), local);
1404
        }
1405
        String [] sections = value.split(";");
1406
        Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
1407
        String[] sectionValues;
1408
        for (String sectionValue: sections){
1409
            sectionValues = sectionValue.split(":");
1410
            sectionMap.put(sectionValues[0], Boolean.valueOf(sectionValues[1]));
1411
        }
1413 1412

  
1414
            String value = preference.getValue();
1415
            String [] sections = value.split(";");
1416
            Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
1417
            String[] sectionValues;
1418
            for (String sectionValue: sections){
1419
                sectionValues = sectionValue.split(":");
1420
                sectionMap.put(sectionValues[0], Boolean.valueOf(sectionValues[1]));
1421
            }
1422
            config.setAllowOverride(preference.isAllowOverride());
1423
            config.setSimpleDetailsViewActivated(getValue(sectionMap, "simpleViewActivated"));
1413
        config.setSimpleDetailsViewActivated(getValue(sectionMap, "simpleViewActivated"));
1424 1414

  
1425
    //        getPreferenceStore().setValue(SHOW_SIMPLE_NAME_DETAILS_TAXON,
1426
    //                (getValue(sectionMap, "taxon")));
1427 1415
            config.setTaxonSectionActivated(getValue(sectionMap, "taxon"));
1428 1416

  
1429
            config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecEnabled"));
1430
            config.setSecEnabled(getValue(sectionMap, "taxon.SecDetails"));
1431

  
1432
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_LSID,
1433
    //                (getValue(sectionMap, "lsid")));
1434
            config.setLSIDActivated(getValue(sectionMap, "lsid"));
1417
        config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecEnabled"));
1418
        config.setSecEnabled(getValue(sectionMap, "taxon.SecDetails"));
1435 1419

  
1436
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE,
1437
    //                (getValue(sectionMap, "nc")));
1438
            config.setNomenclaturalCodeActived(getValue(sectionMap, "nc"));
1420
        config.setLSIDActivated(getValue(sectionMap, "lsid"));
1439 1421

  
1440
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE,
1441
    //                (getValue(sectionMap, "ap")));
1442
            config.setAppendedPhraseActivated(getValue(sectionMap, "ap"));
1422
        config.setNomenclaturalCodeActived(getValue(sectionMap, "nc"));
1443 1423

  
1444
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_RANK,
1445
    //                (getValue(sectionMap, "rank")));
1446
            config.setRankActivated(getValue(sectionMap, "rank"));
1424
        config.setAppendedPhraseActivated(getValue(sectionMap, "ap"));
1447 1425

  
1426
        config.setRankActivated(getValue(sectionMap, "rank"));
1448 1427

  
1449
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS,
1450
    //                (getValue(sectionMap, "atomisedEpithets")));
1451
            config.setAtomisedEpithetsActivated(getValue(sectionMap, "atomisedEpithets"));
1428
        config.setAtomisedEpithetsActivated(getValue(sectionMap, "atomisedEpithets"));
1452 1429

  
1453
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP,
1454
    //                (getValue(sectionMap,"author")));
1455
            config.setAuthorshipSectionActivated(getValue(sectionMap,"author"));
1430
        config.setAuthorshipSectionActivated(getValue(sectionMap,"author"));
1456 1431

  
1457
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE,
1458
    //                (getValue(sectionMap, "nomRef")));
1459
            config.setNomenclaturalReferenceSectionActivated(sectionMap.get("nomRef"));
1432
        config.setNomenclaturalReferenceSectionActivated(sectionMap.get("nomRef"));
1460 1433

  
1461
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS,
1462
    //                (getValue(sectionMap, "nomStat")));
1463
            config.setNomenclaturalStatusSectionActivated(getValue(sectionMap, "nomStat"));
1434
        config.setNomenclaturalStatusSectionActivated(getValue(sectionMap, "nomStat"));
1464 1435

  
1436
        config.setProtologueActivated(getValue(sectionMap,"protologue"));
1465 1437

  
1466
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE,
1467
    //                (getValue(sectionMap,"protologue")));
1468
            config.setProtologueActivated(getValue(sectionMap,"protologue"));
1438
        config.setTypeDesignationSectionActivated(getValue(sectionMap,"typeDes"));
1469 1439

  
1470
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION,
1471
    //                (getValue(sectionMap,"typeDes")));
1472
            config.setTypeDesignationSectionActivated(getValue(sectionMap,"typeDes"));
1440
        config.setNameRelationsSectionActivated(getValue(sectionMap,"nameRelation"));
1473 1441

  
1474
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP,
1475
    //                (getValue(sectionMap,"nameRelation")));
1476
            config.setNameRelationsSectionActivated(getValue(sectionMap,"nameRelation"));
1477

  
1478
    //        getPreferenceStore().setValue(SHOW_NAME_DETAILS_SECTION_HYBRID,
1479
    //                (getValue(sectionMap, "hybrid")));
1480 1442
            config.setHybridActivated(getValue(sectionMap,"hybrid"));
1481
        }else{
1482
            config.setSimpleDetailsViewActivated(getBooleanValue(SHOW_SIMPLE_NAME_DETAILS_SECTION));
1483
            config.setTaxonSectionActivated(getBooleanValue(SHOW_SIMPLE_NAME_DETAILS_TAXON));
1484
            config.setSecDetailsActivated(getBooleanValue(SHOW_SEC_DETAILS));
1485
            config.setSecEnabled(getBooleanValue(DISABLE_SEC));
1486
            config.setLSIDActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_LSID));
1487
            config.setNomenclaturalCodeActived(getBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE));
1488
            config.setAppendedPhraseActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE));
1489
            config.setRankActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_RANK));
1490
            config.setAtomisedEpithetsActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS));
1491
            config.setAuthorshipSectionActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP));
1492
            config.setNomenclaturalReferenceSectionActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE));
1493
            config.setNomenclaturalStatusSectionActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS));
1494
            config.setProtologueActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE));
1495
            config.setTypeDesignationSectionActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION));
1496
            config.setNameRelationsSectionActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP));
1497
            config.setHybridActivated(getBooleanValue(SHOW_NAME_DETAILS_SECTION_HYBRID));
1498
        }
1443

  
1499 1444
        return config;
1500 1445
    }
1501 1446

  
......
1508 1453
        CdmPreference preference = null;
1509 1454

  
1510 1455
        if (!local) {
1511
            preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), EditorPreferencePredicate.NameDetailsView, config.toString());
1456
            preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.NameDetailsView, config.toString());
1512 1457

  
1513 1458
            setPreferenceToDB(preference);
1514 1459
        }
1515
        //also add to local preferences
1516
        setBooleanValue(SHOW_SIMPLE_NAME_DETAILS_SECTION, config.isSimpleDetailsViewActivated());
1517
        setBooleanValue(SHOW_SIMPLE_NAME_DETAILS_TAXON, config.isTaxonSectionActivated());
1518
        setBooleanValue(SHOW_SEC_DETAILS, config.isSecDetailsActivated());
1519
        setBooleanValue(DISABLE_SEC, config.isSecEnabled());
1520
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_LSID, config.isLSIDActivated());
1521
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE, config.isNomenclaturalCodeActived());
1522
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE, config.isAppendedPhraseActivated());
1523
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_RANK, config.isRankActivated());
1524
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS, config.isAtomisedEpithetsActivated());
1525
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_AUTHORSHIP, config.isAuthorshipSectionActivated());
1526
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE, config.isNomenclaturalReferenceSectionActivated());
1527
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS, config.isNomenclaturalStatusSectionActivated());
1528
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, config.isProtologueActivated());
1529
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, config.isTypeDesignationSectionActivated());
1530
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP, config.isNameRelationsSectionActivated());
1531
        setBooleanValue(SHOW_NAME_DETAILS_SECTION_HYBRID, config.isHybridActivated());
1460
        else{
1461
            setStringValue(EditorPreferencePredicate.NameDetailsView.getKey(), config.toString());
1462
        }
1463

  
1532 1464

  
1533 1465
    }
1534 1466

  
......
1682 1614
    }
1683 1615

  
1684 1616

  
1685
    /**
1686
    *
1687
    */
1688
   public NameDetailsConfigurator createLocalNameDetailsViewConfig(boolean local) {
1689
       NameDetailsConfigurator config = new NameDetailsConfigurator(true);
1690
       if (local){
1691
          config.setSimpleDetailsViewActivated(getBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION));
1692
          config.setAppendedPhraseActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE));
1693
          config.setAtomisedEpithetsActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS));
1694
          config.setAuthorshipSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP));
1695
          config.setLSIDActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID));
1696
          config.setNameApprobiationActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION));
1697
          config.setNameCacheActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_CACHE));
1698
          config.setNameRelationsSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP));
1699
          config.setNomenclaturalCodeActived(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE));
1700
          config.setNomenclaturalStatusSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS));
1701
          config.setNomenclaturalReferenceSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE));
1702
          config.setProtologueActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE));
1703
          config.setRankActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK));
1704
          config.setTaxonSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON));
1705
          config.setTypeDesignationSectionActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION));
1706
          config.setHybridActivated(getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID));
1707
       }else{
1708

  
1709
       }
1710

  
1711
      return config;
1712
   }
1713

  
1714

  
1715
   public static void saveConfigToPrefernceStore(NameDetailsConfigurator config) {
1716
       setBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION,
1717
               config.isSimpleDetailsViewActivated());
1718
       setBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON, config.isTaxonSectionActivated());
1719
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID, config.isLSIDActivated());
1720
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE,
1721
               config.isNomenclaturalCodeActived());
1722
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE,
1723
               config.isNameCacheActivated());
1724
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE,
1725
               config.isAppendedPhraseActivated());
1726
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK, config.isRankActivated());
1727
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS,
1728
               config.isAtomisedEpithetsActivated());
1729
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE,
1730
               config.isAuthorCacheActivated());
1731
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP,
1732
               config.isAuthorshipSectionActivated());
1733
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE,
1734
               config.isNomenclaturalReferenceSectionActivated());
1735
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS,
1736
               config.isNomenclaturalStatusSectionActivated());
1737
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE,
1738
               config.isProtologueActivated());
1739
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION,
1740
               config.isTypeDesignationSectionActivated());
1741
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP,
1742
               config.isNameRelationsSectionActivated());
1743
       setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID,
1744
               config.isHybridActivated());
1745

  
1746
   }
1617

  
1618

  
1619

  
1620

  
1747 1621

  
1748 1622
/**
1749 1623
 * @return

Also available in: Unified diff