AT:Committing changes post merge
authora.theys <a.theys@localhost>
Fri, 22 Jun 2012 18:26:43 +0000 (18:26 +0000)
committera.theys <a.theys@localhost>
Fri, 22 Jun 2012 18:26:43 +0000 (18:26 +0000)
279 files changed:
.gitattributes
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/build.properties
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphContentProvider.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphLabelProvider.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/ConceptGraphView.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/build.properties
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/build.properties
eu.etaxonomy.taxeditor.help/html/concepts/maintopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/concepts/subtopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/concepts/subtopic2.html [deleted file]
eu.etaxonomy.taxeditor.help/html/img/10_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/10_1h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/10_1h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_10g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_10g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_11a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_11a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_11b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_11b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_11c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_11c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_11d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_11d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_1g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_1g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_3b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_3b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_3c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_3c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_4b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_4b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_5a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_5a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_5b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_5b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_6a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_6a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_8a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_8a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_9a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_9a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_9b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_9b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/2_9c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/2_9c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_2c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_2c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_2d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_2d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_2e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_2e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/3_4i.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/3_4i.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1i.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1i.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1j.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1j.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1k.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1k.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_1l.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_1l.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_2c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_2c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_2d_text.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_2d_text.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3aa.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3aa.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3bb.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3bb.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3cc.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3cc.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3i.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3i.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3j.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3j.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/4_3k.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/4_3k.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1i.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1i.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1j.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1j.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1k.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1k.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1l.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1l.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1m.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1m.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1n.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1n.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1o.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1o.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1p.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1p.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1q.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1q.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1r.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1r.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1s.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1s.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1t.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1t.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1u.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1u.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1v.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1v.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1w.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1w.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_1x.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_1x.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_3b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_3b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_3c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_3c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4h.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4h.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/5_4i.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/5_4i.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_1c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_1c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_1d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_1d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_2f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_2f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_3b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_3b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_3c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_3c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_4b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_4b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_5g.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_5g.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_6a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_6a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_6b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_6b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_6c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_6c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_6cc.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_6cc.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/6_6d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/6_6d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_1b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_1b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_5a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_5a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_6a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_6a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_6b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_6b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_7a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_7a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_7b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_7b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_7c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_7c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_8a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_8a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_8b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_8b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/7_8c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/7_8c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_3a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_3a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_3b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_3b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_3c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_3c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_4a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_4a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_4b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_4b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5d.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5d.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5e.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5e.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_5f.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_5f.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_6a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_6a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_6b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_6b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/8_6c.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/8_6c.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/9_1a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/9_1a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/9_2a.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/9_2a.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/img/9_2b.jpg [moved from eu.etaxonomy.taxeditor.help/html/img/9_2b.JPG with 100% similarity]
eu.etaxonomy.taxeditor.help/html/nameparser/authorship_part.html [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/html/nameparser/name_part.html [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/html/nameparser/overview.html [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/html/reference/maintopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/reference/subtopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/reference/subtopic2.html [deleted file]
eu.etaxonomy.taxeditor.help/html/samples/maintopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/samples/subtopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/samples/subtopic2.html [deleted file]
eu.etaxonomy.taxeditor.help/html/tasks/maintopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/tasks/subtopic.html [deleted file]
eu.etaxonomy.taxeditor.help/html/tasks/subtopic2.html [deleted file]
eu.etaxonomy.taxeditor.help/html/toc.html [deleted file]
eu.etaxonomy.taxeditor.help/p2.inf [new file with mode: 0644]
eu.etaxonomy.taxeditor.help/plugin.xml
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.help/toc.xml
eu.etaxonomy.taxeditor.help/tocnameparser.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/p2.inf [new file with mode: 0644]
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/build.properties
eu.etaxonomy.taxeditor.printpublisher/p2.inf [new file with mode: 0644]
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGroupWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 16f83836f99adef7747442e0f00901b6b79c367b..6bda220b50eacf8e33569d65b982b7eed3d728a2 100644 (file)
@@ -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
index 8b302da571b521d4bc46741b8f4e888e1b28bb6e..ceb6ea0afe339f8041196bfdece2f1c99d0017da 100644 (file)
@@ -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
index 875837524ee9acded3e6cbc9b5ed4783502f51dd..1161b02833ec6840bd65a3b31bbfaa3b84f70f61 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 7c9e36732563f1232a93140190b51743779852da..55a1de7bb77e96f77bc84b09d31c1ac32b4fe011 100644 (file)
@@ -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
index a41e228dcfe1d6ffb0e29108af99a9fedef97e60..a78e9b43982761539c4a02f7e1b75d9981143088 100644 (file)
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
                .,\\r
                icons/,\\r
                plugin.xml,\\r
-               build.properties,\\r
                p2.inf\r
index dc41b99d4667474615908761b3a37cd9398a2574..3743f23510a30b1acdde5e87cd0322dcc9d915bd 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 127ffc81cabb34700e61f509b414452fe4c3ef91..f8014e3a3b29bfe0ab41f255d7f8285d29791498 100644 (file)
@@ -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
index bc11b149bc1ac9d4d2df51f66e414fce1893fd00..98491db149451b2a5e54fa5fefdd4b0a52140d77 100644 (file)
@@ -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;
                                
index f9f77bc0b80151061c247b3ebc1113f4505c4515..462af1f667e5716c725b1466c7e43d8414896942 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.10-SNAPSHOT.jar" sourcepath="/cdmlib-model"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.10-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.10-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.11-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 9ca1c66d01faf7c7fde3e662715688b9cea22d65..c643d046b69edfca6f6f07f08634f26f31b7875a 100644 (file)
@@ -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
index 7029e7238058fe1f191b3dfeb02c700076ab2376..d3df602cfa62360fe751a84d1140dfb27838da80 100644 (file)
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\\r
-               lib/,\\r
                lib/junit-4.8.1src.zip,\\r
                lib/org.springframework.aop-3.0.4.RELEASEsrc.zip,\\r
                lib/org.springframework.asm-3.0.4.RELEASEsrc.zip,\\r
@@ -65,7 +64,6 @@ bin.includes = META-INF/,\
                lib/jsr250-api-1.0.jar,\\r
                lib/jta.jar,\\r
                lib/jtds-1.2.2.jar,\\r
-               lib/junit-4.4.jar,\\r
                lib/junit-4.8.1.jar,\\r
                lib/log4j-1.2.14.jar,\\r
                lib/lsid-client-1.1.2.jar,\\r
@@ -122,27 +120,19 @@ bin.includes = META-INF/,\
                lib/xstream-1.3.1.jar,\\r
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-commons-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.10-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.10-SNAPSHOT.jar\r
+               lib/cdmlib-commons-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.0.11-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.0.11-SNAPSHOT.jar,\\r
+               lib/spring-xml-1.5.6.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
-jre.compilation.profile = J2SE-1.6\r
 bin.excludes = lib/activation-1.1src.zip,\\r
                lib/c3p0-0.9.1src.zip,\\r
-               lib/cdmlib-commons-3.0-sources.jar,\\r
-               lib/cdmlib-ext-3.0-sources.jar,\\r
-               lib/cdmlib-io-3.0-sources.jar,\\r
-               lib/cdmlib-model-3.0-sources.jar,\\r
-               lib/cdmlib-persistence-3.0-sources.jar,\\r
-               lib/cdmlib-print-3.0-sources.jar,\\r
-               lib/cdmlib-remote-3.0-sources.jar,\\r
-               lib/cdmlib-services-3.0-sources.jar,\\r
                lib/commons-beanutils-1.7.0src.zip,\\r
                lib/commons-collections-3.2src.zip,\\r
                lib/commons-dbcp-1.2.2src.zip,\\r
@@ -188,19 +178,8 @@ bin.excludes = lib/activation-1.1src.zip,\
                lib/slf4j-log4j12-1.5.2src.zip,\\r
                lib/spring-modules-cache-0.7src.zip,\\r
                lib/spring-modules-lucene-0.8asrc.zip,\\r
-               lib/spring-security-core-3.0.0.RELEASEsrc.zip,\\r
                lib/wsdl4j-1.6.1src.zip,\\r
                lib/xml-resolver-1.2src.zip,\\r
                lib/xstream-1.3.1src.zip,\\r
-               lib/junit-4.8.1src.zip,\\r
-               lib/cdmlib-services-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar\r
+               lib/junit-4.8.1src.zip\r
 \r
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 (file)
index 0000000..2a95501
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar differ
index 538fe74e1a6dfc6b02c16a3380ef1aec1b0ec565..ee91d2e92a1d426bc8dbc1b8aa9f1362c0a25a61 100644 (file)
@@ -3,7 +3,7 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
-               <version>3.0.10-SNAPSHOT</version>\r
+               <version>3.0.11-SNAPSHOT</version>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index a69d5cfbc4ab2ad8009f660a1cb85cb22b772bb4..2ae37f940ff7f3099f4a302e927fd48a37e670c7 100644 (file)
@@ -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
index 65ce1b18aaacd1bb686bf82a21edba14bec1bced..408559a75b14dc9059d180f1e7cddbd8995cd6d7 100644 (file)
                name="Concept Relations"
                restorable="true">
          </view>
+         <view
+               class="eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphView"
+               icon="icons/address-book-new.png"
+               id="eu.etaxonomy.taxeditor.editor.view.concept.graph"
+               name="Concept Graph"
+               restorable="true">
+         </view>
       </extension>
    <extension
          point="org.eclipse.ui.elementFactories">
                   value="eu.etaxonomy.taxeditor.editor.view.concept">
             </parameter>
          </command>
+         <command
+               commandId="org.eclipse.ui.views.showView"
+               label="Concept Graph"
+               style="push">
+            <parameter
+                  name="org.eclipse.ui.views.showView.viewId"
+                  value="eu.etaxonomy.taxeditor.editor.view.concept.graph">
+            </parameter>
+            <visibleWhen
+                  checkEnabled="false">
+               <reference
+                     definitionId="isShowExperimentalFeatures">
+               </reference>
+            </visibleWhen>
+         </command>
       </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.navigate">
index 8918f66df811923e54909cd6b45d3b5150be931f..5349b805fff5e17c34fb55f279e7898fc5349150 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.0.10-SNAPSHOT</version>
+    <version>3.0.11-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 7e0c39fd94278274461bcba71bdbd15e97d761e8..65403941dd6a7d7ba04c7f491a9fc887098e7607 100644 (file)
@@ -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
index d1d4a917dd97f4567f57ef6f8ce1e291842b76b1..c0a5a57efd0709fec40244b32c721083e498e9df 100644 (file)
@@ -42,7 +42,7 @@ public class CreateNodeHandler extends AbstractHandler {
                                        .getActiveEditor();
 
                        IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-                                       .getActiveMenuSelection(event);
+                                       .getCurrentSelection(event);
 
                        if (selection.getFirstElement() instanceof PolytomousKeyNode) {
                                try {
index d9e42c575d974b0c05581c43f87ab89b75ab35f9..988564378556ac3167280f5702a803e238e2f71c 100644 (file)
@@ -49,7 +49,7 @@ public class DeleteNodeHandler extends AbstractHandler {
                                        .getActiveEditor();
 
                        IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-                                       .getActiveMenuSelection(event);
+                                       .getCurrentSelection(event);
 
                        if (selection.getFirstElement() instanceof PolytomousKeyNode) {
                                try {
index bd7c846a80341fcce2d856590a44b89a5c56c741..b710737bcbfb40eff19c51dcf02f5d14e7ff0c80 100644 (file)
@@ -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;
index 49048fe820a45f97fbb1e215fb803c150b2b5594..4d19f059ce7e6e6544a901a9900e971a44e99a89 100644 (file)
@@ -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();
                
index c5d5cf8e147508ff5bd347a2384f09f39e503a26..c3b6b015a59e82c15ec4e12b0e65b1aab839b8aa 100644 (file)
@@ -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();
 
index 20442c61bcc0918549a1492f6966e9dff3b4342e..5a5ece4cf6e50f9103dc60ffce465adc56d23e8d 100644 (file)
@@ -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();
 
index f44d0b1516d56081ee353471449bca8fe3db3df1..4aa081d5c94a35a9dae38bad8ba35ba95d9dabec 100644 (file)
@@ -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 (file)
index 0000000..d444bc6
--- /dev/null
@@ -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<String, TaxonRelationship> filteredTaxonRelations = new HashMap<String, TaxonRelationship>();
+                       getTaxonRelationshipsRecursive(filteredTaxonRelations, taxon);
+                       
+                       return filteredTaxonRelations.values().toArray();
+               }
+               return new Object[0];
+       }
+
+       private void getTaxonRelationshipsRecursive(Map<String, TaxonRelationship> 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 (file)
index 0000000..fe431c8
--- /dev/null
@@ -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 (file)
index 0000000..c7a2f9c
--- /dev/null
@@ -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;
+       }
+
+}
index 4ba5ee029d6087a31a849a90c466519bf42f4056..533d3b8865953644927411a3bbb2dc6b6c52571b 100644 (file)
 
 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 {
index 317ae6a6dd2f066c1753116a1222b839a392ec7d..502d9b94b0573e58905e5895fc4f77ad2f5eae29 100644 (file)
@@ -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;
index 9b690254ba7ba7bb8769fbad1e82b35eebc4f421..29079f925e0276991adfbcecf36f166e6f77ced5 100644 (file)
@@ -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);
                
index 174d83ed0999aa73006c9d80fb264c7621ae0678..618d9c0ee3a6870466e65438279199ff9e014609 100644 (file)
@@ -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();
index 7c99c9f608dadd50931d6f90eb6e61f42a42fb0c..1fe1f706635574cce3a89a8c951146859aa15e24 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.0.10.qualifier"
+      version="3.0.11.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
@@ -916,4 +916,11 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.hamcrest.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
index 609609db92d991bde868a804436d473bc2550f01..6cec0be9f42046c3123298f00b1957ef600b2ef0 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index f1201a6d35262e5656307d64f4e7729484c48ab6..30f68d152ce802dcfa0eb2399ee01c1a11018049 100644 (file)
@@ -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
index 44dbec7650855a3c13ad91854fb158561f27790e..32785fb5c6432902817d21002fcaa638b3821030 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.0.10.qualifier"
+      version="3.0.11.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 4a6c985e4a878e1a7591ffc68d849793f0a5116e..0cacfd82a4f61fe55fab0233925609e1f2ef5ac3 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index df9f792bbb8524389b5600f7fca2f397371c7292..8435c4a93e554e9c827a799b8921a2f82659759a 100644 (file)
@@ -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,
index 642e4204570021fdd27b8bb1a0b9193150441c66..31a2087326912132862891f0344a18f9a48ab3e5 100644 (file)
@@ -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 (file)
index a476078..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 8a61c50..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 86bcbf9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file
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 (file)
index 0000000..f8a29d8
--- /dev/null
@@ -0,0 +1,26 @@
+<h3>Authorship Part</h3>
+
+<p>The authorship part is divided into the original combination authorship and the combination authorship. 
+The earlier is put in brackets.</p>
+
+<pre>
+Example (bot.): (L.) Mill. 
+Example (zoo.): (XXX, 1830) XXX, 1845
+</pre> 
+
+<p>You can use either no authorship (only if not followed by any other part), the original combination 
+authorship, the combination authorship or both.</p>
+
+<p>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 <code>&amp;</code> . A placeholder <code>al.</code> 
+may be used for further team members. Both authorships may include ex-authors separated by <code>ex</code> or <code>ex.</code> 
+Some valid author strings are:</p> 
+<pre>
+Example (bot.): (Greuther & L'Hiver & al. ex Müller & Schmidt) Clark ex Ciardelli 
+Example (zoo.):
+</pre>
+
+<p>The number of allowed special characters like <code>'</code> or <code>-</code> at the moment is beyond the scope of this 
+documentation and will change in the future.</p>
+
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 (file)
index 0000000..4fc3b1d
--- /dev/null
@@ -0,0 +1,69 @@
+<h3>Name Part</h3>
+
+<p>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 <strong>ï</strong>).
+The name part parser differentiates 6 different syntaxes.</p>
+
+<h4>Uninomials</h4>
+<p>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.</p>
+<pre>Example: Cichorieae</pre>
+
+
+<h4>Infrageneric Names</h4>
+<p>Capital word followed by the infrageneric marker followed by the infrageneric epitheton. 
+Valid markers are: 
+       <ul>
+               <li><code>subgen.</code></li>
+               <li><code>subg.</code></li>
+               <li><code>sect.</code></li>
+               <li><code>subsect.</code></li>
+               <li><code>ser.</code></li>
+               <li><code>subser.</code></li>
+               <li><code>t.infgen.</code></li>
+       </ul>
+</p>
+<pre>Example: Desmometopa subg. LitoXXX</pre>
+
+
+<h4>Species Aggregates</h4>
+<p>Species aggregates are recognized similarly to species except they are followed by a group 
+marker. Valid markers are: 
+       <ul>
+               <li><code>aggr.</code></li>
+               <li><code>agg.</code></li>
+               <li><code>group</code></li>
+       </ul>
+</p>
+<pre>Example: XXX</pre>
+
+
+<h4>Species</h4>
+<p>Species names have a genus part (capital letter) and a species part (lower case letter).</p>
+<pre>Examples are: Abies alba</pre>
+
+<h4>Infraspecific names</h4>
+<p>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: 
+       <ul>
+               <li><code>subsp.</code></li> 
+               <li><code>convar.</code></li>
+               <li><code>var.</code></li>
+               <li><code>subvar.</code></li>
+               <li><code>f.</code></li>
+               <li><code>subf.</code></li>
+               <li><code>f.spec.</code></li>
+               <li><code>tax.infrasp.</code></li> 
+               <li><code>tax. infrasp.</code></li>
+       </ul>
+
+</p>
+<pre>Example:</pre>
+
+<h4>Infraspecific names (old markers)</h4>
+<p>Some older names (not valid according to the nomenclatural code) use other infraspecific 
+markers. The recognition of these older names is not yet implemented.</p>
+
+
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 (file)
index 0000000..e3c5fb1
--- /dev/null
@@ -0,0 +1,20 @@
+<h3>Nomenclatural Status</h3>
+
+<p>The nomeclatural status is separated from the preceding text by a comma. Current valid values for a status:</p> 
+
+<ul>
+       <li><code>nom. superfl.</code></li>
+       <li><code>nom. nud.</code></li> 
+       <li><code>nom. illeg.</code></li> 
+       <li><code>nom. inval.</code></li> 
+       <li><code>nom. cons.</code></li> 
+       <li><code>nom. alternativ.</code></li> 
+       <li><code>nom. subnud.</code></li> 
+       <li><code>nom. rej.</code></li>
+       <li><code>nom. rej.</code></li> 
+       <li><code>nom. prop.</code></li> 
+       <li><code>nom. provis.</code></li> 
+       <li><code>orth. var.</code></li>
+</ul>  
+
+<p>Multiple values separated by comma are possible.</p>
\ 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 (file)
index 0000000..ba52dd4
--- /dev/null
@@ -0,0 +1,51 @@
+<h2>Name Parser Documentation</h2>
+
+
+<p>The taxonomic name parser analyzes a free text taxonomic reference for the following four components:</p>
+
+<ul>
+       <li><a href="name_part.html">Name Part</a></li>
+       <li><a href="authorship_part.html">Authorship Part</a></li>
+       <li><a href="reference_part.html">Reference Part</a></li>
+       <li><a href="nomenclatural_status_part.html">Nomenclatural Status</a></li>
+</ul>
+
+<p>Not all of them are required.</p>
+
+<p>The four parts are separated by the following separators:</p>
+
+<table border="1">
+       <thead>
+               <tr>
+                       <td>part</td>
+                       <td>separator</td>
+                       <td>example</td>
+               </tr>
+       </thead>
+       <tbody>
+               <tr>
+                       <td>authorship</td>
+                       <td>any whitespace</td>
+                       <td><code>Abies alba_L.</code></td>
+               </tr>
+               <tr>
+                       <td>reference</td>
+                       <td>commata with following whitespace OR whitespace+'in'+whitespace</td>
+                       <td><code>Abies alba L.,_Sp. Pl... or Pinus alba_in_Bull. Soc....</code></td>
+               </tr>
+               <tr>
+                       <td>nom. status</td>
+                       <td>commata with following whitespace</td>
+                       <td><code>in Bull. Bot. 3: 99. 1987., nom illeg.</code></td>
+               </tr>
+       </tbody>
+</table>
+
+<p>Some valid name texts fully recognized by the parser are:</p>
+
+<pre>
+Abies alba (L.) Mill., Sp. Pl.: 105. 1846., nom illeg. 
+Abies alba (L.) Mill. in Bull. Bot. 3: 99. 1987., nom illeg.
+</pre> 
+
+<p>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:</p>
\ 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 (file)
index 0000000..bc9ac8c
--- /dev/null
@@ -0,0 +1,50 @@
+<h3>Reference Part</h3>
+
+<p>The reference part follows the syntax: <code>{separator}{authorship{,}}{titleEditionVolume}{:}{detail}{.}{year}</code></p>
+
+<p>Zoological new combinations should not have a reference part, since in zoology, it is not common 
+to mention the new combination reference.</p>
+
+<h4>Separator</h4>
+
+<p>The separator between the reference part and the preceding authorship may be a comma , or 
+an <pre> in </pre> (surrounded by whitespaces). The comma indicates a book whereas the <code>in</code> stands either 
+for a journal article or a book section. If the <code>in</code> 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.</p>
+
+<h4>Reference Authorship</h4>
+
+<p>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.</p>
+
+<h4>TitleEditionVolume</h4>
+
+<p>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 <code>:</code> is included as this is the separator for the subsequent detail part. Special characters 
+like <code>&amp;</code> and <code>-</code> 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:</p>
+
+<pre>
+Sp. Pl.
+Sp. Pl. ed. 3
+Sp. Pl. ed. 3, 4
+Sp. Pl. 4
+</pre>
+
+<p>As can be seen, the edition is recognized by a preceding <code>ed.</code>, whereas the volume is just 
+a number (or a number followed by another number in brackets - e.g. <code>4(5)</code> ).</p>
+
+<p>The detail part is separated by a column <code>:</code> from the preceding titleEditonVolume part and 
+is separated from the year by <code>.</code> (botanical names only). A number of typical detail information 
+is recognized as either pure page numbers (<code>345</code>) or ranges (<code>345-348</code>). Page numbers may be 
+preceded by <code>p.</code>(e.g. <code>p. 345</code>) or <code>pp.</code>(e.g. <code>pp. 345-348</code>). Abbreviations indicating special parts of a 
+reference such as <code>fig.</code> or <code>tab.</code> are recognized as well. Roman numbers are not detected 
+at the moment.</p>
+
diff --git a/eu.etaxonomy.taxeditor.help/html/reference/maintopic.html b/eu.etaxonomy.taxeditor.help/html/reference/maintopic.html
deleted file mode 100644 (file)
index a476078..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 8a61c50..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 86bcbf9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index a476078..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 8a61c50..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 86bcbf9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index a476078..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 8a61c50..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 86bcbf9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 326f0a9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <title>Table of Contents</title>
-</head>
-
-<body>
-<h1>Table of Contents</h1>
-Please enter your text here.
-</body>
-</html>
\ 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 (file)
index 0000000..cdeccf8
--- /dev/null
@@ -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
index 027ed0feeea328256ca7f9b66a7eac31e85d73e6..db9b794efc51bb1c780051963702c4640dc6474d 100644 (file)
@@ -9,7 +9,12 @@
             primary="true">
       </toc>
       <toc
-            file="tocgettingstarted.xml">
+            file="tocgettingstarted.xml"
+            primary="false">
+      </toc>
+      <toc
+            file="tocnameparser.xml"
+            primary="false">
       </toc>
    </extension>
 
index 4a4569e3e62d7448461dd0fdcac6deab20a0370b..c3827e82ba8fb42f914c08d1531211bc9e68803e 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 011941785d1e2936964456bda71f0a954c0ba5c6..92e4369ca1d4875bfe60f550bc7c568a623093bc 100644 (file)
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="EDIT Taxonomic Editor" topic="html/toc.html">
+<toc label="EDIT Taxonomic Editor">
    <topic label="Getting Started">
       <anchor id="gettingstarted"/>
    </topic>
+   <topic label="Name Parser">
+      <anchor id="nameparser"/>
+   </topic>
 </toc>
diff --git a/eu.etaxonomy.taxeditor.help/tocnameparser.xml b/eu.etaxonomy.taxeditor.help/tocnameparser.xml
new file mode 100644 (file)
index 0000000..b249a5a
--- /dev/null
@@ -0,0 +1,12 @@
+<toc label="Name Parser" link_to="toc.xml#nameparser">
+   <topic href="html/nameparser/overview.html" label="Overview">
+   </topic>
+   <topic href="html/nameparser/name_part.html" label="Name Part">
+   </topic>
+   <topic href="html/nameparser/authorship_part.html" label="Authorship Part">
+   </topic>
+   <topic href="html/nameparser/reference_part.html" label="Reference Part">
+   </topic>
+   <topic href="html/nameparser/nomenclatural_status_part.html" label="Nomenclatural Status Part">
+   </topic> 
+</toc>
index e0f5bc94062c2b14027912458e8da875233c54cb..6733f8fdd2e116193f14b3b0bf1f6ee065ad29ae 100644 (file)
@@ -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 (file)
index 0000000..cdeccf8
--- /dev/null
@@ -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
index af4e756df1aa7373797850c54dd068025409028b..c5859503cbc8ff2c6c7f737a8fe3fedda71e5d23 100644 (file)
       <definition
             id="isTaxonNode">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
       <definition
             id="isTaxonomicTree">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
       <definition
             id="isSynonymNode">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.Synonym">
index 6c3838bb67051718a7f2c0d75d11c09a6bad0768..50aef647c3c61f4f1aa29bb411d860baffd9d7cf 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index b0c2eda30f49ff9bfbf33f06626a2aa51928d126..529b489e8a2e0b508b1ff8f0154374963687c11f 100644 (file)
@@ -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,
index 43cb29eda2afebb6dcaa675da2fd723ea55671c0..5589fdf944c710f9aece4c51cdced1f4baf7770c 100644 (file)
@@ -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 (file)
index 0000000..cdeccf8
--- /dev/null
@@ -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
index 338d0e0b6db2d09af6cf2724fe973dd1df689a15..9754916084f37d8c83eeaf81f2922a01b65e9b1e 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 1e01f81af1c57173a0ce29ea5898f4ff11fe208d..e21859cb777303a79f8384c54f44b22438b4cad6 100644 (file)
@@ -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,
index 0acea993e45a21b99c49cc8855916c468fec40f1..c9cc810b911be2924812c8e4ec0639c0df5da371 100644 (file)
    <definition
          id="isCompatible">
       <with
-            variable="activeMenuSelection">
+            variable="selection">
          <test
                property="eu.etaxonomy.taxeditor.datasource.propertyTester.isCompatible">
          </test>
    <definition
          id="isShowExperimentalFeatures">
       <with
-            variable="activeMenuSelection">
+            variable="selection">
          <test
                property="eu.etaxonomy.taxeditor.preferences.propertyTester.isShowExperimentalFeatures">
          </test>
    <definition
          id="isModifiable">
       <with
-            variable="activeMenuSelection">
+            variable="selection">
          <test
                property="eu.etaxonomy.taxeditor.store.termEditor.propertyTester.isModifiable">
          </test>
index 6256464f05d060be078b5248e503d6ba967d1c75..f1f3679c5953f5f2398bd5c260e01a9f324e47d0 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.0.10-SNAPSHOT</version>
+       <version>3.0.11-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 6c9e0f4834458e80b99f3bc47936837a0fad3679..e7ca0952d6d2ae176796b4f057b1df08bdc8bade 100644 (file)
@@ -9,18 +9,15 @@
 */\r
 package eu.etaxonomy.taxeditor.editor.definedterm;\r
 \r
-import java.util.HashSet;\r
-import java.util.Set;\r
-\r
 import org.eclipse.core.expressions.PropertyTester;\r
 import org.eclipse.jface.viewers.IStructuredSelection;\r
 \r
+import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement;\r
 \r
 /**\r
  * @author l.morris\r
@@ -40,10 +37,13 @@ public class TermBasePropertyTester extends PropertyTester {
                        Object expectedValue) {\r
                \r
                IStructuredSelection selection = (IStructuredSelection) receiver;\r
-               TermBase selectedElement = (TermBase) selection.getFirstElement();\r
-               \r
-               if(IS_MODIFIABLE.equals(property)){\r
-                       return isModifiable(selectedElement);\r
+               CdmBase selectedElement = (CdmBase)selection.getFirstElement();\r
+               if (selectedElement != null && selectedElement.isInstanceOf(TermBase.class)){\r
+                       TermBase term = CdmBase.deproxy(selectedElement, TermBase.class);\r
+\r
+                       if(IS_MODIFIABLE.equals(property)){\r
+                               return isModifiable(term);\r
+                       }\r
                }\r
                \r
                return false;\r
index 51681507807b4d4fe95159b3dd2a678b6ac92f7e..4c6e6c79d0afc002fef5f5f51620475a5906a882 100644 (file)
@@ -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;
+               }
+       }
 }
index fee26b5c69658e984556ce720920011128d52691..f2657aae1f13b8d4400d0e925b477cc3d0f1a9f9 100644 (file)
@@ -50,9 +50,16 @@ public abstract class AbstractNewEntityWizard<T> extends Wizard implements
         * @param <T> 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()
         */
index b105ac6a6ce4d00920184b9c0d2702bd9528495c..6b23b4bc04b8974d7f04b79dae779a71fa605be5 100644 (file)
@@ -32,7 +32,7 @@ public class NewClassificationWizard extends AbstractNewEntityWizard<Classificat
         */
        @Override
        public void setEntity(Classification entity) {
-               setWindowTitle("Edit Classification");
+               setWindowTitle(String.format("Edit %s", getEntityName()));
                entity = CdmStore.getService(IClassificationService.class).load(entity.getUuid());
                super.setEntity(entity);
        }
@@ -52,4 +52,9 @@ public class NewClassificationWizard extends AbstractNewEntityWizard<Classificat
        protected Classification createNewEntity() {
                return Classification.NewInstance(null);
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Classification";
+       }
 }
index 7ec742e5c444f73e1a0258578419b4577ecf27b2..d28f0ec5d6ddf22aebde5d18e77193ed517b6ba5 100644 (file)
@@ -47,5 +47,10 @@ public class NewCollectionWizard extends AbstractNewEntityWizard<Collection> {
        protected Collection createNewEntity() {
                return Collection.NewInstance();
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Collection";
+       }
        
 }
index d64adb137642bac0e8c8e4c062179a0e3fc2f660..d132f0544eb0b3beb48ff8a99753768ec1dd666d 100644 (file)
@@ -72,4 +72,11 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
        protected void saveEntity() {
                CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Specimen";
+       }
+       
+       
 }
index d25a83869fbeee4670b394b73dff0186e6915025..925aead2a171bf33a16efd6bd1a18ad22050cf27 100644 (file)
@@ -40,4 +40,9 @@ public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObse
        protected void saveEntity() {
                CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Field Observation";
+       }
 }
index 5cf320748e9ba554c05670a177cedd683dfd6690..ad6c3ac255de9a5d835726ce5b3b8ef04734a295 100644 (file)
@@ -49,4 +49,9 @@ public class NewGroupWizard extends AbstractNewEntityWizard<Group> {
                return Group.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Group";
+       }
+
 }
index 50e1117d35239199953000d78c69e8799ef592df..1eba0be640dbf9de4c056c80c32d23bdedc40e47 100644 (file)
@@ -46,4 +46,9 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
                return Institution.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Institution";
+       }
+
 }
