From 31d3e34d2a1b4c07e8a70c3c487ebcf718b619a4 Mon Sep 17 00:00:00 2001 From: "U-BGBM\\k.luther" Date: Thu, 3 Sep 2015 11:57:59 +0200 Subject: [PATCH] change preferences page for taxonnode sort --- eu.etaxonomy.taxeditor.cdmlib/.classpath | 418 +++++++++--------- .../TransientClassificationService.java | 10 + .../OSGI-INF/l10n/bundle.properties | 5 +- .../OSGI-INF/l10n/bundle_de.properties | 2 + eu.etaxonomy.taxeditor.store/plugin.xml | 8 +- .../TaxonNodeDetailElement.java | 2 +- 6 files changed, 230 insertions(+), 215 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 3962c23f1..5f958ce4a 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,209 +1,209 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index e6dae907e..dd1951901 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -950,4 +950,14 @@ public class TransientClassificationService implements IClassificationService { return defaultService.merge(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IClassificationService#loadRankSpecificRootNodes(eu.etaxonomy.cdm.model.taxon.Classification, eu.etaxonomy.cdm.model.name.Rank, java.lang.Integer, java.lang.Integer, java.util.List) + */ + @Override + public List loadRankSpecificRootNodes(Classification arg0, Rank arg1, Integer arg2, Integer arg3, + List arg4) { + + return defaultService.loadRankSpecificRootNodes(arg0, arg1, arg2, arg3, arg4); + } + } diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties index a13d96793..14ce99859 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties @@ -155,4 +155,7 @@ extension-point.name = Cdm Viewer Bundle-Vendor = EDIT Bundle-Name = DataStore Bundle command.name.13 = delete -command.name.14 = delete \ No newline at end of file +command.name.14 = delete +page.name.32 = TaxonNavigator +page.name.33 = Sort of Taxonnodes +command.name.15 = Open \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties index 28fb041ac..fdc32d069 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties @@ -129,5 +129,7 @@ page.name.27 = Media page.name.28 = Checklisten Editor page.name.29 = Editor Profil page.name.30 = Sprache +page.name.32 = TaxonNavigator +page.name.33 = Sortierung im TaxonNavigator command.label.clone = Klonen command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 41a4ad279..320968a8b 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -206,11 +206,11 @@ id="eu.etaxonomy.taxeditor.preference.defaultlanguagepditorpreferencePage" name="%page.name.30"> - + id="eu.etaxonomy.taxeditor.preference.TaxonNavigator" + name="%page.name.32"> + name="%command.name.15">