Revision 7915799e
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SearchDialogAdminPreferences.java | ||
|---|---|---|
| 11 | 11 |
import eu.etaxonomy.cdm.api.application.ICdmRepository; |
| 12 | 12 |
import eu.etaxonomy.cdm.api.service.IPreferenceService; |
| 13 | 13 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 14 |
import eu.etaxonomy.cdm.model.metadata.NamedAreaSearchField; |
|
| 14 | 15 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
| 16 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
|
| 15 | 17 |
import eu.etaxonomy.taxeditor.preference.SearchDialogPreferences; |
| 16 | 18 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 17 | 19 |
|
| ... | ... | |
| 58 | 60 |
filterCommonNameReferences = null; |
| 59 | 61 |
filterCommonNameReferencesPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameReferencesWithMarker, null); |
| 60 | 62 |
} |
| 63 |
if (this.searchNamedAreasByAbbrevPref != null){
|
|
| 64 |
searchNamedAreasByAbbrev = searchNamedAreasByAbbrevPref.getValue() != null? NamedAreaSearchField.byKey(searchNamedAreasByAbbrevPref.getValue()): null; |
|
| 65 |
}else{
|
|
| 66 |
searchNamedAreasByAbbrev = null; |
|
| 67 |
searchNamedAreasByAbbrevPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NamedAreaSearchForAbbrev, null); |
|
| 68 |
} |
|
| 69 |
|
|
| 61 | 70 |
} |
| 62 | 71 |
|
| 63 | 72 |
@Override |
| ... | ... | |
| 104 | 113 |
service.remove(sortTaxaByRankAndNamePref.getKey()); |
| 105 | 114 |
} |
| 106 | 115 |
|
| 107 |
|
|
| 108 |
|
|
| 109 | 116 |
if(filterCommonNameReferences != null || !filterCommonNameReferencesPref.isAllowOverride()){
|
| 110 | 117 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameReferencesWithMarker, filterCommonNameReferences!= null? filterCommonNameReferences.toString():null); |
| 111 | 118 |
pref.setAllowOverride(filterCommonNameReferencesPref.isAllowOverride()); |
| ... | ... | |
| 113 | 120 |
}else{
|
| 114 | 121 |
service.remove(filterCommonNameReferencesPref.getKey()); |
| 115 | 122 |
} |
| 116 |
} |
|
| 117 | 123 |
|
| 124 |
if(searchNamedAreasByAbbrev != null || !searchNamedAreasByAbbrevPref.isAllowOverride()){
|
|
| 125 |
pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NamedAreaSearchForAbbrev, searchNamedAreasByAbbrev!= null? searchNamedAreasByAbbrev.getKey():null); |
|
| 126 |
pref.setAllowOverride(searchNamedAreasByAbbrevPref.isAllowOverride()); |
|
| 127 |
service.set(pref); |
|
| 128 |
}else{
|
|
| 129 |
service.remove(searchNamedAreasByAbbrevPref.getKey()); |
|
| 130 |
} |
|
| 131 |
} |
|
| 132 |
PreferencesUtil.updateDBPreferences(); |
|
| 118 | 133 |
return true; |
| 119 | 134 |
} |
| 120 | 135 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java | ||
|---|---|---|
| 677 | 677 |
public static String OrderPreferencePage_NotAllowed; |
| 678 | 678 |
|
| 679 | 679 |
|
| 680 |
public static String DatabasePreferncesPage_NamedAreaSearchField; |
|
| 681 |
|
|
| 682 |
|
|
| 680 | 683 |
|
| 681 | 684 |
|
| 682 | 685 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties | ||
|---|---|---|
| 471 | 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Search also for title cache if identifier search is activated |
| 472 | 472 |
DatabasePreferncesPage_Sort_Taxa_By_Name_And_Rank=Sort taxa by rank and name |
| 473 | 473 |
DatabasePreferncesPage_CommonNameFilter=Filter common name references |
| 474 |
DatabasePreferncesPage_NamedAreaSearchField=Searchfield for named areas |
|
| 474 | 475 |
|
| 475 | 476 |
Distribution_status_selection=Status Selection |
| 476 | 477 |
DistributionAdminPreferences_SELECT_STATUS=List of available distribution status |
| 477 |
DistributionAdminPreferences_PER_AREA_STATUS=List of preferences defining available status per area.\nIn this list you can define whether the preference can be overwritten or delete it.
|
|
| 478 |
DistributionAdminPreferences_PER_AREA_STATUS=List of preferences defining available status per area.\nWith the mostright button you can edit the selected area specific status preference.\nFor defining new area specific status preference please use the button below the table
|
|
| 478 | 479 |
|
| 479 | 480 |
MarkerTypeMenuPreferences_display=Choose available markers |
| 480 | 481 |
MeasurementUnitMenuPreferences_edit=Edit displayed measurement units |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties | ||
|---|---|---|
| 396 | 396 |
ChecklistEditorGeneralPreference_0=Die Datenbank Pr?ferenzen erlauben kein lokales Bearbeiten der Verbreitungseditor Pr?ferenzen. \nWenn Sie dennoch ?nderungen an den Pr?ferenzen vornehmen m?ssen, wenden Sie sich bitte an einen Administrator. |
| 397 | 397 |
ChecklistEditorGeneralPreference_enable=Verbreitungs-Editor aktivieren |
| 398 | 398 |
ChecklistEditorGeneralPreference_open_distribution_selection=Gebiets Vokabulare Ausw?hlen |
| 399 |
ChecklistEditorGeneralPreference_open_wizard=Liste der verwendbaren Areal-Vokabulare |
|
| 399 |
ChecklistEditorGeneralPreference_open_wizard=Liste der verwendbaren Areal-Vokabulare, zum Editieren verwenden Sie bitte den unten stehenden Button
|
|
| 400 | 400 |
ChecklistEditorGeneralPreference_show_rank=Rang Spalte anzeigen |
| 401 | 401 |
ChecklistEditorGeneralPreference_sort_areas=Areale gem?? Vokabular sortieren |
| 402 | 402 |
GeneralPreference_allowOverride=Erlaube ?berschreiben |
| ... | ... | |
| 471 | 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Suche nach Identifier und Title Cache, wenn Identifier Suche aktiviert ist |
| 472 | 472 |
DatabasePreferncesPage_Sort_Taxa_By_Name_And_Rank=Sortiere Taxa nach Rang und Namen |
| 473 | 473 |
DatabasePreferncesPage_CommonNameFilter=Filtere Referenzen, die als Referenzen f?r Trivialnamen markiert sind |
| 474 |
DatabasePreferncesPage_NamedAreaSearchField=Suchfeld f?r Gebietssuche |
|
| 474 | 475 |
|
| 475 | 476 |
Distribution_status_selection=Status Auswahl |
| 476 | 477 |
DistributionAdminPreferences_SELECT_STATUS=Liste der verf?gbaren Verbreitungs-Status |
| 477 |
DistributionAdminPreferences_PER_AREA_STATUS=Liste der pro Area definierten Status Preferenzen\nSie k?nnen in der Liste definieren, ob das lokale ?berschreiben erlaubt sein soll und die Preferenz l?schen
|
|
| 478 |
DistributionAdminPreferences_PER_AREA_STATUS=Liste der pro Area definierten Status Preferenzen\nMit dem Button auf der rechten Seite k?nnen Sie die Pr?ferenz f?r das Gebiet editieren.\nWenn Sie neue gebietsspezifische Statusangaben definieren wollen, m?ssen Sie den Button unter der Tabelle verwenden,
|
|
| 478 | 479 |
|
| 479 | 480 |
MarkerTypeMenuPreferences_display=Auswahl der zur Verf\u00FCgung stehenden Marker |
| 480 | 481 |
MeasurementUnitMenuPreferences_edit=Angezeigte Ma?einheiten |
| ... | ... | |
| 482 | 483 |
MediaDetailElement_Media_URI=Media URI |
| 483 | 484 |
MediaDetailElement_NO_FILE_FOUND=Keine Datei gefunden |
| 484 | 485 |
MediaDetailElement_NO_PREVIEW=Keine Vorschau f?r diesen Dateityp vorhanden |
| 485 |
MediaDetailElement_TOGGLE_NOT_POSSIBLE_MESSAGE=Media besteht aus mehreren "representations" oder "representatio parts" |
|
| 486 |
MediaDetailElement_TOGGLE_NOT_POSSIBLE_MESSAGE=Media besteht aus mehreren "representations" oder "representation parts"
|
|
| 486 | 487 |
MediaDetailElement_TOGGLE_NOT_POSSIBLE_TITLE=Umschalten nicht m?glich |
| 487 | 488 |
MediaPreferences_advanced=Erweiterten Media Details View anzeigen |
| 488 | 489 |
MediaPreferences_preview=Vorschau anzeigen |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java | ||
|---|---|---|
| 56 | 56 |
import eu.etaxonomy.cdm.model.description.Feature; |
| 57 | 57 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 58 | 58 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey; |
| 59 |
import eu.etaxonomy.cdm.model.metadata.IKeyLabel; |
|
| 59 | 60 |
import eu.etaxonomy.cdm.model.metadata.IPreferencePredicate; |
| 60 | 61 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
| 61 | 62 |
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject; |
| ... | ... | |
| 239 | 240 |
getString(name); |
| 240 | 241 |
} |
| 241 | 242 |
}else if (pref != null){
|
| 243 |
if (pref.getValue() == null){
|
|
| 244 |
Object result = PreferencePredicate.getByKey(pref.getPredicate()).getDefaultValue(); |
|
| 245 |
if (result instanceof String){
|
|
| 246 |
return (String)result; |
|
| 247 |
}else{
|
|
| 248 |
if (result == null){
|
|
| 249 |
return null; |
|
| 250 |
} |
|
| 251 |
if (result instanceof IKeyLabel){
|
|
| 252 |
return ((IKeyLabel)result).getKey(); |
|
| 253 |
} |
|
| 254 |
return result.toString(); |
|
| 255 |
} |
|
| 256 |
} |
|
| 242 | 257 |
prefValue = pref.getValue(); |
| 243 | 258 |
} |
| 244 | 259 |
return prefValue; |
| ... | ... | |
| 330 | 345 |
if (result instanceof Boolean){
|
| 331 | 346 |
return (Boolean)result; |
| 332 | 347 |
}else{
|
| 333 |
Boolean.valueOf(result.toString()); |
|
| 348 |
return Boolean.valueOf(result.toString());
|
|
| 334 | 349 |
} |
| 335 | 350 |
} |
| 336 | 351 |
return Boolean.valueOf(pref.getValue()); |
| ... | ... | |
| 350 | 365 |
} |
| 351 | 366 |
Double result = null; |
| 352 | 367 |
try{
|
| 368 |
if (pref.getValue() == null){
|
|
| 369 |
Object defaultValue = PreferencePredicate.getByKey(pref.getPredicate()).getDefaultValue(); |
|
| 370 |
if (defaultValue instanceof Double){
|
|
| 371 |
return (Double)defaultValue; |
|
| 372 |
}else{
|
|
| 373 |
return Double.valueOf(defaultValue.toString()); |
|
| 374 |
} |
|
| 375 |
} |
|
| 376 |
|
|
| 353 | 377 |
result = Double.parseDouble(prefValue); |
| 354 | 378 |
}catch(NumberFormatException e){
|
| 355 | 379 |
logger.debug("Preference value of " + name + " is not a number");
|
| ... | ... | |
| 930 | 954 |
getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(PreferencePredicate.DisableMultiClassification.getDefaultValue().toString())); |
| 931 | 955 |
getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowImportExportMenu.getKey()), Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString())); |
| 932 | 956 |
getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowSpecimen.getKey()), Boolean.valueOf(PreferencePredicate.ShowSpecimen.getDefaultValue().toString())); |
| 957 |
getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.SearchForIdentifierAndTitleCache.getKey()), Boolean.valueOf(PreferencePredicate.SearchForIdentifierAndTitleCache.getDefaultValue().toString())); |
|
| 958 |
getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.SearchForIdentifierAndTitleCache.getKey())), false); |
|
| 959 |
getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.SearchForIdentifierAsDefault.getKey()), Boolean.valueOf(PreferencePredicate.SearchForIdentifierAsDefault.getDefaultValue().toString())); |
|
| 960 |
getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.SearchForIdentifierAsDefault.getKey())), false); |
|
| 933 | 961 |
|
| 934 | 962 |
} |
| 935 | 963 |
|
| ... | ... | |
| 1704 | 1732 |
} |
| 1705 | 1733 |
} |
| 1706 | 1734 |
|
| 1707 |
public static List<UUID> createUUIDListFromStringPref(String prefKey) {
|
|
| 1735 |
public static List<UUID> createUUIDListFromStringPref(String prefKey, boolean local) {
|
|
| 1708 | 1736 |
if (prefKey == null){
|
| 1709 | 1737 |
return null; |
| 1710 | 1738 |
} |
| 1711 |
String prefValue = PreferencesUtil.getStringValue(prefKey); |
|
| 1739 |
String prefValue = PreferencesUtil.getStringValue(prefKey, local);
|
|
| 1712 | 1740 |
if (prefValue == null){
|
| 1713 | 1741 |
return null; |
| 1714 | 1742 |
} |
| 1743 |
List<UUID> uuidList = createUuidList(prefValue); |
|
| 1744 |
return uuidList; |
|
| 1745 |
} |
|
| 1746 |
|
|
| 1747 |
public static List<UUID> createUuidList(String prefValue) {
|
|
| 1715 | 1748 |
String[] stringArray = prefValue.split(";");
|
| 1716 | 1749 |
List<UUID> uuidList = new ArrayList(); |
| 1717 | 1750 |
for (String uuid: stringArray){
|
| ... | ... | |
| 1802 | 1835 |
List<Feature> terms = new ArrayList(); |
| 1803 | 1836 |
boolean override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NameFeatures.getKey())); |
| 1804 | 1837 |
|
| 1805 |
List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.NameFeatures.getKey()); |
|
| 1838 |
List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.NameFeatures.getKey(), false);
|
|
| 1806 | 1839 |
if (uuids != null && !uuids.isEmpty()){
|
| 1807 | 1840 |
terms = CdmStore.getTermManager().getTerms(uuids, Feature.class); |
| 1808 | 1841 |
} |
| ... | ... | |
| 1858 | 1891 |
CdmPreference pref = cache.get(PreferencePredicate.TaxonFeatures.getKey()); |
| 1859 | 1892 |
List<Feature> terms; |
| 1860 | 1893 |
boolean override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonFeatures.getKey())); |
| 1861 |
List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.TaxonFeatures.getKey()); |
|
| 1894 |
List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.TaxonFeatures.getKey(), false);
|
|
| 1862 | 1895 |
terms = CdmStore.getTermManager().getTerms(uuids, Feature.class); |
| 1863 | 1896 |
if (terms == null || terms.isEmpty()){
|
| 1864 | 1897 |
terms= CdmStore.getTermManager().getPreferredTerms(TermType.Feature); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java | ||
|---|---|---|
| 20 | 20 |
import org.eclipse.swt.widgets.Label; |
| 21 | 21 |
|
| 22 | 22 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 23 |
import eu.etaxonomy.cdm.model.metadata.NamedAreaSearchField; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
| 24 | 25 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 25 | 26 |
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; |
| ... | ... | |
| 36 | 37 |
protected CdmPreference searchForIdentifierAndTitleCachePref; |
| 37 | 38 |
protected CdmPreference sortTaxaByRankAndNamePref; |
| 38 | 39 |
protected CdmPreference filterCommonNameReferencesPref; |
| 40 |
protected CdmPreference searchNamedAreasByAbbrevPref; |
|
| 39 | 41 |
|
| 40 | 42 |
|
| 41 | 43 |
protected Boolean showIdInSelectionDialog; |
| ... | ... | |
| 43 | 45 |
protected Boolean searchForIdentifierAndTitleCache; |
| 44 | 46 |
protected Boolean sortTaxaByRankAndName; |
| 45 | 47 |
protected Boolean filterCommonNameReferences; |
| 48 |
protected NamedAreaSearchField searchNamedAreasByAbbrev; |
|
| 46 | 49 |
|
| 47 | 50 |
private boolean overrideShowIdInSelectionDialog = true; |
| 48 | 51 |
private boolean overrideSearchForIdentifierAsDefault = true; |
| 49 | 52 |
private boolean overrideSearchForIdentifierAndTitleCache = true; |
| 50 | 53 |
private boolean overrideSortTaxaByRankAndName = true; |
| 51 | 54 |
private boolean overrideFilterCommonNameReferences = true; |
| 55 |
private boolean overrideSearchNamedAreasByAbbrev = true; |
|
| 52 | 56 |
|
| 53 | 57 |
protected Combo showIdInSelectionDialogButton; |
| 54 | 58 |
protected Button allowOverrideIsShowIdInSelectionDialogButton; |
| ... | ... | |
| 60 | 64 |
protected Button allowOverrideIsSortTaxaByRankAndNameButton; |
| 61 | 65 |
protected Combo filterCommonNameReferenceButton; |
| 62 | 66 |
protected Button allowOverrideFilterCommonNameReferencesButton; |
| 67 |
protected Combo searchNamedAreasByAbbrevButton; |
|
| 68 |
protected Button allowOverridesearchNamedAreasByAbbrevButton; |
|
| 63 | 69 |
|
| 64 | 70 |
|
| 65 | 71 |
|
| ... | ... | |
| 71 | 77 |
searchForIdentifierAndTitleCachePref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.SearchForIdentifierAndTitleCache); |
| 72 | 78 |
sortTaxaByRankAndNamePref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.SortTaxaByRankAndName); |
| 73 | 79 |
filterCommonNameReferencesPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameReferencesWithMarker); |
| 80 |
searchNamedAreasByAbbrevPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NamedAreaSearchForAbbrev); |
|
| 74 | 81 |
|
| 75 | 82 |
overrideShowIdInSelectionDialog = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.ShowIdInSelectionDialog.getKey())); |
| 76 | 83 |
overrideSearchForIdentifierAsDefault = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.SearchForIdentifierAsDefault.getKey())); |
| 77 | 84 |
overrideSearchForIdentifierAndTitleCache = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.SearchForIdentifierAndTitleCache.getKey())); |
| 78 | 85 |
overrideSortTaxaByRankAndName = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.SortTaxaByRankAndName.getKey())); |
| 79 | 86 |
overrideFilterCommonNameReferences = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.CommonNameReferencesWithMarker.getKey())); |
| 87 |
overrideSearchNamedAreasByAbbrev = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NamedAreaSearchForAbbrev.getKey())); |
|
| 88 |
|
|
| 80 | 89 |
if(overrideShowIdInSelectionDialog){
|
| 81 | 90 |
showIdInSelectionDialog = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSelectionDialog.getKey(), true); |
| 82 | 91 |
} |
| ... | ... | |
| 92 | 101 |
if(overrideFilterCommonNameReferences){
|
| 93 | 102 |
filterCommonNameReferences = PreferencesUtil.getBooleanValue(PreferencePredicate.CommonNameReferencesWithMarker.getKey(), true); |
| 94 | 103 |
} |
| 104 |
if(overrideSearchNamedAreasByAbbrev){
|
|
| 105 |
String stringValue = PreferencesUtil.getStringValue(PreferencePredicate.NamedAreaSearchForAbbrev.getKey(), true); |
|
| 106 |
searchNamedAreasByAbbrev = stringValue != null? NamedAreaSearchField.byKey(stringValue):null; |
|
| 107 |
} |
|
| 108 |
|
|
| 95 | 109 |
|
| 96 | 110 |
|
| 97 | 111 |
} |
| ... | ... | |
| 171 | 185 |
} |
| 172 | 186 |
} |
| 173 | 187 |
|
| 188 |
if (e.getSource().equals(this.searchNamedAreasByAbbrevButton)) {
|
|
| 189 |
String text = searchNamedAreasByAbbrevButton.getText(); |
|
| 190 |
if(text.startsWith(Messages.Preference_Use_Default)){
|
|
| 191 |
searchNamedAreasByAbbrev = null; |
|
| 192 |
return; |
|
| 193 |
} |
|
| 194 |
searchNamedAreasByAbbrev = (NamedAreaSearchField) searchNamedAreasByAbbrevButton.getData(text); |
|
| 195 |
|
|
| 196 |
} |
|
| 197 |
|
|
| 198 |
|
|
| 174 | 199 |
|
| 175 | 200 |
} |
| 176 | 201 |
|
| ... | ... | |
| 311 | 336 |
}); |
| 312 | 337 |
} |
| 313 | 338 |
|
| 339 |
searchNamedAreasByAbbrevButton = createCombo(composite, NamedAreaSearchField.values(), PreferencePredicate.NamedAreaSearchForAbbrev, Messages.DatabasePreferncesPage_NamedAreaSearchField, isAdminPreference); |
|
| 340 |
searchNamedAreasByAbbrevButton.addSelectionListener(this); |
|
| 341 |
|
|
| 342 |
|
|
| 343 |
if (!isAdminPreference && searchNamedAreasByAbbrevPref != null){
|
|
| 344 |
searchNamedAreasByAbbrevButton.setEnabled(searchNamedAreasByAbbrevPref.isAllowOverride()); |
|
| 345 |
} |
|
| 346 |
|
|
| 347 |
if (isAdminPreference){
|
|
| 348 |
allowOverridesearchNamedAreasByAbbrevButton = createAllowOverrideButton(composite); |
|
| 349 |
allowOverridesearchNamedAreasByAbbrevButton.setSelection(searchNamedAreasByAbbrevPref != null? searchNamedAreasByAbbrevPref.isAllowOverride():true); |
|
| 350 |
allowOverridesearchNamedAreasByAbbrevButton.addSelectionListener(new SelectionAdapter(){
|
|
| 351 |
@Override |
|
| 352 |
public void widgetSelected(SelectionEvent e) {
|
|
| 353 |
setApply(true); |
|
| 354 |
if (searchNamedAreasByAbbrevPref == null && !allowOverridesearchNamedAreasByAbbrevButton.getSelection()){
|
|
| 355 |
searchNamedAreasByAbbrevPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NamedAreaSearchForAbbrev, null); |
|
| 356 |
} |
|
| 357 |
searchNamedAreasByAbbrevPref.setAllowOverride(allowOverridesearchNamedAreasByAbbrevButton.getSelection()); |
|
| 358 |
} |
|
| 359 |
}); |
|
| 360 |
} |
|
| 361 |
|
|
| 314 | 362 |
setSelections(); |
| 315 | 363 |
|
| 316 | 364 |
return composite; |
| ... | ... | |
| 348 | 396 |
allowOverrideFilterCommonNameReferencesButton.setSelection(true); |
| 349 | 397 |
filterCommonNameReferencesPref.setAllowOverride(true); |
| 350 | 398 |
} |
| 399 |
searchNamedAreasByAbbrevButton.select(0); |
|
| 400 |
searchNamedAreasByAbbrev = null; |
|
| 401 |
if (isAdminPreference){
|
|
| 402 |
allowOverridesearchNamedAreasByAbbrevButton.setSelection(true); |
|
| 403 |
searchNamedAreasByAbbrevPref.setAllowOverride(true); |
|
| 404 |
} |
|
| 351 | 405 |
setApply(true); |
| 352 | 406 |
} |
| 353 | 407 |
|
| ... | ... | |
| 404 | 458 |
override); |
| 405 | 459 |
override = false; |
| 406 | 460 |
|
| 461 |
if(searchNamedAreasByAbbrev != null){
|
|
| 462 |
override = true; |
|
| 463 |
PreferencesUtil.setStringValue(PreferencePredicate.NamedAreaSearchForAbbrev.getKey(), searchNamedAreasByAbbrev.getKey()); |
|
| 464 |
} |
|
| 465 |
PreferencesUtil.setBooleanValue( |
|
| 466 |
PreferencesUtil.prefOverrideKey(PreferencePredicate.NamedAreaSearchForAbbrev.getKey()), |
|
| 467 |
override); |
|
| 468 |
|
|
| 469 |
|
|
| 470 |
|
|
| 407 | 471 |
return true; |
| 408 | 472 |
} |
| 409 | 473 |
|
| ... | ... | |
| 493 | 557 |
} |
| 494 | 558 |
index++; |
| 495 | 559 |
} |
| 560 |
index = 0; |
|
| 561 |
for (String itemLabel: searchNamedAreasByAbbrevButton.getItems()) {
|
|
| 562 |
if ((searchNamedAreasByAbbrev == null || (!overrideSearchNamedAreasByAbbrev && !isAdminPreference)) && itemLabel.startsWith(Messages.Preference_Use_Default)) {
|
|
| 563 |
searchNamedAreasByAbbrevButton.select(index); |
|
| 564 |
break; |
|
| 565 |
} |
|
| 566 |
|
|
| 567 |
|
|
| 568 |
if (searchNamedAreasByAbbrev != null && itemLabel.equals(searchNamedAreasByAbbrev.getLabel())){
|
|
| 569 |
searchNamedAreasByAbbrevButton.select(index); |
|
| 570 |
break; |
|
| 571 |
} |
|
| 572 |
|
|
| 573 |
index++; |
|
| 574 |
} |
|
| 496 | 575 |
} |
| 497 | 576 |
|
| 498 | 577 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java | ||
|---|---|---|
| 13 | 13 |
import java.util.List; |
| 14 | 14 |
import java.util.UUID; |
| 15 | 15 |
|
| 16 |
import org.apache.commons.lang.StringUtils; |
|
| 16 | 17 |
import org.eclipse.jface.action.Action; |
| 17 | 18 |
import org.eclipse.jface.action.IAction; |
| 18 | 19 |
import org.eclipse.jface.dialogs.Dialog; |
| ... | ... | |
| 26 | 27 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 27 | 28 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 28 | 29 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 30 |
import eu.etaxonomy.cdm.model.metadata.NamedAreaSearchField; |
|
| 31 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 29 | 32 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
| 30 | 33 |
import eu.etaxonomy.cdm.model.term.TermType; |
| 31 | 34 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
| ... | ... | |
| 239 | 242 |
*/ |
| 240 | 243 |
@Override |
| 241 | 244 |
void callService(String pattern) {
|
| 245 |
String abbrevTypeString = PreferencesUtil.getStringValue(PreferencePredicate.NamedAreaSearchForAbbrev.getKey()); |
|
| 246 |
NamedAreaSearchField abbrevType = StringUtils.isNotBlank(abbrevTypeString)? NamedAreaSearchField.byKey(abbrevTypeString): null; |
|
| 242 | 247 |
if (selectedVocabularies == null || selectedVocabularies.size() == 0){
|
| 243 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedArea(vocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage()); |
|
| 248 |
if (abbrevType != null && !abbrevType.equals(NamedAreaSearchField.NoAbbrev)){
|
|
| 249 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedAreaByAbbrev(vocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage(), abbrevType); |
|
| 250 |
}else{
|
|
| 251 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedArea(vocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage()); |
|
| 252 |
} |
|
| 244 | 253 |
}else{
|
| 245 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedArea(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage()); |
|
| 254 |
if (abbrevType != null && !abbrevType.equals(NamedAreaSearchField.NoAbbrev)){
|
|
| 255 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedAreaByAbbrev(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage(), abbrevType); |
|
| 256 |
}else{
|
|
| 257 |
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedArea(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage()); |
|
| 258 |
} |
|
| 259 |
|
|
| 246 | 260 |
} |
| 247 | 261 |
} |
| 248 | 262 |
|
Also available in: Unified diff
ref #8350: searchfield for namedArea is configurable