index c82a842be4398b4f31dde650e770daeb2a07e4e7..9ab033f49d32d61679c873dd9ec5d0cc357084e5 100644 (file)
@@ -51,4 +51,9 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        protected void saveEntity() {
                CdmStore.getService(INameService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Scientific Name";
+       }
 }
index 2268713342c95ad21c1e9d7dfa0cb52514c1ee9d..da18787665f6b06ea4ce61095da79e6055b150b8 100644 (file)
@@ -41,4 +41,9 @@ public class NewPersonWizard extends AbstractNewEntityWizard<Person> {
        protected void saveEntity() {
                CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Person";
+       }
 }
index ec67349a0f5c1f6b4af7b466674e6a7630908a9b..7b7624a7361c96aecc332e82442da9812f959df3 100644 (file)
@@ -35,4 +35,9 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard<PolytomousKe
                return PolytomousKey.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Polytomous Key";
+       }
+
 }
index 91131aa736c68df006757c12a102602751695de1..f1b19c94a5dac2417fac4d26252401f63d027f98 100644 (file)
@@ -54,4 +54,9 @@ public class NewReferenceWizard extends AbstractNewEntityWizard<Reference> {
                super.setEntity(entity);
                referencePage.getDetailElement().setEntity(entity);
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Reference";
+       }
 }
