From f41433b9161a5e0d1c5d068134e47491c131fe2a Mon Sep 17 00:00:00 2001 From: "a.theys" Date: Fri, 22 Jun 2012 18:26:43 +0000 Subject: [PATCH] AT:Committing changes post merge --- .gitattributes | 386 +++++++++--------- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.application/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 - eu.etaxonomy.taxeditor.bulkeditor/pom.xml | 2 +- .../handler/DeleteObjectHandler.java | 2 +- .../handler/SetMergeTargetHandler.java | 2 +- eu.etaxonomy.taxeditor.cdmlib/.classpath | 17 +- .../META-INF/MANIFEST.MF | 19 +- .../build.properties | 41 +- .../lib/spring-xml-1.5.6.jar | Bin 0 -> 91163 bytes eu.etaxonomy.taxeditor.cdmlib/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.editor/plugin.xml | 22 + eu.etaxonomy.taxeditor.editor/pom.xml | 2 +- .../taxeditor/editor/TaxonEditorInput.java | 5 +- .../polytomous/handler/CreateNodeHandler.java | 2 +- .../polytomous/handler/DeleteNodeHandler.java | 2 +- .../ChangeSynonymToAcceptedTaxonHandler.java | 2 +- ...reateSynonymInHomotypicalGroupHandler.java | 2 +- .../name/handler/RemoveBasionymHandler.java | 2 +- .../name/handler/SetBasionymHandler.java | 2 +- .../editor/view/concept/ConceptViewPart.java | 3 +- .../graph/ConceptGraphContentProvider.java | 107 +++++ .../graph/ConceptGraphLabelProvider.java | 86 ++++ .../view/concept/graph/ConceptGraphView.java | 128 ++++++ .../handler/CreateConceptRelationHandler.java | 16 +- .../handler/OpenRelatedConceptHandler.java | 2 +- .../CreateConceptRelationOperation.java | 2 +- .../CreateDescriptionElementHandler.java | 2 +- .../feature.xml | 9 +- .../pom.xml | 2 +- .../build.properties | 3 +- eu.etaxonomy.taxeditor.feature/feature.xml | 2 +- eu.etaxonomy.taxeditor.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.help/build.properties | 3 +- .../html/concepts/maintopic.html | 13 - .../html/concepts/subtopic.html | 13 - .../html/concepts/subtopic2.html | 13 - .../html/img/{10_1a.JPG => 10_1a.jpg} | Bin .../html/img/{10_1b.JPG => 10_1b.jpg} | Bin .../html/img/{10_1c.JPG => 10_1c.jpg} | Bin .../html/img/{10_1d.JPG => 10_1d.jpg} | Bin .../html/img/{10_1e.JPG => 10_1e.jpg} | Bin .../html/img/{10_1f.JPG => 10_1f.jpg} | Bin .../html/img/{10_1g.JPG => 10_1g.jpg} | Bin .../html/img/{10_1h.JPG => 10_1h.jpg} | Bin .../html/img/{2_10a.JPG => 2_10a.jpg} | Bin .../html/img/{2_10b.JPG => 2_10b.jpg} | Bin .../html/img/{2_10c.JPG => 2_10c.jpg} | Bin .../html/img/{2_10d.JPG => 2_10d.jpg} | Bin .../html/img/{2_10e.JPG => 2_10e.jpg} | Bin .../html/img/{2_10f.JPG => 2_10f.jpg} | Bin .../html/img/{2_10g.JPG => 2_10g.jpg} | Bin .../html/img/{2_11a.JPG => 2_11a.jpg} | Bin .../html/img/{2_11b.JPG => 2_11b.jpg} | Bin .../html/img/{2_11c.JPG => 2_11c.jpg} | Bin .../html/img/{2_11d.JPG => 2_11d.jpg} | Bin .../html/img/{2_1a.JPG => 2_1a.jpg} | Bin .../html/img/{2_1b.JPG => 2_1b.jpg} | Bin .../html/img/{2_1c.JPG => 2_1c.jpg} | Bin .../html/img/{2_1d.JPG => 2_1d.jpg} | Bin .../html/img/{2_1e.JPG => 2_1e.jpg} | Bin .../html/img/{2_1f.JPG => 2_1f.jpg} | Bin .../html/img/{2_1g.JPG => 2_1g.jpg} | Bin .../html/img/{2_2a.JPG => 2_2a.jpg} | Bin .../html/img/{2_2b.JPG => 2_2b.jpg} | Bin .../html/img/{2_3a.JPG => 2_3a.jpg} | Bin .../html/img/{2_3b.JPG => 2_3b.jpg} | Bin .../html/img/{2_3c.JPG => 2_3c.jpg} | Bin .../html/img/{2_4a.JPG => 2_4a.jpg} | Bin .../html/img/{2_4b.JPG => 2_4b.jpg} | Bin .../html/img/{2_5a.JPG => 2_5a.jpg} | Bin .../html/img/{2_5b.JPG => 2_5b.jpg} | Bin .../html/img/{2_6a.JPG => 2_6a.jpg} | Bin .../html/img/{2_8a.JPG => 2_8a.jpg} | Bin .../html/img/{2_9a.JPG => 2_9a.jpg} | Bin .../html/img/{2_9b.JPG => 2_9b.jpg} | Bin .../html/img/{2_9c.JPG => 2_9c.jpg} | Bin .../html/img/{3_1a.JPG => 3_1a.jpg} | Bin .../html/img/{3_2a.JPG => 3_2a.jpg} | Bin .../html/img/{3_2b.JPG => 3_2b.jpg} | Bin .../html/img/{3_2c.JPG => 3_2c.jpg} | Bin .../html/img/{3_2d.JPG => 3_2d.jpg} | Bin .../html/img/{3_2e.JPG => 3_2e.jpg} | Bin .../html/img/{3_4a.JPG => 3_4a.jpg} | Bin .../html/img/{3_4b.JPG => 3_4b.jpg} | Bin .../html/img/{3_4c.JPG => 3_4c.jpg} | Bin .../html/img/{3_4d.JPG => 3_4d.jpg} | Bin .../html/img/{3_4e.JPG => 3_4e.jpg} | Bin .../html/img/{3_4f.JPG => 3_4f.jpg} | Bin .../html/img/{3_4g.JPG => 3_4g.jpg} | Bin .../html/img/{3_4h.JPG => 3_4h.jpg} | Bin .../html/img/{3_4i.JPG => 3_4i.jpg} | Bin .../html/img/{4_1a.JPG => 4_1a.jpg} | Bin .../html/img/{4_1b.JPG => 4_1b.jpg} | Bin .../html/img/{4_1c.JPG => 4_1c.jpg} | Bin .../html/img/{4_1d.JPG => 4_1d.jpg} | Bin .../html/img/{4_1e.JPG => 4_1e.jpg} | Bin .../html/img/{4_1f.JPG => 4_1f.jpg} | Bin .../html/img/{4_1g.JPG => 4_1g.jpg} | Bin .../html/img/{4_1h.JPG => 4_1h.jpg} | Bin .../html/img/{4_1i.JPG => 4_1i.jpg} | Bin .../html/img/{4_1j.JPG => 4_1j.jpg} | Bin .../html/img/{4_1k.JPG => 4_1k.jpg} | Bin .../html/img/{4_1l.JPG => 4_1l.jpg} | Bin .../html/img/{4_2a.JPG => 4_2a.jpg} | Bin .../html/img/{4_2b.JPG => 4_2b.jpg} | Bin .../html/img/{4_2c.JPG => 4_2c.jpg} | Bin .../html/img/{4_2d_text.JPG => 4_2d_text.jpg} | Bin .../html/img/{4_3a.JPG => 4_3a.jpg} | Bin .../html/img/{4_3aa.JPG => 4_3aa.jpg} | Bin .../html/img/{4_3b.JPG => 4_3b.jpg} | Bin .../html/img/{4_3bb.JPG => 4_3bb.jpg} | Bin .../html/img/{4_3c.JPG => 4_3c.jpg} | Bin .../html/img/{4_3cc.JPG => 4_3cc.jpg} | Bin .../html/img/{4_3d.JPG => 4_3d.jpg} | Bin .../html/img/{4_3e.JPG => 4_3e.jpg} | Bin .../html/img/{4_3f.JPG => 4_3f.jpg} | Bin .../html/img/{4_3g.JPG => 4_3g.jpg} | Bin .../html/img/{4_3h.JPG => 4_3h.jpg} | Bin .../html/img/{4_3i.JPG => 4_3i.jpg} | Bin .../html/img/{4_3j.JPG => 4_3j.jpg} | Bin .../html/img/{4_3k.JPG => 4_3k.jpg} | Bin .../html/img/{5_1a.JPG => 5_1a.jpg} | Bin .../html/img/{5_1b.JPG => 5_1b.jpg} | Bin .../html/img/{5_1c.JPG => 5_1c.jpg} | Bin .../html/img/{5_1d.JPG => 5_1d.jpg} | Bin .../html/img/{5_1e.JPG => 5_1e.jpg} | Bin .../html/img/{5_1f.JPG => 5_1f.jpg} | Bin .../html/img/{5_1g.JPG => 5_1g.jpg} | Bin .../html/img/{5_1h.JPG => 5_1h.jpg} | Bin .../html/img/{5_1i.JPG => 5_1i.jpg} | Bin .../html/img/{5_1j.JPG => 5_1j.jpg} | Bin .../html/img/{5_1k.JPG => 5_1k.jpg} | Bin .../html/img/{5_1l.JPG => 5_1l.jpg} | Bin .../html/img/{5_1m.JPG => 5_1m.jpg} | Bin .../html/img/{5_1n.JPG => 5_1n.jpg} | Bin .../html/img/{5_1o.JPG => 5_1o.jpg} | Bin .../html/img/{5_1p.JPG => 5_1p.jpg} | Bin .../html/img/{5_1q.JPG => 5_1q.jpg} | Bin .../html/img/{5_1r.JPG => 5_1r.jpg} | Bin .../html/img/{5_1s.JPG => 5_1s.jpg} | Bin .../html/img/{5_1t.JPG => 5_1t.jpg} | Bin .../html/img/{5_1u.JPG => 5_1u.jpg} | Bin .../html/img/{5_1v.JPG => 5_1v.jpg} | Bin .../html/img/{5_1w.JPG => 5_1w.jpg} | Bin .../html/img/{5_1x.JPG => 5_1x.jpg} | Bin .../html/img/{5_3a.JPG => 5_3a.jpg} | Bin .../html/img/{5_3b.JPG => 5_3b.jpg} | Bin .../html/img/{5_3c.JPG => 5_3c.jpg} | Bin .../html/img/{5_4a.JPG => 5_4a.jpg} | Bin .../html/img/{5_4b.JPG => 5_4b.jpg} | Bin .../html/img/{5_4c.JPG => 5_4c.jpg} | Bin .../html/img/{5_4d.JPG => 5_4d.jpg} | Bin .../html/img/{5_4e.JPG => 5_4e.jpg} | Bin .../html/img/{5_4f.JPG => 5_4f.jpg} | Bin .../html/img/{5_4g.JPG => 5_4g.jpg} | Bin .../html/img/{5_4h.JPG => 5_4h.jpg} | Bin .../html/img/{5_4i.JPG => 5_4i.jpg} | Bin .../html/img/{6_1a.JPG => 6_1a.jpg} | Bin .../html/img/{6_1b.JPG => 6_1b.jpg} | Bin .../html/img/{6_1c.JPG => 6_1c.jpg} | Bin .../html/img/{6_1d.JPG => 6_1d.jpg} | Bin .../html/img/{6_2a.JPG => 6_2a.jpg} | Bin .../html/img/{6_2b.JPG => 6_2b.jpg} | Bin .../html/img/{6_2c.JPG => 6_2c.jpg} | Bin .../html/img/{6_2d.JPG => 6_2d.jpg} | Bin .../html/img/{6_2e.JPG => 6_2e.jpg} | Bin .../html/img/{6_2f.JPG => 6_2f.jpg} | Bin .../html/img/{6_3a.JPG => 6_3a.jpg} | Bin .../html/img/{6_3b.JPG => 6_3b.jpg} | Bin .../html/img/{6_3c.JPG => 6_3c.jpg} | Bin .../html/img/{6_4a.JPG => 6_4a.jpg} | Bin .../html/img/{6_4b.JPG => 6_4b.jpg} | Bin .../html/img/{6_5a.JPG => 6_5a.jpg} | Bin .../html/img/{6_5b.JPG => 6_5b.jpg} | Bin .../html/img/{6_5c.JPG => 6_5c.jpg} | Bin .../html/img/{6_5d.JPG => 6_5d.jpg} | Bin .../html/img/{6_5e.JPG => 6_5e.jpg} | Bin .../html/img/{6_5f.JPG => 6_5f.jpg} | Bin .../html/img/{6_5g.JPG => 6_5g.jpg} | Bin .../html/img/{6_6a.JPG => 6_6a.jpg} | Bin .../html/img/{6_6b.JPG => 6_6b.jpg} | Bin .../html/img/{6_6c.JPG => 6_6c.jpg} | Bin .../html/img/{6_6cc.JPG => 6_6cc.jpg} | Bin .../html/img/{6_6d.JPG => 6_6d.jpg} | Bin .../html/img/{7_1a.JPG => 7_1a.jpg} | Bin .../html/img/{7_1b.JPG => 7_1b.jpg} | Bin .../html/img/{7_2a.JPG => 7_2a.jpg} | Bin .../html/img/{7_2b.JPG => 7_2b.jpg} | Bin .../html/img/{7_3a.JPG => 7_3a.jpg} | Bin .../html/img/{7_4a.JPG => 7_4a.jpg} | Bin .../html/img/{7_5a.JPG => 7_5a.jpg} | Bin .../html/img/{7_6a.JPG => 7_6a.jpg} | Bin .../html/img/{7_6b.JPG => 7_6b.jpg} | Bin .../html/img/{7_7a.JPG => 7_7a.jpg} | Bin .../html/img/{7_7b.JPG => 7_7b.jpg} | Bin .../html/img/{7_7c.JPG => 7_7c.jpg} | Bin .../html/img/{7_8a.JPG => 7_8a.jpg} | Bin .../html/img/{7_8b.JPG => 7_8b.jpg} | Bin .../html/img/{7_8c.JPG => 7_8c.jpg} | Bin .../html/img/{8_3a.JPG => 8_3a.jpg} | Bin .../html/img/{8_3b.JPG => 8_3b.jpg} | Bin .../html/img/{8_3c.JPG => 8_3c.jpg} | Bin .../html/img/{8_4a.JPG => 8_4a.jpg} | Bin .../html/img/{8_4b.JPG => 8_4b.jpg} | Bin .../html/img/{8_5a.JPG => 8_5a.jpg} | Bin .../html/img/{8_5b.JPG => 8_5b.jpg} | Bin .../html/img/{8_5c.JPG => 8_5c.jpg} | Bin .../html/img/{8_5d.JPG => 8_5d.jpg} | Bin .../html/img/{8_5e.JPG => 8_5e.jpg} | Bin .../html/img/{8_5f.JPG => 8_5f.jpg} | Bin .../html/img/{8_6a.JPG => 8_6a.jpg} | Bin .../html/img/{8_6b.JPG => 8_6b.jpg} | Bin .../html/img/{8_6c.JPG => 8_6c.jpg} | Bin .../html/img/{9_1a.JPG => 9_1a.jpg} | Bin .../html/img/{9_2a.JPG => 9_2a.jpg} | Bin .../html/img/{9_2b.JPG => 9_2b.jpg} | Bin .../html/nameparser/authorship_part.html | 26 ++ .../html/nameparser/name_part.html | 69 ++++ .../nameparser/nomenclatural_status_part.html | 20 + .../html/nameparser/overview.html | 51 +++ .../html/nameparser/reference_part.html | 50 +++ .../html/reference/maintopic.html | 13 - .../html/reference/subtopic.html | 13 - .../html/reference/subtopic2.html | 13 - .../html/samples/maintopic.html | 13 - .../html/samples/subtopic.html | 13 - .../html/samples/subtopic2.html | 13 - .../html/tasks/maintopic.html | 13 - .../html/tasks/subtopic.html | 13 - .../html/tasks/subtopic2.html | 13 - eu.etaxonomy.taxeditor.help/html/toc.html | 13 - eu.etaxonomy.taxeditor.help/p2.inf | 3 + eu.etaxonomy.taxeditor.help/plugin.xml | 7 +- eu.etaxonomy.taxeditor.help/pom.xml | 2 +- eu.etaxonomy.taxeditor.help/toc.xml | 5 +- eu.etaxonomy.taxeditor.help/tocnameparser.xml | 12 + .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.navigation/p2.inf | 3 + eu.etaxonomy.taxeditor.navigation/plugin.xml | 6 +- eu.etaxonomy.taxeditor.navigation/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 3 +- eu.etaxonomy.taxeditor.printpublisher/p2.inf | 3 + eu.etaxonomy.taxeditor.printpublisher/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.store/plugin.xml | 6 +- eu.etaxonomy.taxeditor.store/pom.xml | 2 +- .../definedterm/TermBasePropertyTester.java | 16 +- .../etaxonomy/taxeditor/model/TextHelper.java | 9 + .../newWizard/AbstractNewEntityWizard.java | 9 +- .../newWizard/NewClassificationWizard.java | 7 +- .../newWizard/NewCollectionWizard.java | 5 + .../newWizard/NewDerivedUnitBaseWizard.java | 7 + .../newWizard/NewFieldObservationWizard.java | 5 + .../taxeditor/newWizard/NewGroupWizard.java | 5 + .../newWizard/NewInstitutionWizard.java | 5 + .../newWizard/NewNonViralNameWizard.java | 5 + .../taxeditor/newWizard/NewPersonWizard.java | 5 + .../newWizard/NewPolytomousKeyWizard.java | 5 + .../newWizard/NewReferenceWizard.java | 5 + .../newWizard/NewTaxonNodeWizard.java | 5 + .../taxeditor/newWizard/NewTeamWizard.java | 5 + .../taxeditor/newWizard/NewUserWizard.java | 5 + .../taxeditor/ui/combo/TermComboElement.java | 4 +- .../detail/CommonNameDetailElement.java | 3 +- .../IndividualsAssociationDetailElement.java | 3 +- .../detail/TaxonInteractionDetailElement.java | 2 +- .../ui/section/name/NameDetailElement.java | 18 +- .../ui/selection/EditFromSelectionWizard.java | 3 +- .../translation/GoogleLanguageApiWrapper.java | 2 +- .../handler/AbstractDataSourceHandler.java | 2 +- .../eu.etaxonomy.taxeditor.product | 2 +- eu.etaxonomy.taxeditor/pom.xml | 2 +- pom.xml | 17 +- 279 files changed, 1008 insertions(+), 490 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java delete mode 100644 eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html rename eu.etaxonomy.taxeditor.help/html/img/{10_1a.JPG => 10_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1b.JPG => 10_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1c.JPG => 10_1c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1d.JPG => 10_1d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1e.JPG => 10_1e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1f.JPG => 10_1f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1g.JPG => 10_1g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{10_1h.JPG => 10_1h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10a.JPG => 2_10a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10b.JPG => 2_10b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10c.JPG => 2_10c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10d.JPG => 2_10d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10e.JPG => 2_10e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10f.JPG => 2_10f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_10g.JPG => 2_10g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_11a.JPG => 2_11a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_11b.JPG => 2_11b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_11c.JPG => 2_11c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_11d.JPG => 2_11d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1a.JPG => 2_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1b.JPG => 2_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1c.JPG => 2_1c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1d.JPG => 2_1d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1e.JPG => 2_1e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1f.JPG => 2_1f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_1g.JPG => 2_1g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_2a.JPG => 2_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_2b.JPG => 2_2b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_3a.JPG => 2_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_3b.JPG => 2_3b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_3c.JPG => 2_3c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_4a.JPG => 2_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_4b.JPG => 2_4b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_5a.JPG => 2_5a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_5b.JPG => 2_5b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_6a.JPG => 2_6a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_8a.JPG => 2_8a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_9a.JPG => 2_9a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_9b.JPG => 2_9b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{2_9c.JPG => 2_9c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_1a.JPG => 3_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_2a.JPG => 3_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_2b.JPG => 3_2b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_2c.JPG => 3_2c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_2d.JPG => 3_2d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_2e.JPG => 3_2e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4a.JPG => 3_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4b.JPG => 3_4b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4c.JPG => 3_4c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4d.JPG => 3_4d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4e.JPG => 3_4e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4f.JPG => 3_4f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4g.JPG => 3_4g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4h.JPG => 3_4h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{3_4i.JPG => 3_4i.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1a.JPG => 4_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1b.JPG => 4_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1c.JPG => 4_1c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1d.JPG => 4_1d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1e.JPG => 4_1e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1f.JPG => 4_1f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1g.JPG => 4_1g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1h.JPG => 4_1h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1i.JPG => 4_1i.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1j.JPG => 4_1j.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1k.JPG => 4_1k.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_1l.JPG => 4_1l.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_2a.JPG => 4_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_2b.JPG => 4_2b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_2c.JPG => 4_2c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_2d_text.JPG => 4_2d_text.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3a.JPG => 4_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3aa.JPG => 4_3aa.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3b.JPG => 4_3b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3bb.JPG => 4_3bb.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3c.JPG => 4_3c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3cc.JPG => 4_3cc.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3d.JPG => 4_3d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3e.JPG => 4_3e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3f.JPG => 4_3f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3g.JPG => 4_3g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3h.JPG => 4_3h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3i.JPG => 4_3i.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3j.JPG => 4_3j.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{4_3k.JPG => 4_3k.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1a.JPG => 5_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1b.JPG => 5_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1c.JPG => 5_1c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1d.JPG => 5_1d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1e.JPG => 5_1e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1f.JPG => 5_1f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1g.JPG => 5_1g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1h.JPG => 5_1h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1i.JPG => 5_1i.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1j.JPG => 5_1j.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1k.JPG => 5_1k.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1l.JPG => 5_1l.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1m.JPG => 5_1m.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1n.JPG => 5_1n.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1o.JPG => 5_1o.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1p.JPG => 5_1p.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1q.JPG => 5_1q.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1r.JPG => 5_1r.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1s.JPG => 5_1s.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1t.JPG => 5_1t.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1u.JPG => 5_1u.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1v.JPG => 5_1v.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1w.JPG => 5_1w.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_1x.JPG => 5_1x.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_3a.JPG => 5_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_3b.JPG => 5_3b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_3c.JPG => 5_3c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4a.JPG => 5_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4b.JPG => 5_4b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4c.JPG => 5_4c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4d.JPG => 5_4d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4e.JPG => 5_4e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4f.JPG => 5_4f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4g.JPG => 5_4g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4h.JPG => 5_4h.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{5_4i.JPG => 5_4i.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_1a.JPG => 6_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_1b.JPG => 6_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_1c.JPG => 6_1c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_1d.JPG => 6_1d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2a.JPG => 6_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2b.JPG => 6_2b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2c.JPG => 6_2c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2d.JPG => 6_2d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2e.JPG => 6_2e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_2f.JPG => 6_2f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_3a.JPG => 6_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_3b.JPG => 6_3b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_3c.JPG => 6_3c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_4a.JPG => 6_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_4b.JPG => 6_4b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5a.JPG => 6_5a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5b.JPG => 6_5b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5c.JPG => 6_5c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5d.JPG => 6_5d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5e.JPG => 6_5e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5f.JPG => 6_5f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_5g.JPG => 6_5g.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_6a.JPG => 6_6a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_6b.JPG => 6_6b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_6c.JPG => 6_6c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_6cc.JPG => 6_6cc.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{6_6d.JPG => 6_6d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_1a.JPG => 7_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_1b.JPG => 7_1b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_2a.JPG => 7_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_2b.JPG => 7_2b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_3a.JPG => 7_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_4a.JPG => 7_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_5a.JPG => 7_5a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_6a.JPG => 7_6a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_6b.JPG => 7_6b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_7a.JPG => 7_7a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_7b.JPG => 7_7b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_7c.JPG => 7_7c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_8a.JPG => 7_8a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_8b.JPG => 7_8b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{7_8c.JPG => 7_8c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_3a.JPG => 8_3a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_3b.JPG => 8_3b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_3c.JPG => 8_3c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_4a.JPG => 8_4a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_4b.JPG => 8_4b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5a.JPG => 8_5a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5b.JPG => 8_5b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5c.JPG => 8_5c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5d.JPG => 8_5d.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5e.JPG => 8_5e.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_5f.JPG => 8_5f.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_6a.JPG => 8_6a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_6b.JPG => 8_6b.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{8_6c.JPG => 8_6c.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{9_1a.JPG => 9_1a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{9_2a.JPG => 9_2a.jpg} (100%) rename eu.etaxonomy.taxeditor.help/html/img/{9_2b.JPG => 9_2b.jpg} (100%) create mode 100644 eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html create mode 100644 eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html create mode 100644 eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html create mode 100644 eu.etaxonomy.taxeditor.help/html/nameparser/overview.html create mode 100644 eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/reference/maintopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/reference/subtopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/samples/maintopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/samples/subtopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html delete mode 100644 eu.etaxonomy.taxeditor.help/html/toc.html create mode 100644 eu.etaxonomy.taxeditor.help/p2.inf create mode 100644 eu.etaxonomy.taxeditor.help/tocnameparser.xml create mode 100644 eu.etaxonomy.taxeditor.navigation/p2.inf create mode 100644 eu.etaxonomy.taxeditor.printpublisher/p2.inf diff --git a/.gitattributes b/.gitattributes index 16f83836f..6bda220b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -277,6 +277,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8asrc.zip -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.0.5.RELEASE.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.5.RELEASE.jar -text +eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip -text eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar -text @@ -434,6 +435,9 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/c eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptLabelProvider.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewerSorter.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/ChangeConceptRelationshipTypeHandler.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/ChangeConceptRelationshipTypeMenu.java -text @@ -521,9 +525,6 @@ eu.etaxonomy.taxeditor.help/.classpath -text eu.etaxonomy.taxeditor.help/.project -text eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF -text eu.etaxonomy.taxeditor.help/build.properties -text -eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html -text -eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html -text -eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html -text eu.etaxonomy.taxeditor.help/html/gettingstarted/a_succesful_parsed_taxon_record.html -text eu.etaxonomy.taxeditor.help/html/gettingstarted/about_bulk_editing.html -text eu.etaxonomy.taxeditor.help/html/gettingstarted/about_the_manual.html -text @@ -601,207 +602,204 @@ eu.etaxonomy.taxeditor.help/html/gettingstarted/types_of_supplemental_data.html eu.etaxonomy.taxeditor.help/html/gettingstarted/uninomial_and_specific_epithet.html -text eu.etaxonomy.taxeditor.help/html/gettingstarted/windows_vista.html -text eu.etaxonomy.taxeditor.help/html/gettingstarted/windows_xp_and_older_systems.html -text -eu.etaxonomy.taxeditor.help/html/img/10_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/10_1h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_10g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_11a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_11b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_11c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_11d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_1g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_2b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_3b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_3c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_4b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_5a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_5b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_6a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_8a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_9a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_9b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/2_9c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_2b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_2c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_2d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_2e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/3_4i.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1i.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1j.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1k.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_1l.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_2b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_2c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_2d_text.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3aa.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3bb.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3cc.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3i.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3j.JPG -text -eu.etaxonomy.taxeditor.help/html/img/4_3k.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1i.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1j.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1k.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1l.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1m.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1n.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1o.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1p.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1q.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1r.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1s.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1t.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1u.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1v.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1w.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_1x.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_3b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_3c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4h.JPG -text -eu.etaxonomy.taxeditor.help/html/img/5_4i.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_1c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_1d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_2f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_3b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_3c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_4b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_5g.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_6a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_6b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_6c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_6cc.JPG -text -eu.etaxonomy.taxeditor.help/html/img/6_6d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_1b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_2b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_5a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_6a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_6b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_7a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_7b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_7c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_8a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_8b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/7_8c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_3a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_3b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_3c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_4a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_4b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5d.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5e.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_5f.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_6a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_6b.JPG -text -eu.etaxonomy.taxeditor.help/html/img/8_6c.JPG -text -eu.etaxonomy.taxeditor.help/html/img/9_1a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/9_2a.JPG -text -eu.etaxonomy.taxeditor.help/html/img/9_2b.JPG -text +eu.etaxonomy.taxeditor.help/html/img/10_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1e.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/10_1f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/10_1h.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10c.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/2_10d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_10g.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/2_11a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_11b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_11c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_11d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1d.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/2_1e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_1g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_2a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_2b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_3a.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/2_3b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_3c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_4a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_4b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_5a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_5b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_6a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_8a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_9a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/2_9b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/2_9c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_2a.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/3_2b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_2c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_2d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_2e.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/3_4a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/3_4c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4f.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/3_4g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4h.jpg -text +eu.etaxonomy.taxeditor.help/html/img/3_4i.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1d.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_1e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1h.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_1i.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1j.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1k.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_1l.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_2a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_2b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_2c.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_2d_text.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3aa.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_3bb.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3cc.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3f.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_3g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3h.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3i.jpg -text +eu.etaxonomy.taxeditor.help/html/img/4_3j.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/4_3k.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1h.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1i.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1j.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1k.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1l.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1m.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1n.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1o.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1p.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1q.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1r.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/5_1s.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1t.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1u.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1v.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/5_1w.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_1x.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_3a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_3b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_3c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4c.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/5_4d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4g.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/5_4h.jpg -text +eu.etaxonomy.taxeditor.help/html/img/5_4i.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_1a.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/6_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_1c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_1d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_2f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_3a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_3b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/6_3c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_4a.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/6_4b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5d.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/6_5e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_5g.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_6a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_6b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_6c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/6_6cc.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/6_6d.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_1b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_2a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_2b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/7_3a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_4a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_5a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_6a.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/7_6b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_7a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_7b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_7c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_8a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/7_8b.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/7_8c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_3a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_3b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_3c.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/8_4a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_4b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_5a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_5b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_5c.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_5d.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/8_5e.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_5f.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_6a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_6b.jpg -text +eu.etaxonomy.taxeditor.help/html/img/8_6c.jpg -text svneol=unset#unset +eu.etaxonomy.taxeditor.help/html/img/9_1a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/9_2a.jpg -text +eu.etaxonomy.taxeditor.help/html/img/9_2b.jpg -text svneol=unset#unset eu.etaxonomy.taxeditor.help/html/img/blackarrow.jpg -text eu.etaxonomy.taxeditor.help/html/img/cybergate.jpg -text eu.etaxonomy.taxeditor.help/html/img/fileicon.jpg -text eu.etaxonomy.taxeditor.help/html/img/orangewarning.jpg -text eu.etaxonomy.taxeditor.help/html/img/redwarning.jpg -text -eu.etaxonomy.taxeditor.help/html/reference/maintopic.html -text -eu.etaxonomy.taxeditor.help/html/reference/subtopic.html -text -eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html -text -eu.etaxonomy.taxeditor.help/html/samples/maintopic.html -text -eu.etaxonomy.taxeditor.help/html/samples/subtopic.html -text -eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html -text -eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html -text -eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html -text -eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html -text -eu.etaxonomy.taxeditor.help/html/toc.html -text +eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html -text +eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html -text +eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html -text +eu.etaxonomy.taxeditor.help/html/nameparser/overview.html -text +eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html -text eu.etaxonomy.taxeditor.help/original_document/Taxonomic_Editor_User_Manual_Version_4.doc -text +eu.etaxonomy.taxeditor.help/p2.inf -text eu.etaxonomy.taxeditor.help/plugin.xml -text eu.etaxonomy.taxeditor.help/pom.xml -text eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text eu.etaxonomy.taxeditor.help/toc.xml -text eu.etaxonomy.taxeditor.help/tocgettingstarted.xml -text +eu.etaxonomy.taxeditor.help/tocnameparser.xml -text eu.etaxonomy.taxeditor.navigation/.classpath -text eu.etaxonomy.taxeditor.navigation/.project -text eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text @@ -810,6 +808,7 @@ eu.etaxonomy.taxeditor.navigation/icons/edit_16x16.gif -text eu.etaxonomy.taxeditor.navigation/icons/preferences-system-windows.png -text eu.etaxonomy.taxeditor.navigation/icons/system-search.png -text eu.etaxonomy.taxeditor.navigation/icons/tree_icon.jpg -text +eu.etaxonomy.taxeditor.navigation/p2.inf -text eu.etaxonomy.taxeditor.navigation/plugin.xml -text eu.etaxonomy.taxeditor.navigation/pom.xml -text eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java -text @@ -869,6 +868,7 @@ eu.etaxonomy.taxeditor.printpublisher/.classpath -text eu.etaxonomy.taxeditor.printpublisher/.project -text eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF -text eu.etaxonomy.taxeditor.printpublisher/build.properties -text +eu.etaxonomy.taxeditor.printpublisher/p2.inf -text eu.etaxonomy.taxeditor.printpublisher/plugin.xml -text eu.etaxonomy.taxeditor.printpublisher/pom.xml -text eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/PrintUtil.java -text diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index 8b302da57..ceb6ea0af 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Application Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin Bundle-Vendor: EDIT Bundle-Localization: plugin diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml index 875837524..1161b0283 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 7c9e36732..55a1de7bb 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Bulkeditor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects diff --git a/eu.etaxonomy.taxeditor.bulkeditor/build.properties b/eu.etaxonomy.taxeditor.bulkeditor/build.properties index a41e228dc..a78e9b439 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/build.properties +++ b/eu.etaxonomy.taxeditor.bulkeditor/build.properties @@ -4,5 +4,4 @@ bin.includes = META-INF/,\ .,\ icons/,\ plugin.xml,\ - build.properties,\ p2.inf diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml index dc41b99d4..3743f2351 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java index 127ffc81c..f8014e3a3 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java @@ -38,7 +38,7 @@ public class DeleteObjectHandler extends AbstractHandler { if (editor instanceof AnnotatedLineEditor) { - ISelection selection = HandlerUtil.getActiveMenuSelection(event); + ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof TextSelection) { // Get current line diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java index bc11b149b..98491db14 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java @@ -51,7 +51,7 @@ public class SetMergeTargetHandler extends AbstractHandler { (LineAnnotationModel) provider.getAnnotationModel(input); IDocument document = provider.getDocument(input); - ISelection selection = HandlerUtil.getActiveMenuSelection(event); + ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof TextSelection) { Annotation annotation = null; diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index f9f77bc0b..462af1f66 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -107,13 +107,14 @@ - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 9ca1c66d0..c643d046b 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDM Library Dependencies Plugin Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Eclipse-BundleShape: dir Export-Package: com.google.api, com.google.api.detect, @@ -877,11 +877,12 @@ Bundle-ClassPath: ., lib/xsltc.jar, lib/xstream-1.3.1.jar, lib/hibernate-envers-3.4.0-SNAPSHOT.jar, - lib/cdmlib-commons-3.0.10-SNAPSHOT.jar, - lib/cdmlib-ext-3.0.10-SNAPSHOT.jar, - lib/cdmlib-io-3.0.10-SNAPSHOT.jar, - lib/cdmlib-model-3.0.10-SNAPSHOT.jar, - lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar, - lib/cdmlib-print-3.0.10-SNAPSHOT.jar, - lib/cdmlib-remote-3.0.10-SNAPSHOT.jar, - lib/cdmlib-services-3.0.10-SNAPSHOT.jar + lib/cdmlib-commons-3.0.11-SNAPSHOT.jar, + lib/cdmlib-ext-3.0.11-SNAPSHOT.jar, + lib/cdmlib-io-3.0.11-SNAPSHOT.jar, + lib/cdmlib-model-3.0.11-SNAPSHOT.jar, + lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar, + lib/cdmlib-print-3.0.11-SNAPSHOT.jar, + lib/cdmlib-remote-3.0.11-SNAPSHOT.jar, + lib/cdmlib-services-3.0.11-SNAPSHOT.jar, + lib/spring-xml-1.5.6.jar diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index 7029e7238..d3df602cf 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -1,5 +1,4 @@ bin.includes = META-INF/,\ - lib/,\ lib/junit-4.8.1src.zip,\ lib/org.springframework.aop-3.0.4.RELEASEsrc.zip,\ lib/org.springframework.asm-3.0.4.RELEASEsrc.zip,\ @@ -65,7 +64,6 @@ bin.includes = META-INF/,\ lib/jsr250-api-1.0.jar,\ lib/jta.jar,\ lib/jtds-1.2.2.jar,\ - lib/junit-4.4.jar,\ lib/junit-4.8.1.jar,\ lib/log4j-1.2.14.jar,\ lib/lsid-client-1.1.2.jar,\ @@ -122,27 +120,19 @@ bin.includes = META-INF/,\ lib/xstream-1.3.1.jar,\ lib/poi-3.6.jar,\ lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-commons-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-io-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-model-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-print-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-remote-3.0.10-SNAPSHOT.jar,\ - lib/cdmlib-services-3.0.10-SNAPSHOT.jar + lib/cdmlib-commons-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-ext-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-io-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-model-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-print-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-remote-3.0.11-SNAPSHOT.jar,\ + lib/cdmlib-services-3.0.11-SNAPSHOT.jar,\ + lib/spring-xml-1.5.6.jar jars.compile.order = cdmLibrary.jar src.includes = lib/ -jre.compilation.profile = J2SE-1.6 bin.excludes = lib/activation-1.1src.zip,\ lib/c3p0-0.9.1src.zip,\ - lib/cdmlib-commons-3.0-sources.jar,\ - lib/cdmlib-ext-3.0-sources.jar,\ - lib/cdmlib-io-3.0-sources.jar,\ - lib/cdmlib-model-3.0-sources.jar,\ - lib/cdmlib-persistence-3.0-sources.jar,\ - lib/cdmlib-print-3.0-sources.jar,\ - lib/cdmlib-remote-3.0-sources.jar,\ - lib/cdmlib-services-3.0-sources.jar,\ lib/commons-beanutils-1.7.0src.zip,\ lib/commons-collections-3.2src.zip,\ lib/commons-dbcp-1.2.2src.zip,\ @@ -188,19 +178,8 @@ bin.excludes = lib/activation-1.1src.zip,\ lib/slf4j-log4j12-1.5.2src.zip,\ lib/spring-modules-cache-0.7src.zip,\ lib/spring-modules-lucene-0.8asrc.zip,\ - lib/spring-security-core-3.0.0.RELEASEsrc.zip,\ lib/wsdl4j-1.6.1src.zip,\ lib/xml-resolver-1.2src.zip,\ lib/xstream-1.3.1src.zip,\ - lib/junit-4.8.1src.zip,\ - lib/cdmlib-services-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-remote-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-print-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-persistence-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-model-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-io-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-ext-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-commons-3.0.6-SNAPSHOT-sources.jar,\ - lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.0.6-SNAPSHOT.jar + lib/junit-4.8.1src.zip diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar new file mode 100644 index 0000000000000000000000000000000000000000..2a95501a84588cb5d40039ac920e85d192e9d50c GIT binary patch literal 91163 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 Z{1OUSG@kEEC_)4f0DBbtz~mR={{Y3VF7^Nb literal 0 HcmV?d00001 diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml index 538fe74e1..ee91d2e92 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.cdmlib diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index a69d5cfbc..2ae37f940 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Editor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml index 65ce1b18a..408559a75 100644 --- a/eu.etaxonomy.taxeditor.editor/plugin.xml +++ b/eu.etaxonomy.taxeditor.editor/plugin.xml @@ -85,6 +85,13 @@ name="Concept Relations" restorable="true"> + + @@ -156,6 +163,21 @@ value="eu.etaxonomy.taxeditor.editor.view.concept"> + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml index 8918f66df..5349b805f 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java index 7e0c39fd9..65403941d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java @@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.IClassificationService; import eu.etaxonomy.cdm.api.service.ITaxonNodeService; import eu.etaxonomy.cdm.api.service.ITaxonService; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.ITreeNode; import eu.etaxonomy.cdm.model.taxon.Synonym; @@ -108,8 +109,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).find(taxonBaseUuid); - if(taxonBase instanceof Taxon){ - Taxon taxon = (Taxon) taxonBase; + if(taxonBase.isInstanceOf(Taxon.class)){ + Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class); if (taxon.isMisapplication()){ // TODO get accepted taxon diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java index d1d4a917d..c0a5a57ef 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java @@ -42,7 +42,7 @@ public class CreateNodeHandler extends AbstractHandler { .getActiveEditor(); IStructuredSelection selection = (IStructuredSelection) HandlerUtil - .getActiveMenuSelection(event); + .getCurrentSelection(event); if (selection.getFirstElement() instanceof PolytomousKeyNode) { try { diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java index d9e42c575..988564378 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java @@ -49,7 +49,7 @@ public class DeleteNodeHandler extends AbstractHandler { .getActiveEditor(); IStructuredSelection selection = (IStructuredSelection) HandlerUtil - .getActiveMenuSelection(event); + .getCurrentSelection(event); if (selection.getFirstElement() instanceof PolytomousKeyNode) { try { diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java index bd7c846a8..b710737bc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java @@ -63,7 +63,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme } // Get synonym from selection - StructuredSelection selection = (StructuredSelection) HandlerUtil.getActiveMenuSelection(event); + StructuredSelection selection = (StructuredSelection) HandlerUtil.getCurrentSelection(event); if (!(selection.getFirstElement() instanceof Synonym)) { logger.error("Selection does not contain a Synonym"); return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java index 49048fe82..4d19f059c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java @@ -49,7 +49,7 @@ public class CreateSynonymInHomotypicalGroupHandler extends AbstractHandler public Object execute(ExecutionEvent event) throws ExecutionException { TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage( Page.NAME); - ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event); + ISelection menuSelection = HandlerUtil.getCurrentSelection(event); Object selecteObject = ((StructuredSelection) menuSelection).getFirstElement(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java index c5d5cf8e1..c3b6b015a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java @@ -45,7 +45,7 @@ public class RemoveBasionymHandler extends AbstractHandler implements IHandler { TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage( Page.NAME); - IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelection(event); + IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event); TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java index 20442c61b..5a5ece4cf 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java @@ -45,7 +45,7 @@ public class SetBasionymHandler extends AbstractHandler implements IHandler { TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage( Page.NAME); - IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelection(event); + IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event); TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java index f44d0b151..4aa081d5c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java @@ -58,7 +58,8 @@ public class ConceptViewPart extends AbstractCdmEditorViewPart { } if(part instanceof AbstractGraphKeyEditor){ - + showEmptyPage(); + return; } if(part instanceof MultiPageTaxonEditor){ diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java new file mode 100644 index 000000000..d444bc6d8 --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java @@ -0,0 +1,107 @@ +/** + * + */ +package eu.etaxonomy.taxeditor.editor.view.concept.graph; + +import java.util.Set; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.zest.core.viewers.IGraphContentProvider; + + + +import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; +import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; + +/** + * @author andreas + * + */ +public class ConceptGraphContentProvider implements IGraphContentProvider { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#dispose() + */ + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) + */ + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.zest.core.viewers.IGraphContentProvider#getSource(java.lang.Object) + */ + @Override + public Object getSource(Object taxonRelationship) { + return ((TaxonRelationship)taxonRelationship).getFromTaxon(); + } + + /* (non-Javadoc) + * @see org.eclipse.zest.core.viewers.IGraphContentProvider#getDestination(java.lang.Object) + */ + @Override + public Object getDestination(Object taxonRelationship) { + return ((TaxonRelationship)taxonRelationship).getToTaxon(); + } + + /* (non-Javadoc) + * @see org.eclipse.zest.core.viewers.IGraphContentProvider#getElements(java.lang.Object) + */ + @Override + public Object[] getElements(Object inputElement) { + if(inputElement instanceof TaxonEditorInput){ + Taxon taxon = ((TaxonEditorInput) inputElement).getTaxon(); + + Map filteredTaxonRelations = new HashMap(); + getTaxonRelationshipsRecursive(filteredTaxonRelations, taxon); + + return filteredTaxonRelations.values().toArray(); + } + return new Object[0]; + } + + private void getTaxonRelationshipsRecursive(Map filteredTaxonRelations, Taxon taxon) { + // TODO extract method into new class TaxonHelper in + // eu.etaxonomy.taxeditor.model; + // see also ConceptContentProvider + for (TaxonRelationship relationship : taxon.getTaxonRelations()) { + + if (!relationship.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) + && !relationship.getType().equals(TaxonRelationshipType.INVALID_DESIGNATION_FOR()) + && !relationship.getType().equals(TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN())) { + + if(!relationship.getToTaxon().equals(taxon)){ + continue; + } + + String key = relationship.getFromTaxon().getUuid().toString() + relationship.getType().getUuid(); + if(!filteredTaxonRelations.containsKey(key)) { + filteredTaxonRelations.put(key, relationship); + Taxon toTaxon = relationship.getToTaxon(); + if(toTaxon != null){ + getTaxonRelationshipsRecursive(filteredTaxonRelations, toTaxon); + + } + } + } + + + } + + + } + +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java new file mode 100644 index 000000000..fe431c89c --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java @@ -0,0 +1,86 @@ +/** + * + */ +package eu.etaxonomy.taxeditor.editor.view.concept.graph; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Label; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Color; +import org.eclipse.zest.core.viewers.IEntityStyleProvider; + +import eu.etaxonomy.cdm.model.common.Language; +import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * @author andreas + * + */ +public class ConceptGraphLabelProvider extends LabelProvider implements + IEntityStyleProvider { + + + + @Override + public String getText(Object element) { + if(element instanceof Taxon){ + return ((Taxon)element).getTitleCache(); + } else if( element instanceof TaxonRelationship) { + return ((TaxonRelationship)element).getType().getRepresentation(Language.ENGLISH()).getAbbreviatedLabel(); + } + return "TODO"; + } + + @Override + public Color getNodeHighlightColor(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Color getBorderColor(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Color getBorderHighlightColor(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getBorderWidth(Object entity) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public Color getBackgroundColour(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Color getForegroundColour(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public IFigure getTooltip(Object element) { + if( element instanceof TaxonRelationship) { + return new Label(((TaxonRelationship)element).getType().getRepresentation(CdmStore.getDefaultLanguage()).getLabel()); + } + return null; + } + + @Override + public boolean fisheyeNode(Object entity) { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java new file mode 100644 index 000000000..c7a2f9c06 --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java @@ -0,0 +1,128 @@ +/** + * + */ +package eu.etaxonomy.taxeditor.editor.view.concept.graph; + +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.zest.core.viewers.GraphViewer; +import org.eclipse.zest.core.widgets.ZestStyles; +import org.eclipse.zest.layouts.LayoutAlgorithm; +import org.eclipse.zest.layouts.LayoutStyles; +import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm; + +import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; +import eu.etaxonomy.taxeditor.editor.EditorUtil; +import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; +import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor; +import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart; + +/** + * @author andreas + * + */ +public class ConceptGraphView extends AbstractCdmEditorViewPart { + + public static final String ID = "eu.etaxonomy.taxeditor.editor.view.concept.graph"; + + private GraphViewer viewer; + private LayoutAlgorithm layoutAlgoritm; + + /* (non-Javadoc) + * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) + */ + @Override + public void selectionChanged(IWorkbenchPart part, ISelection selection) { + +// if(part instanceof ConceptGraphView){ +// // ConceptGraphView is maximized +// return; +// } + + if(EditorUtil.getActiveEditor() == null){ + showEmptyPage(); + return; + } + + if(part instanceof BulkEditor){ + showEmptyPage(); + return; + } + + + if(part instanceof MultiPageTaxonEditor){ + if(! part.equals(this.part)){ + IEditorInput input = ((IEditorPart) part).getEditorInput(); + showViewer(part, new StructuredSelection(input)); + } + showViewer(); + } + + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#onComplete() + */ + @Override + public boolean onComplete() { + // TODO IGNORED + return false; + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.view.AbstractCdmViewPart#getViewer() + */ + @Override + public Viewer getViewer() { + return viewer; + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.view.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createViewer(Composite parent) { + + viewer = new GraphViewer(parent, SWT.NONE); + getSite().setSelectionProvider(viewer); + + viewer.setContentProvider(new ConceptGraphContentProvider()); + viewer.setLabelProvider(new ConceptGraphLabelProvider()); + + viewer.setConnectionStyle(ZestStyles.CONNECTIONS_DIRECTED); + + viewer.setLayoutAlgorithm(getLayoutAlgoritm(), false); + +// createMenu(); +// +// createToolbar(); + + + } + + private LayoutAlgorithm getLayoutAlgoritm() { + + if (layoutAlgoritm == null) { + // layoutAlgoritm = new CompositeLayoutAlgorithm( + // LayoutStyles.NO_LAYOUT_NODE_RESIZING, + // new LayoutAlgorithm[] { + // new TreeLayoutAlgorithm( + // LayoutStyles.NO_LAYOUT_NODE_RESIZING), + // new HorizontalShift( + // LayoutStyles.NO_LAYOUT_NODE_RESIZING) }); + + layoutAlgoritm = new TreeLayoutAlgorithm( + LayoutStyles.NO_LAYOUT_NODE_RESIZING); + layoutAlgoritm.setEntityAspectRatio(0.5); + } + return layoutAlgoritm; + } + +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java index 4ba5ee029..533d3b886 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java @@ -10,10 +10,13 @@ package eu.etaxonomy.taxeditor.editor.view.concept.handler; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.common.NotDefinedException; +import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.runtime.Status; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.IWorkbenchPart; @@ -37,7 +40,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonBaseSelectionDialog; * @version 1.0 */ public class CreateConceptRelationHandler extends AbstractHandler { - + /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ @@ -48,15 +51,22 @@ public class CreateConceptRelationHandler extends AbstractHandler { Taxon taxonToBeFiltered = editor.getTaxon(); + /* we need to get the activePart before calling TaxonBaseSelectionDialog.selectTaxon(), otherwise the + * the variable of the parent applicationContext in event are overwritten during this method call + * this is Linux specific bugfix see: #2685 ([LINUX] Editing concept relationships does not work under linux) + */ + IWorkbenchPart activePart = HandlerUtil.getActivePart(event); + Taxon relatedConcept = TaxonBaseSelectionDialog.selectTaxon(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), taxonToBeFiltered); - + + if(relatedConcept == null){ return Status.CANCEL_STATUS; } TaxonRelationshipTypeInverseContainer typeInverseContainer = (TaxonRelationshipTypeInverseContainer) ((Event)event.getTrigger()).data; - IWorkbenchPart activePart = HandlerUtil.getActivePart(event); + IPostOperationEnabled postOperationEnabled = (activePart instanceof IPostOperationEnabled) ? (IPostOperationEnabled) activePart : null; try { diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java index 317ae6a6d..502d9b94b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java @@ -39,7 +39,7 @@ public class OpenRelatedConceptHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MultiPageTaxonEditor editor = EditorUtil.getActiveMultiPageTaxonEditor(); - ISelection selection = HandlerUtil.getActiveMenuSelection(event); + ISelection selection = HandlerUtil.getCurrentSelection(event); if(selection instanceof IStructuredSelection){ IStructuredSelection structuredSelection = (IStructuredSelection) selection; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java index 9b690254b..29079f925 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java @@ -71,7 +71,7 @@ public class CreateConceptRelationOperation extends AbstractPostOperation { if(taxonRelationshipTypeInverseContainer.isInverse()){ concept.addTaxonRelation(taxon, taxonRelationshipTypeInverseContainer.getType(), null, null); } else { - taxon.addTaxonRelation(concept, taxonRelationshipTypeInverseContainer.getType(), null, null); + taxon.addTaxonRelation(concept, taxonRelationshipTypeInverseContainer.getType(), null, null); } monitor.worked(40); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java index 174d83ed0..618d9c0ee 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java @@ -66,7 +66,7 @@ public class CreateDescriptionElementHandler extends AbstractHandler { TaxonDescription description = null; - ISelection selection = HandlerUtil.getActiveMenuSelection(event); + ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof ITreeSelection) { TreePath[] paths = ((ITreeSelection) selection).getPaths(); Object firstSegment = paths[0].getFirstSegment(); diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml index 7c99c9f60..1fe1f7066 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml @@ -2,7 +2,7 @@ @@ -916,4 +916,11 @@ Software distributed under the License is distributed on an "AS IS" ba version="0.0.0" unpack="false"/> + + diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml index 609609db9..6cec0be9f 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.feature.platform diff --git a/eu.etaxonomy.taxeditor.feature/build.properties b/eu.etaxonomy.taxeditor.feature/build.properties index f1201a6d3..30f68d152 100644 --- a/eu.etaxonomy.taxeditor.feature/build.properties +++ b/eu.etaxonomy.taxeditor.feature/build.properties @@ -1,5 +1,4 @@ -bin.includes = plugin_customization.ini,\ - feature.xml +bin.includes = feature.xml category.id.eu.etaxonomy=EDIT category.description.eu.etaxonomy=EDIT Taxonomic Editor diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml index 44dbec765..32785fb5c 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -2,7 +2,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 eu.etaxonomy.taxeditor.feature diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF index df9f792bb..8435c4a93 100644 --- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Help Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator Bundle-Vendor: EDIT Require-Bundle: org.eclipse.ui, diff --git a/eu.etaxonomy.taxeditor.help/build.properties b/eu.etaxonomy.taxeditor.help/build.properties index 642e42045..31a208732 100644 --- a/eu.etaxonomy.taxeditor.help/build.properties +++ b/eu.etaxonomy.taxeditor.help/build.properties @@ -4,4 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ html/,\ - *.xml + *.xml,\ + p2.inf diff --git a/eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html b/eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html deleted file mode 100644 index a476078ac..000000000 --- a/eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Topic - - - -

Main Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html b/eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html deleted file mode 100644 index 8a61c501d..000000000 --- a/eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic - - - -

Sub Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html b/eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html deleted file mode 100644 index 86bcbf9cd..000000000 --- a/eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic 2 - - - -

Sub Topic 2

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1c.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1d.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1e.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1f.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1g.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/10_1h.JPG b/eu.etaxonomy.taxeditor.help/html/img/10_1h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/10_1h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/10_1h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10c.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10d.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10e.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10f.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_10g.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_10g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_10g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_10g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_11a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_11a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_11a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_11a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_11b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_11b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_11b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_11b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_11c.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_11c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_11c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_11c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_11d.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_11d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_11d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_11d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1c.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1d.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1e.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1f.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_1g.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_1g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_1g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_1g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_3b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_3b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_3b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_3b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_3c.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_3c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_3c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_3c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_4b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_4b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_4b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_4b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_5a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_5a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_5a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_5a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_5b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_5b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_5b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_5b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_6a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_6a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_6a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_6a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_8a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_8a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_8a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_8a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_9a.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_9a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_9a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_9a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_9b.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_9b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_9b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_9b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/2_9c.JPG b/eu.etaxonomy.taxeditor.help/html/img/2_9c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/2_9c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/2_9c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_2c.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_2c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_2c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_2c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_2d.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_2d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_2d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_2d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_2e.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_2e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_2e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_2e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4b.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4c.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4d.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4e.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4f.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4g.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4h.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/3_4i.JPG b/eu.etaxonomy.taxeditor.help/html/img/3_4i.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/3_4i.JPG rename to eu.etaxonomy.taxeditor.help/html/img/3_4i.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1c.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1d.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1e.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1f.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1g.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1h.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1i.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1i.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1i.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1i.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1j.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1j.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1j.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1j.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1k.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1k.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1k.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1k.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_1l.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_1l.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_1l.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_1l.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_2c.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_2c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_2c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_2c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_2d_text.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_2d_text.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_2d_text.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_2d_text.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3aa.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3aa.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3aa.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3aa.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3b.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3bb.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3bb.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3bb.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3bb.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3c.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3cc.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3cc.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3cc.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3cc.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3d.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3e.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3f.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3g.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3h.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3i.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3i.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3i.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3i.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3j.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3j.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3j.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3j.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/4_3k.JPG b/eu.etaxonomy.taxeditor.help/html/img/4_3k.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/4_3k.JPG rename to eu.etaxonomy.taxeditor.help/html/img/4_3k.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1c.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1d.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1e.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1f.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1g.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1h.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1i.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1i.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1i.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1i.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1j.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1j.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1j.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1j.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1k.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1k.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1k.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1k.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1l.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1l.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1l.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1l.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1m.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1m.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1m.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1m.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1n.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1n.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1n.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1n.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1o.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1o.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1o.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1o.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1p.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1p.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1p.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1p.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1q.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1q.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1q.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1q.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1r.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1r.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1r.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1r.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1s.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1s.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1s.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1s.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1t.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1t.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1t.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1t.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1u.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1u.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1u.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1u.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1v.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1v.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1v.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1v.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1w.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1w.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1w.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1w.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_1x.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_1x.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_1x.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_1x.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_3b.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_3b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_3b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_3b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_3c.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_3c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_3c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_3c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4b.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4c.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4d.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4e.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4f.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4g.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4h.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4h.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4h.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4h.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/5_4i.JPG b/eu.etaxonomy.taxeditor.help/html/img/5_4i.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/5_4i.JPG rename to eu.etaxonomy.taxeditor.help/html/img/5_4i.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_1c.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_1c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_1c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_1c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_1d.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_1d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_1d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_1d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2c.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2d.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2e.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_2f.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_2f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_2f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_2f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_3b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_3b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_3b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_3b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_3c.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_3c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_3c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_3c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_4b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_4b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_4b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_4b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5c.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5d.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5e.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5f.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_5g.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_5g.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_5g.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_5g.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_6a.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_6a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_6a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_6a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_6b.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_6b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_6b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_6b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_6c.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_6c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_6c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_6c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_6cc.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_6cc.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_6cc.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_6cc.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/6_6d.JPG b/eu.etaxonomy.taxeditor.help/html/img/6_6d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/6_6d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/6_6d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_1b.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_1b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_1b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_1b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_5a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_5a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_5a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_5a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_6a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_6a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_6a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_6a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_6b.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_6b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_6b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_6b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_7a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_7a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_7a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_7a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_7b.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_7b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_7b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_7b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_7c.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_7c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_7c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_7c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_8a.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_8a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_8a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_8a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_8b.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_8b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_8b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_8b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/7_8c.JPG b/eu.etaxonomy.taxeditor.help/html/img/7_8c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/7_8c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/7_8c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_3a.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_3a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_3a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_3a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_3b.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_3b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_3b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_3b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_3c.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_3c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_3c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_3c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_4a.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_4a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_4a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_4a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_4b.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_4b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_4b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_4b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5a.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5b.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5c.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5d.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5d.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5d.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5d.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5e.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5e.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5e.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5e.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_5f.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_5f.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_5f.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_5f.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_6a.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_6a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_6a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_6a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_6b.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_6b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_6b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_6b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/8_6c.JPG b/eu.etaxonomy.taxeditor.help/html/img/8_6c.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/8_6c.JPG rename to eu.etaxonomy.taxeditor.help/html/img/8_6c.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/9_1a.JPG b/eu.etaxonomy.taxeditor.help/html/img/9_1a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/9_1a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/9_1a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/9_2a.JPG b/eu.etaxonomy.taxeditor.help/html/img/9_2a.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/9_2a.JPG rename to eu.etaxonomy.taxeditor.help/html/img/9_2a.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/img/9_2b.JPG b/eu.etaxonomy.taxeditor.help/html/img/9_2b.jpg similarity index 100% rename from eu.etaxonomy.taxeditor.help/html/img/9_2b.JPG rename to eu.etaxonomy.taxeditor.help/html/img/9_2b.jpg diff --git a/eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html b/eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html new file mode 100644 index 000000000..f8a29d8f9 --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html @@ -0,0 +1,26 @@ +

Authorship Part

+ +

The authorship part is divided into the original combination authorship and the combination authorship. +The earlier is put in brackets.

+ +
+Example (bot.): (L.) Mill. 
+Example (zoo.): (XXX, 1830) XXX, 1845
+
+ +

You can use either no authorship (only if not followed by any other part), the original combination +authorship, the combination authorship or both.

+ +

The parser differentiates botanical and zoological authorship. The later has a year following the +author, separated by a comma. Botanical names only have authors. +Authorship may include single persons and teams. Team members are separated by & . A placeholder al. +may be used for further team members. Both authorships may include ex-authors separated by ex or ex. +Some valid author strings are:

+
+Example (bot.): (Greuther & L'Hiver & al. ex Müller & Schmidt) Clark ex Ciardelli 
+Example (zoo.):
+
+ +

The number of allowed special characters like ' or - at the moment is beyond the scope of this +documentation and will change in the future.

+ diff --git a/eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html b/eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html new file mode 100644 index 000000000..4fc3b1dca --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html @@ -0,0 +1,69 @@ +

Name Part

+ +

The name part recognizes uninomials, binomials and trinomials. The first epithet must start +with a capital letter; all other words (except for infrageneric epitheta) can only contain +lower-case letters. Only latin letters are allowed in names (except for ï). +The name part parser differentiates 6 different syntaxes.

+ +

Uninomials

+

One word starting with a capital letter. As the rank is usually ambiguous for uninomials, +the rank represents the parser's best guess and a warning is returned to check the rank.

+
Example: Cichorieae
+ + +

Infrageneric Names

+

Capital word followed by the infrageneric marker followed by the infrageneric epitheton. +Valid markers are: +

    +
  • subgen.
    • +
  • subg.
    • +
  • sect.
    • +
  • subsect.
    • +
  • ser.
    • +
  • subser.
    • +
  • t.infgen.
    • +
+

+
Example: Desmometopa subg. LitoXXX
+ + +

Species Aggregates

+

Species aggregates are recognized similarly to species except they are followed by a group +marker. Valid markers are: +

    +
  • aggr.
    • +
  • agg.
    • +
  • group
    • +
+

+
Example: XXX
+ + +

Species

+

Species names have a genus part (capital letter) and a species part (lower case letter).

+
Examples are: Abies alba
+ +

Infraspecific names

+

Infraspecific names have four parts: the genus part, the species part, the infraspecific +marker and the infraspecific part. All but the first may not start with a capital letter. +Recognized markers are: +

    +
  • subsp.
    • +
  • convar.
    • +
  • var.
    • +
  • subvar.
    • +
  • f.
    • +
  • subf.
    • +
  • f.spec.
    • +
  • tax.infrasp.
    • +
  • tax. infrasp.
    • +
+ +

+
Example:
+ +

Infraspecific names (old markers)

+

Some older names (not valid according to the nomenclatural code) use other infraspecific +markers. The recognition of these older names is not yet implemented.

+ + diff --git a/eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html b/eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html new file mode 100644 index 000000000..e3c5fb10a --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html @@ -0,0 +1,20 @@ +

Nomenclatural Status

+ +

The nomeclatural status is separated from the preceding text by a comma. Current valid values for a status:

+ +
    +
  • nom. superfl.
    • +
  • nom. nud.
    • +
  • nom. illeg.
    • +
  • nom. inval.
    • +
  • nom. cons.
    • +
  • nom. alternativ.
    • +
  • nom. subnud.
    • +
  • nom. rej.
    • +
  • nom. rej.
    • +
  • nom. prop.
    • +
  • nom. provis.
    • +
  • orth. var.
    • +
+ +

Multiple values separated by comma are possible.

\ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/nameparser/overview.html b/eu.etaxonomy.taxeditor.help/html/nameparser/overview.html new file mode 100644 index 000000000..ba52dd453 --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/html/nameparser/overview.html @@ -0,0 +1,51 @@ +

Name Parser Documentation

+ + +

The taxonomic name parser analyzes a free text taxonomic reference for the following four components:

+ + + +

Not all of them are required.

+ +

The four parts are separated by the following separators:

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
partseparatorexample
authorshipany whitespaceAbies alba_L.
referencecommata with following whitespace OR whitespace+'in'+whitespaceAbies alba L.,_Sp. Pl... or Pinus alba_in_Bull. Soc....
nom. statuscommata with following whitespacein Bull. Bot. 3: 99. 1987., nom illeg.
+ +

Some valid name texts fully recognized by the parser are:

+ +
+Abies alba (L.) Mill., Sp. Pl.: 105. 1846., nom illeg. 
+Abies alba (L.) Mill. in Bull. Bot. 3: 99. 1987., nom illeg.
+
+ +

The name part is required. The authorship part is required only if followed by the reference part. The reference part as well as the status part are not required. In the following sections, the four parts are described in detail:

\ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html b/eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html new file mode 100644 index 000000000..bc9ac8c01 --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html @@ -0,0 +1,50 @@ +

Reference Part

+ +

The reference part follows the syntax: {separator}{authorship{,}}{titleEditionVolume}{:}{detail}{.}{year}

+ +

Zoological new combinations should not have a reference part, since in zoology, it is not common +to mention the new combination reference.

+ +

Separator

+ +

The separator between the reference part and the preceding authorship may be a comma , or +an 

 in
(surrounded by whitespaces). The comma indicates a book whereas the in stands either +for a journal article or a book section. If the in is not followed by a comma, the parser +interprets the reference as an article; otherwise, as a book section. Reference type parsing +should be improved in future.

+ +

Reference Authorship

+ +

An author is only available for book sections. Articles and book sections are differentiated +from each other by comparing the first four words that follow the separator. If these words +include a comma and the words before the comma are likely to represent an author, the reference +is recognized as a book section. Otherwise, it will be treated as an article. In both cases, +a warning is thrown that differentiation is not possible.

+ +

TitleEditionVolume

+ +

The TitleEditionVolume part includes the title itself as well as optional edition part +and volume parts. The title itself allows most character combinations but care must be taken +if a : is included as this is the separator for the subsequent detail part. Special characters +like & and - are only allowed if preceded and followed immediately by ordinary characters. +Ordinary brackets are allowed. Edition and volume are separated by whitespace if only one +of them exists. If both exist the later is separated by a comma. Both are optional, so all +four of the following formats are valid:

+ +
+Sp. Pl.
+Sp. Pl. ed. 3
+Sp. Pl. ed. 3, 4
+Sp. Pl. 4
+
+ +

As can be seen, the edition is recognized by a preceding ed., whereas the volume is just +a number (or a number followed by another number in brackets - e.g. 4(5) ).

+ +

The detail part is separated by a column : from the preceding titleEditonVolume part and +is separated from the year by . (botanical names only). A number of typical detail information +is recognized as either pure page numbers (345) or ranges (345-348). Page numbers may be +preceded by p.(e.g. p. 345) or pp.(e.g. pp. 345-348). Abbreviations indicating special parts of a +reference such as fig. or tab. are recognized as well. Roman numbers are not detected +at the moment.

+ diff --git a/eu.etaxonomy.taxeditor.help/html/reference/maintopic.html b/eu.etaxonomy.taxeditor.help/html/reference/maintopic.html deleted file mode 100644 index a476078ac..000000000 --- a/eu.etaxonomy.taxeditor.help/html/reference/maintopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Topic - - - -

Main Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/reference/subtopic.html b/eu.etaxonomy.taxeditor.help/html/reference/subtopic.html deleted file mode 100644 index 8a61c501d..000000000 --- a/eu.etaxonomy.taxeditor.help/html/reference/subtopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic - - - -

Sub Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html b/eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html deleted file mode 100644 index 86bcbf9cd..000000000 --- a/eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic 2 - - - -

Sub Topic 2

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/samples/maintopic.html b/eu.etaxonomy.taxeditor.help/html/samples/maintopic.html deleted file mode 100644 index a476078ac..000000000 --- a/eu.etaxonomy.taxeditor.help/html/samples/maintopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Topic - - - -

Main Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/samples/subtopic.html b/eu.etaxonomy.taxeditor.help/html/samples/subtopic.html deleted file mode 100644 index 8a61c501d..000000000 --- a/eu.etaxonomy.taxeditor.help/html/samples/subtopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic - - - -

Sub Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html b/eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html deleted file mode 100644 index 86bcbf9cd..000000000 --- a/eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic 2 - - - -

Sub Topic 2

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html b/eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html deleted file mode 100644 index a476078ac..000000000 --- a/eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Main Topic - - - -

Main Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html b/eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html deleted file mode 100644 index 8a61c501d..000000000 --- a/eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic - - - -

Sub Topic

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html b/eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html deleted file mode 100644 index 86bcbf9cd..000000000 --- a/eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Sub Topic 2 - - - -

Sub Topic 2

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/html/toc.html b/eu.etaxonomy.taxeditor.help/html/toc.html deleted file mode 100644 index 326f0a9ff..000000000 --- a/eu.etaxonomy.taxeditor.help/html/toc.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Table of Contents - - - -

Table of Contents

-Please enter your text here. - - \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/p2.inf b/eu.etaxonomy.taxeditor.help/p2.inf new file mode 100644 index 000000000..cdeccf81b --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/p2.inf @@ -0,0 +1,3 @@ +instructions.configure=\ + addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\ + addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update); \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.help/plugin.xml b/eu.etaxonomy.taxeditor.help/plugin.xml index 027ed0fee..db9b794ef 100644 --- a/eu.etaxonomy.taxeditor.help/plugin.xml +++ b/eu.etaxonomy.taxeditor.help/plugin.xml @@ -9,7 +9,12 @@ primary="true"> + file="tocgettingstarted.xml" + primary="false"> + + diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml index 4a4569e3e..c3827e82b 100644 --- a/eu.etaxonomy.taxeditor.help/pom.xml +++ b/eu.etaxonomy.taxeditor.help/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.help/toc.xml b/eu.etaxonomy.taxeditor.help/toc.xml index 011941785..92e4369ca 100644 --- a/eu.etaxonomy.taxeditor.help/toc.xml +++ b/eu.etaxonomy.taxeditor.help/toc.xml @@ -1,8 +1,11 @@ - + + + + diff --git a/eu.etaxonomy.taxeditor.help/tocnameparser.xml b/eu.etaxonomy.taxeditor.help/tocnameparser.xml new file mode 100644 index 000000000..b249a5a59 --- /dev/null +++ b/eu.etaxonomy.taxeditor.help/tocnameparser.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index e0f5bc940..6733f8fdd 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Navigation Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.taxeditor.navigation, diff --git a/eu.etaxonomy.taxeditor.navigation/p2.inf b/eu.etaxonomy.taxeditor.navigation/p2.inf new file mode 100644 index 000000000..cdeccf81b --- /dev/null +++ b/eu.etaxonomy.taxeditor.navigation/p2.inf @@ -0,0 +1,3 @@ +instructions.configure=\ + addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\ + addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update); \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml index af4e756df..c5859503c 100644 --- a/eu.etaxonomy.taxeditor.navigation/plugin.xml +++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml @@ -523,7 +523,7 @@ + variable="selection"> @@ -534,7 +534,7 @@ + variable="selection"> @@ -545,7 +545,7 @@ + variable="selection"> diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml index 6c3838bb6..50aef647c 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index b0c2eda30..529b489e8 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Printpublisher Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Require-Bundle: org.eclipse.osgi, org.eclipse.ui, eu.etaxonomy.taxeditor.cdmlib, diff --git a/eu.etaxonomy.taxeditor.printpublisher/build.properties b/eu.etaxonomy.taxeditor.printpublisher/build.properties index 43cb29eda..5589fdf94 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/build.properties +++ b/eu.etaxonomy.taxeditor.printpublisher/build.properties @@ -1,4 +1,5 @@ source.. = src/main/java/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + p2.inf diff --git a/eu.etaxonomy.taxeditor.printpublisher/p2.inf b/eu.etaxonomy.taxeditor.printpublisher/p2.inf new file mode 100644 index 000000000..cdeccf81b --- /dev/null +++ b/eu.etaxonomy.taxeditor.printpublisher/p2.inf @@ -0,0 +1,3 @@ +instructions.configure=\ + addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\ + addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update); \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml index 338d0e0b6..975491608 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -4,7 +4,7 @@ taxeditor-parent eu.etaxonomy - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 1e01f81af..e21859cb7 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: DataStore Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true -Bundle-Version: 3.0.10.qualifier +Bundle-Version: 3.0.11.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.cdm, diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 0acea993e..c9cc810b9 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -949,7 +949,7 @@ + variable="selection"> @@ -958,7 +958,7 @@ + variable="selection"> @@ -967,7 +967,7 @@ + variable="selection"> diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml index 6256464f0..f1f3679c5 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java index 6c9e0f483..e7ca0952d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java @@ -9,18 +9,15 @@ */ package eu.etaxonomy.taxeditor.editor.definedterm; -import java.util.HashSet; -import java.util.Set; - import org.eclipse.core.expressions.PropertyTester; import org.eclipse.jface.viewers.IStructuredSelection; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.cdm.model.common.TermVocabulary; -import eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement; /** * @author l.morris @@ -40,10 +37,13 @@ public class TermBasePropertyTester extends PropertyTester { Object expectedValue) { IStructuredSelection selection = (IStructuredSelection) receiver; - TermBase selectedElement = (TermBase) selection.getFirstElement(); - - if(IS_MODIFIABLE.equals(property)){ - return isModifiable(selectedElement); + CdmBase selectedElement = (CdmBase)selection.getFirstElement(); + if (selectedElement != null && selectedElement.isInstanceOf(TermBase.class)){ + TermBase term = CdmBase.deproxy(selectedElement, TermBase.class); + + if(IS_MODIFIABLE.equals(property)){ + return isModifiable(term); + } } return false; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java index 516815078..4c6e6c79d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java @@ -62,4 +62,13 @@ public class TextHelper { return textValue; } + + public static String deproxyClassName(Class clazz){ + String name = clazz.getSimpleName(); + if (name.indexOf("_$$")>-1){ + return name.substring(0, name.indexOf("_$$")); + }else{ + return name; + } + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java index fee26b5c6..f2657aae1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java @@ -50,9 +50,16 @@ public abstract class AbstractNewEntityWizard extends Wizard implements * @param a T object. */ public AbstractNewEntityWizard(){ - setWindowTitle("New Entity"); + setWindowTitle(String.format("New %s", getEntityName())); } + /** + * FIXME there might be a smarter way to do this, + * + * @return + */ + protected abstract String getEntityName(); + /* (non-Javadoc) * @see org.eclipse.jface.wizard.Wizard#performFinish() */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java index b105ac6a6..6b23b4bc0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java @@ -32,7 +32,7 @@ public class NewClassificationWizard extends AbstractNewEntityWizard { protected Collection createNewEntity() { return Collection.NewInstance(); } + + @Override + protected String getEntityName() { + return "Collection"; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java index d64adb137..d132f0544 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java @@ -72,4 +72,11 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard { return Group.NewInstance(); } + @Override + protected String getEntityName() { + return "Group"; + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java index 50e1117d3..1eba0be64 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java @@ -46,4 +46,9 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard { return Institution.NewInstance(); } + @Override + protected String getEntityName() { + return "Institution"; + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java index c82a842be..9ab033f49 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java @@ -51,4 +51,9 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard protected void saveEntity() { CdmStore.getService(INameService.class).saveOrUpdate(getEntity()); } + + @Override + protected String getEntityName() { + return "Scientific Name"; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java index 226871334..da1878766 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java @@ -41,4 +41,9 @@ public class NewPersonWizard extends AbstractNewEntityWizard { protected void saveEntity() { CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity()); } + + @Override + protected String getEntityName() { + return "Person"; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java index ec67349a0..7b7624a73 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java @@ -35,4 +35,9 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard { super.setEntity(entity); referencePage.getDetailElement().setEntity(entity); } + + @Override + protected String getEntityName() { + return "Reference"; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java index 983785da1..f0e65cbd5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java @@ -105,5 +105,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard{ public ITreeNode getParentTreeNode(){ return taxonNodePage.getParentTreeNode(); } + + @Override + protected String getEntityName() { + return "Taxon"; + } } \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java index 4e50f0c6b..050b59843 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java @@ -44,4 +44,9 @@ public class NewTeamWizard extends AbstractNewEntityWizard { protected void saveEntity() { CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity()); } + + @Override + protected String getEntityName() { + return "Team"; + } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java index 61243981c..aa3cd19dd 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java @@ -32,4 +32,9 @@ public class NewUserWizard extends AbstractNewEntityWizard { return User.NewInstance(null, null); } + @Override + protected String getEntityName() { + return "Institution"; + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java index 17e8eb8e8..c43ac73e0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java @@ -196,9 +196,9 @@ public class TermComboElement + ", " + term.getUuid()); } else { label = "Unknown"; - StoreUtil.error(getClass(), + StoreUtil.warn(getClass(), "Representation Label and TitleCache empty for term: " - + term + ", " + term.getUuid(), null); + + term + ", " + term.getUuid()); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java index 64e95d95b..2cf643d51 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java @@ -52,12 +52,13 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl @Override protected void createControls(ICdmFormElement formElement, CommonTaxonName entity, int style) { + commonName = formFactory.createTextWithLabelElement(this, "Common Name", entity.getName(), SWT.WRAP); + combo_language = formFactory.createTermComboElement(Language.class, this, "Language", entity.getLanguage(), style); selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(), formElement, "Area", entity.getArea(), EntitySelectionElement.NOTHING, style); - commonName = formFactory.createTextWithLabelElement(this, "Common Name", entity.getName(), SWT.WRAP); } /** {@inheritDoc} */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java index 990ca4c5e..9fd82032e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java @@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.description.detail; import java.util.Map; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.description.IndividualsAssociation; @@ -68,7 +69,7 @@ public class IndividualsAssociationDetailElement extends selection_derivedUnit = formFactory .createSelectionElement(DerivedUnitBase.class, getConversationHolder(), formElement, "Unit", - (DerivedUnitBase) entity.getAssociatedSpecimenOrObservation(), + CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnitBase.class), EntitySelectionElement.ALL, style); text_description = formFactory.createMultilineTextWithLabel( diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java index bc6a2240f..95221da5e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java @@ -63,7 +63,7 @@ public class TaxonInteractionDetailElement extends TaxonInteraction entity, int style) { taxonSelection = formFactory .createSelectionElement(Taxon.class, - getConversationHolder(), this, null, + getConversationHolder(), this, "Taxon", entity.getTaxon2(), EntitySelectionElement.NOTHING, SWT.WRAP); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java index d68e8fcae..f628e9e26 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java @@ -15,6 +15,7 @@ import java.util.Arrays; import org.eclipse.swt.SWT; import eu.etaxonomy.cdm.model.name.BotanicalName; +import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.ZoologicalName; @@ -119,13 +120,16 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement - + diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index f351f7297..786dcc149 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 672005895..f25532b77 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.etaxonomy taxeditor-parent - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT EDIT Taxonomic Editor The Taxonomic Editor for EDIT's platform for cybertaxonomy http://wp5.e-taxonomy.eu @@ -14,9 +14,9 @@ pom UTF-8 - 3.0.10-SNAPSHOT - 0.13.0 - 3.0.10-SNAPSHOT + 3.0.11-SNAPSHOT + 0.14.0 + 3.0.11-SNAPSHOT eu.etaxonomy.taxeditor.cdmlib @@ -315,6 +315,15 @@ 1.0-beta-2 + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + -- 2.34.1