index 983785da1fc30be6b6f58fe5a82db84dafc7a445..f0e65cbd5134ab5f0ac512e08deb4e2c2c07da35 100644 (file)
@@ -105,5 +105,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        public ITreeNode getParentTreeNode(){
                return taxonNodePage.getParentTreeNode();
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Taxon";
+       }
        
 }
\ No newline at end of file
index 4e50f0c6b8fcc706b27bb319e13ed595dbea6866..050b5984334b77d838c98d2b54b95715fcd87b6c 100644 (file)
@@ -44,4 +44,9 @@ public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
        protected void saveEntity() {
                CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Team";
+       }
 }
index 61243981c3c76b1fce788e3d0e03276952efb08f..aa3cd19dd733d2ae274bbc270091134c2b05eb6c 100644 (file)
@@ -32,4 +32,9 @@ public class NewUserWizard extends AbstractNewEntityWizard<User> {
                return User.NewInstance(null, null);
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Institution";
+       }
+
 }
index 17e8eb8e8c7aa2c648ded5fd011eb26c6ca9cd6f..c43ac73e0ab1ec0b7118a81bb0bfff538c154c94 100644 (file)
@@ -196,9 +196,9 @@ public class TermComboElement<T extends DefinedTermBase>
                                                                        + ", " + 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());
                                }
 
                        }
index 64e95d95b2099262624cde63c0900c499774e9a0..2cf643d510af2f4d07e0bb3b4310d01d6a1bb954 100644 (file)
@@ -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} */
index 990ca4c5ed65f14cc42ce13119ff587fb04b7480..9fd82032e8a919903e84099ce1fc3658e0e22d71 100644 (file)
@@ -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(
index bc6a2240f1dc1bac1b0df7bcd85c089f0e0a423d..95221da5ed233016a069d58aac987d7b470c7c35 100644 (file)
@@ -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);
 
index d68e8fcaec14c75bc3c020f34b8a853563b01581..f628e9e26cb2b2b359cbfc8f9c9dc20cf64aa93d 100644 (file)
@@ -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<N
 
        private void createSpecificNameParts(ICdmFormElement formElement,
                        NonViralName nonViralName, int style) {
-               switch(nonViralName.getNomenclaturalCode()){
-               case ICBN:
-                       createBotanicalNameParts(formElement, nonViralName, style);
-                       break;
-               case ICZN:
-                       createZoologicalNameParts(formElement, nonViralName, style);
-                       break;
+               NomenclaturalCode code = nonViralName.getNomenclaturalCode();
+               if (code != null){
+                       switch(nonViralName.getNomenclaturalCode()){
+                       case ICBN:
+                               createBotanicalNameParts(formElement, nonViralName, style);
+                               break;
+                       case ICZN:
+                               createZoologicalNameParts(formElement, nonViralName, style);
+                               break;
+                       }
                }
        }
        
index 5319bb240692070558de0648b9871b33853a2a4f..7c2da263c727d4019e6e7fb5441488db986f9ce2 100644 (file)
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.taxeditor.model.TextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -69,7 +70,7 @@ public class EditFromSelectionWizard extends Wizard implements
         */
        public EditFromSelectionWizard(EntitySelectionElement selectionElement) {
                this.selectionElement = selectionElement;
-               this.setWindowTitle("Edit Entity");
+               this.setWindowTitle(String.format("Edit %s", TextHelper.deproxyClassName(selectionElement.getEntity().getClass())));
        }
 
        /** {@inheritDoc} */
index 64578f8ee2e612e10ae8c5cde6f23f8c97f0e271..c2699cbba507c3372fdcc90c36618b8a6b3ecfe2 100644 (file)
@@ -60,7 +60,7 @@ public class GoogleLanguageApiWrapper implements ITranslationServiceWrapper {
                else if(language.equals(Language.GERMAN())){
                        return com.google.api.translate.Language.GERMAN;
                }
-               else if(language.equals(Language.SPANISH_CATALAN())){
+               else if(language.equals(Language.SPANISH_CASTILIAN())){
                        return com.google.api.translate.Language.SPANISH;
                }
                else if(language.equals(Language.AFRIKAANS())){
index 4f10e1ee263c594c5ef7df435bb7b70090d777b4..bb240e89c9878e260d90a4ed75b747ab0f40ecae 100644 (file)
@@ -49,7 +49,7 @@ abstract class AbstractDataSourceHandler extends AbstractHandler {
         * @return a {@link eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer} object.
         */
        protected CdmMetaDataAwareDataSourceContainer getSelectedDataSourceContainer(ExecutionEvent event){
-               ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);
+               ISelection menuSelection = HandlerUtil.getCurrentSelection(event);
                CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) ((StructuredSelection) menuSelection).getFirstElement();
                return container;
        }
index 709ca7014b4fdd901292916d3bc70913ff389a6c..2a34fd7a53a9a3981a94b38593523de4a6db1c9d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.10.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.11.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index f351f7297ef4e848f69f2e770ddaa03fecffd1ce..786dcc149c6693efe589bdd8415aeab13e462a91 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.0.10-SNAPSHOT</version>
+               <version>3.0.11-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 672005895a5d212e036bd8140892e0abe6cc54d5..f25532b778831450ed6a35fbcec70e334ee98b09 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.0.10-SNAPSHOT</version>
+  <version>3.0.11-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
@@ -14,9 +14,9 @@
   <packaging>pom</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.0.10-SNAPSHOT</cdmlib.version>
-    <tycho.version>0.13.0</tycho.version>
-    <taxeditor.version>3.0.10-SNAPSHOT</taxeditor.version>
+    <cdmlib.version>3.0.11-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
+    <tycho.version>0.14.0</tycho.version>
+    <taxeditor.version>3.0.11-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
         <version>1.0-beta-2</version>
       </extension>
     </extensions>
+    <pluginManagement>
+      <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-antrun-plugin</artifactId>
+         <version>1.7</version>
+       </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
   <reporting>
     <plugins>