ref #8282: add setDoubtful to setFlag menu in navigator

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
index 4e6c979be400ce9b492e2a3756ab4e9448a5eddd..385986723f9879918324330c8b3710f5640fb76f 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
@@ -62,6 +62,11 @@ command.label.setExcluded = Set Excluded Flag
 command.name.setExcluded = Set Excluded Flag\r
 command.label.removeExcluded = Remove Excluded Flag\r
 command.name.removeExcluded = Remove Excluded Flag\r
+command.name.setDoubtful = Set Doubtful Flag\r
+command.label.setDoubtful = Set Doubtful Flag\r
+command.name.removeDoubtful = Remove Doubtful Flag\r
+command.label.removeDoubtful = Remove Doubtful Flag\r
+\r
 wizard.name = TCS\r
 wizard.name.2 = Excel Normal Explicit Taxa\r
 wizard.name.3 = ABCD\r
@@ -78,3 +83,14 @@ wizard.name.22 = CDM light (csv)
 wizard.name.14 = Specimen\r
 wizard.name.23 = Excel Distribution Data Update\r
 wizard.name.24 = RIS Reference\r
+\r
+handledmenuitem.label.1 = Clone Classification\r
+menu.label.1 = Import\r
+handledmenuitem.label.2 = Import Specimens\r
+menu.label.2 = Export\r
+handledtoolitem.label.1 = Collapse\r
+handledtoolitem.label.2 = Sync with taxon selectio\r
+command.commandname.1 = Clone Classification\r
+command.commandname.2 = Refresh Navigator\r
+command.commandname.3 = Link with taxon\r
+\r

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
index 19d2c42ff9028d0a8404ccc7e69c66be14de63e0..ff51efac5610cf35adb5ef3edd17c178c3e951f8 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
@@ -11,6 +11,7 @@ command.label.3 = Klassifikation
 command.label.5 = Bearbeiten\r
 command.label.6 = Akzeptiertes Taxon zum Synonym umwandeln\r
 command.label.61 = Akzeptiertes Taxon zum Synonym umwandeln (Setze Name in Quelle automatisch)\r
+command.label.62 = Akzeptiertes Taxon zum Synonym umwandeln (Der Name wird automatisch gesetzt, wenn er leer ist)\r
 command.label.7 = Verschiebe Taxon (mit Kindern)\r
 command.label.8 = Importieren\r
 command.label.9 = Exportieren\r
@@ -47,9 +48,9 @@ navigatorContent.name = Klassifikation
 navigatorContent.name.0 = Taxonknoten\r
 navigatorContent.name.1 = Synonyme (experimentell)\r
 command.label.moveFactualData = Verschiebe Faktendaten zu Taxon\r
-command.label.moveFactualDataSetNameInSource = Verschiebe Faktendaten zu Taxon (Setze Name in Quelle automatisch)\r
+command.label.moveFactualDataSetNameInSource = Verschiebe Faktendaten zu anderem Taxon und setze den Namen in der Quelle, wenn dieser leer ist\r
 command.name.moveFactualData = Verschiebe Faktendaten \r
-command.name.moveFactualDataSetNameInSource = Verschiebe Faktendaten (Setze Name in Quelle automatisch)\r
+command.name.moveFactualDataSetNameInSource = Verschiebe Faktendaten zu anderem Taxon und setze den Namen in der Quelle, wenn dieser leer ist\r
 command.label.setSecForSubtree = Secundum Referenz\r
 command.name.setSecForSubtree = Setze Secundum für Teilbaum\r
 command.label.setPublishForSubtree = Publish Flag\r
@@ -62,6 +63,10 @@ command.label.setExcluded = Setze Excluded Flag
 command.name.setExcluded = Setze Excluded Flag\r
 command.label.removeExcluded = Entferne Excluded Flag\r
 command.name.removeExcluded = Entferne Excluded Flag\r
+command.name.setDoubtful = Setze Doubtful Flag\r
+command.label.setDoubtful = Setze Doubtful Flag\r
+command.name.removeDoubtful = Entferne Doubtful Flag\r
+command.label.removeDoubtful = Entferne Doubtful Flag\r
 wizard.name = TCS\r
 wizard.name.2 = Excel Normal Explicit Taxa\r
 wizard.name.3 = ABCD\r

diff --git a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
index d6b08325fbf691d30319a411153fe5b247f2f146..189e5b1420c4a56eb8072e194182f2794b3cf83a 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
@@ -44,6 +44,8 @@
       <handlers xmi:id="_9is8MM1LEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemoveExcludedHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemoveExcludedHandler" command="_mNPRoM1LEeiHbMP3rrIRKQ"/>
       <handlers xmi:id="_fwEOsL9SEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemotingChangeAcceptedTaxonToSynonymSetNameInSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemotingChangeAcceptedTaxonToSynonymSetNameInSourceHandlerE5" command="_OrLKUL9SEemCian_vXpNsA"/>
       <handlers xmi:id="_MAkIwL9TEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemotingMoveFactualDataSetNameInSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemotingMoveFactualDataSetNameInSourceHandlerE5" command="_7qhucL9SEemCian_vXpNsA"/>
+      <handlers xmi:id="_ifvyoMWVEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.handler.SetDoubtfulHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.SetDoubtfulHandler" command="_l5_r8MWVEemX2v5WBCy_yg"/>
+      <handlers xmi:id="_QolHUMWWEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.handler.removeDoubtfulFlagHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.navigator.e4.handler.RemoveDoubtfulHandler" command="_pr-IwMWVEemX2v5WBCy_yg"/>
       <menus xsi:type="menu:PopupMenu" xmi:id="_XNXnkJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigator.popupmenu.taxonnavigator">
         <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_5ydggKkeEeejedk4mZQIGw" coreExpressionId="isCdmStoreConnected"/>
         <children xsi:type="menu:Menu" xmi:id="_yzFmYJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menu.new" label="%menu.label">
@@ -57,21 +59,21 @@
         <children xsi:type="menu:DynamicMenuContribution" xmi:id="_3d1BwJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.dynamicmenucontribution.openInCdmViewer" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_h3uU0JJYEee-eM8NeuXskA" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.6"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_9hdNkJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.fixclassificationhierarchy" label="%command.label.fixClassificationHierarchy" command="_jXX0YJIxEeeJAdt8ZUxyaw"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_ivOrwJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.cloneclassification" label="Clone Classification" command="_nOOxMJIxEeeJAdt8ZUxyaw"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_ivOrwJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.cloneclassification" label="%handledmenuitem.label.1" command="_nOOxMJIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_ktyqMJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.1"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_lALasJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonym" label="%command.label.6" command="_p7Oi8JIxEeeJAdt8ZUxyaw">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_v0c4YFerEeiKs7VTbRzV-A" coreExpressionId="isTaxonBase"/>
         </children>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_3gNfkL9REemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonymSetNameInSource" label="%command.label.61" command="_OrLKUL9SEemCian_vXpNsA">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_3gNfkL9REemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonymSetNameInSource" label="%command.label.61" tooltip="%command.label.62" command="_OrLKUL9SEemCian_vXpNsA">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_OwXkYL_3Eem0lIGGphM50w" coreExpressionId="isTaxonBase"/>
         </children>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_nh_3MJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.moveTaxon" label="%command.label.7" command="_w4RNkJIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_o1PAsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.movefactualdata" label="%command.label.moveFactualData" command="_3PRy8JIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_oT7tML9SEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.movefactualdataSetNameInSource" label="%command.label.moveFactualDataSetNameInSource" command="_7qhucL9SEemCian_vXpNsA"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_rBdnsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.2"/>
-        <children xsi:type="menu:Menu" xmi:id="_T8ey0KkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.menu.import" label="Import">
+        <children xsi:type="menu:Menu" xmi:id="_T8ey0KkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.menu.import" label="%menu.label.1">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_7ZtcEMuuEeiGO4eKaXkw0w" coreExpressionId="isShowIOMenuEnabled"/>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_YMugAKkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSpecimens" label="Import Specimens" command="_yBC78KnJEeeTAPHmaMLwQQ"/>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_YMugAKkeEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSpecimens" label="%handledmenuitem.label.2" command="_yBC78KnJEeeTAPHmaMLwQQ"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_2NC0kKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importAbcd" label="%wizard.name.3" command="_AOq4QKnKEeeTAPHmaMLwQQ"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_3rMNkKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importExceldistribution" label="%wizard.name.23" command="_Anfn8KnKEeeTAPHmaMLwQQ">
             <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_3rMNkanEEeeTAPHmaMLwQQ" coreExpressionId="isShowExperimentalFeatures"/>
@@ -82,7 +84,7 @@
           <children xsi:type="menu:HandledMenuItem" xmi:id="_7XgHQKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importSdd" label="%wizard.name.4" command="_AuNT8KnKEeeTAPHmaMLwQQ"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_7w_lUKnEEeeTAPHmaMLwQQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.importTcs" label="%wizard.name" command="_LCsbgKnKEeeTAPHmaMLwQQ"/>
         </children>
-        <children xsi:type="menu:Menu" xmi:id="_rbInwKqhEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.navigation.menu.export" label="Export">
+        <children xsi:type="menu:Menu" xmi:id="_rbInwKqhEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.navigation.menu.export" label="%menu.label.2">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_3qJaEMuuEeiGO4eKaXkw0w" coreExpressionId="isShowIOMenuEnabled"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_tPAZIKqhEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.exportJaxb" label="%wizard.name.6" command="_fQX7EKqhEeeXcJGhyhlrKA"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_xwZgsKqhEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.eu.etaxonomy.taxeditor.navigation.handledmenuitem.exportSdd" label="%wizard.name.8" command="_iaZnEKqhEeeXcJGhyhlrKA"/>
@@ -101,21 +103,19 @@
           <children xsi:type="menu:HandledMenuItem" xmi:id="_mLjosJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.setsecforsubtree" label="%command.label.setSecForSubtree" command="_uFj1YJIxEeeJAdt8ZUxyaw"/>
         </children>
         <children xsi:type="menu:Menu" xmi:id="_Nz3dkM1MEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.menu.set" label="%command.label.nodeUpdates">
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_Yb8F8M1AEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.removeUnplaced" label="%command.label.removeUnplaced" command="_gMQnoM1AEeiHbMP3rrIRKQ">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_39MtQM1AEeiHbMP3rrIRKQ" coreExpressionId="isUnplaced"/>
-          </children>
-          <children xsi:type="menu:HandledMenuItem" xmi:id="_YeWwgM0vEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.setUnplaced" label="%command.label.setUnplaced" command="_oghMkM0vEeiHbMP3rrIRKQ">
-            <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_fXWooM0vEeiHbMP3rrIRKQ" coreExpressionId="isNotUnplaced"/>
-          </children>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_Yb8F8M1AEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.removeUnplaced" label="%command.label.removeUnplaced" command="_gMQnoM1AEeiHbMP3rrIRKQ"/>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_YeWwgM0vEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.setUnplaced" label="%command.label.setUnplaced" command="_oghMkM0vEeiHbMP3rrIRKQ"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_poLj8M1KEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.setExcluded" label="%command.label.setExcluded" command="_3laT0M1KEeiHbMP3rrIRKQ"/>
           <children xsi:type="menu:HandledMenuItem" xmi:id="_c1QOkM1LEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.removeExcluded" label="%command.label.removeExcluded" command="_mNPRoM1LEeiHbMP3rrIRKQ"/>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_KGONkMWWEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.setDoubtful" label="%command.label.setDoubtful" command="_l5_r8MWVEemX2v5WBCy_yg"/>
+          <children xsi:type="menu:HandledMenuItem" xmi:id="_brursMWWEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.removeDoubtful" label="%command.label.removeDoubtful" command="_pr-IwMWVEemX2v5WBCy_yg"/>
         </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_z0Q6EJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.4"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_0FX4MJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.refresh" label="%command.label.11" command="_ukhM0JIyEeeJAdt8ZUxyaw"/>
       </menus>
       <toolbar xmi:id="_fbAfML2kEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.navigation.toolbar.1">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_KoxjML2gEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.navigation.handledtoolitem.collapse" label="Collapse" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/collapseall.gif" command="_aN3BsL2gEeeyWfw0n8-ICQ"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_IO57EL2bEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.navigation.handledtoolitem.syncwithtaxonselectio" label="Sync with taxon selectio" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/synced.gif" type="Check" command="_6iiY8LVbEeeZf_R8QJbACw"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_KoxjML2gEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.navigation.handledtoolitem.collapse" label="%handledtoolitem.label.1" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/collapseall.gif" command="_aN3BsL2gEeeyWfw0n8-ICQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_IO57EL2bEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.navigation.handledtoolitem.syncwithtaxonselectio" label="%handledtoolitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/synced.gif" type="Check" command="_6iiY8LVbEeeZf_R8QJbACw"/>
       </toolbar>
     </elements>
     <elements xsi:type="basic:PartDescriptor" xmi:id="_AcycAKOkEee6lJH578buGg" elementId="eu.etaxonomy.taxeditor.navigation.search.e4.SearchResultViewE4" label="%view.name" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.navigation/icons/system-search.png" allowMultiple="true" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.search.e4.SearchResultViewE4">
@@ -159,7 +159,7 @@
     <elements xsi:type="commands:Command" xmi:id="_Nx06MJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode" commandName="%command.name"/>
     <elements xsi:type="commands:Command" xmi:id="_Vco-4JIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.create.classification" commandName="%command.name.0"/>
     <elements xsi:type="commands:Command" xmi:id="_jXX0YJIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler" commandName="%command.name.10"/>
-    <elements xsi:type="commands:Command" xmi:id="_nOOxMJIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.cloneClassification" commandName="Clone Classification"/>
+    <elements xsi:type="commands:Command" xmi:id="_nOOxMJIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.cloneClassification" commandName="%command.commandname.1"/>
     <elements xsi:type="commands:Command" xmi:id="_p7Oi8JIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym" commandName="%command.name.5"/>
     <elements xsi:type="commands:Command" xmi:id="_uFj1YJIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigator.command.update.setSecundumForSubtree" commandName="%command.name.setSecForSubtree"/>
     <elements xsi:type="commands:Command" xmi:id="_Jb45kK5bEeeDTZvTg-vKRg" elementId="eu.etaxonomy.taxeditor.navigator.command.update.setPublishForSubtree" commandName="%command.name.setPublishForSubtree"/>
@@ -167,19 +167,21 @@
     <elements xsi:type="commands:Command" xmi:id="_3PRy8JIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.moveFactualData" commandName="%command.name.moveFactualData"/>
     <elements xsi:type="commands:Command" xmi:id="__n644JIxEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.command.delete" commandName="%command.name.11"/>
     <elements xsi:type="commands:Command" xmi:id="_EJ-u0JIyEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.command.copyTaxonName" commandName="%command.name.4"/>
-    <elements xsi:type="commands:Command" xmi:id="_ukhM0JIyEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.command.refreshNavigator" commandName="Refresh Navigator"/>
+    <elements xsi:type="commands:Command" xmi:id="_ukhM0JIyEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.command.refreshNavigator" commandName="%command.commandname.2"/>
     <elements xsi:type="commands:Command" xmi:id="_lAZG8KQUEeeTrq_CRrR-jg" elementId="eu.etaxonomy.taxeditor.navigation.key.polytomous.newKey" commandName="%command.name.6"/>
     <elements xsi:type="commands:Command" xmi:id="_BrgnkKQVEeeTrq_CRrR-jg" elementId="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes" commandName="%command.name.7"/>
     <elements xsi:type="commands:Command" xmi:id="_4BQ6YKQVEeeTrq_CRrR-jg" elementId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyList" commandName="%command.name.8"/>
     <elements xsi:type="commands:Command" xmi:id="_6S6M4KQVEeeTrq_CRrR-jg" elementId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyNodes" commandName="%command.name.9"/>
     <elements xsi:type="commands:Command" xmi:id="_8C8AEKQVEeeTrq_CRrR-jg" elementId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete" commandName="%command.name.11"/>
-    <elements xsi:type="commands:Command" xmi:id="_6iiY8LVbEeeZf_R8QJbACw" elementId="eu.etaxonomy.taxeditor.navigation.command.linkWithTaxon" commandName="Link with taxon"/>
+    <elements xsi:type="commands:Command" xmi:id="_6iiY8LVbEeeZf_R8QJbACw" elementId="eu.etaxonomy.taxeditor.navigation.command.linkWithTaxon" commandName="%command.commandname.3"/>
     <elements xsi:type="commands:Command" xmi:id="_oghMkM0vEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigator.command.update.setUnplaced" commandName="%command.name.setUnplaced"/>
     <elements xsi:type="commands:Command" xmi:id="_gMQnoM1AEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigator.command.update.removeUnplaced" commandName="%command.name.removeUnplaced"/>
     <elements xsi:type="commands:Command" xmi:id="_3laT0M1KEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigator.command.update.setExcluded" commandName="%command.name.setExcluded"/>
     <elements xsi:type="commands:Command" xmi:id="_mNPRoM1LEeiHbMP3rrIRKQ" elementId="eu.etaxonomy.taxeditor.navigator.command.update.removeExcluded" commandName="%command.name.removeExcluded"/>
     <elements xsi:type="commands:Command" xmi:id="_OrLKUL9SEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonymSetNameInSource" commandName="%command.name.51"/>
     <elements xsi:type="commands:Command" xmi:id="_7qhucL9SEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.navigation.moveFactualDataSetNameInSource" commandName="%command.name.moveFactualDataSetNameInSource"/>
+    <elements xsi:type="commands:Command" xmi:id="_l5_r8MWVEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.command.setdoubtfulflag" commandName="%command.name.setDoubtful"/>
+    <elements xsi:type="commands:Command" xmi:id="_pr-IwMWVEemX2v5WBCy_yg" elementId="eu.etaxonomy.taxeditor.navigation.command.removedoubtfulflag" commandName="%command.name.removeDoubtful"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_3CbhIK25EeeykrJkROy5EA" featurename="children" parentElementId="eu.etaxonomy.navigation.menu.new" positionInList="after:eu.etaxonomy.taxeditor.editor.menuseparator.22">
     <elements xsi:type="menu:HandledMenuItem" xmi:id="_M9FakK26EeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.commandlabel13" label="%command.label.13" tooltip="%command.label.13" command="_Nx06MJIvEeeJAdt8ZUxyaw">

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveDoubtfulHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveDoubtfulHandler.java
new file mode 100755 (executable)
index 0000000..2a0c5c5
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveDoubtfulHandler.java
@@ -0,0 +1,55 @@
+/**
+* Copyright (C) 2019 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.navigation.navigator.e4.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.core.commands.operations.AbstractOperation;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
+
+/**
+ * @author k.luther
+ * @since 23.08.2019
+ */
+public class RemoveDoubtfulHandler extends UnplacedExcludedDoubtfulHandler {
+
+    @Override
+    public AbstractOperation prepareOperation(IStructuredSelection selection,
+            Shell shell,
+            MPart activePart,
+            MHandledMenuItem menuItem) {
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
+                        true,
+                        taxonNodes,
+                        null, null, false);
+
+        return operation;
+    }
+
+    @CanExecute
+    private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
+        boolean canExecute = !selection.isEmpty();
+        Object[] array = selection.toArray();
+        for (Object object : array) {
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isDoubtful() && ((TaxonNodeDto)object).getTaxonUuid() != null;
+        }
+        menuItem.setVisible(canExecute);
+        return canExecute;
+    }
+}

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveExcludedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveExcludedHandler.java
index 8bc8158c88da19112a809c3e0bae0ea49d0378d1..24f6b546cd72bed95bd0f306ef9ccb97fdc44b2b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveExcludedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveExcludedHandler.java
@@ -20,25 +20,25 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedOperation;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
 
 /**
  * @author k.luther
  * @since 11.10.2018
  *
  */
-public class RemoveExcludedHandler extends UnplacedExcludedHandler {
+public class RemoveExcludedHandler extends UnplacedExcludedDoubtfulHandler {
 
     @Override
     public AbstractOperation prepareOperation(IStructuredSelection selection,
             Shell shell,
             MPart activePart,
             MHandledMenuItem menuItem) {
-        SetUnplacedExcludedOperation operation =
-                new SetUnplacedExcludedOperation(getTrigger(),
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
                         true,
                         taxonNodes,
-                        null, false);
+                        null, false, null);
 
         return operation;
     }
@@ -48,7 +48,7 @@ public class RemoveExcludedHandler extends UnplacedExcludedHandler {
         boolean canExecute = !selection.isEmpty();
         Object[] array = selection.toArray();
         for (Object object : array) {
-            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isExcluded();
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isExcluded() && ((TaxonNodeDto)object).getTaxonUuid() != null;
         }
         menuItem.setVisible(canExecute);
         return canExecute;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
index 8edc6a6bd05f7ee6f23fbf4e2ebb07e5799e39b0..805759c13f193b8316dbbf23c531683f0d216efd 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
@@ -20,24 +20,24 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedOperation;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
 
 /**
  * @author k.luther
  * @since 11.10.2018
  *
  */
-public class RemoveUnplacedHandler extends UnplacedExcludedHandler {
+public class RemoveUnplacedHandler extends UnplacedExcludedDoubtfulHandler {
     @Override
     public AbstractOperation prepareOperation(IStructuredSelection selection,
             Shell shell,
             MPart activePart,
             MHandledMenuItem menuItem) {
-        SetUnplacedExcludedOperation operation =
-                new SetUnplacedExcludedOperation(getTrigger(),
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
                         true,
                         taxonNodes,
-                        false, null);
+                        false, null, null);
 
         return operation;
     }
@@ -47,7 +47,7 @@ public class RemoveUnplacedHandler extends UnplacedExcludedHandler {
         boolean canExecute = !selection.isEmpty();
         Object[] array = selection.toArray();
         for (Object object : array) {
-            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isUnplaced();
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isUnplaced() && ((TaxonNodeDto)object).getTaxonUuid() != null;
         }
         menuItem.setVisible(canExecute);
         return canExecute;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetDoubtfulHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetDoubtfulHandler.java
new file mode 100755 (executable)
index 0000000..95cfe2e
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetDoubtfulHandler.java
@@ -0,0 +1,60 @@
+/**
+* Copyright (C) 2019 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.navigation.navigator.e4.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.core.commands.operations.AbstractOperation;
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
+
+/**
+ * @author k.luther
+ * @since 23.08.2019
+ */
+public class SetDoubtfulHandler extends UnplacedExcludedDoubtfulHandler {
+
+    @Override
+    public AbstractOperation prepareOperation(IStructuredSelection selection,
+            Shell shell,
+            MPart activePart,
+            MHandledMenuItem menuItem) {
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
+                        true,
+                        taxonNodes,
+                        null, null, true);
+
+        return operation;
+    }
+
+    @CanExecute
+    private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
+        boolean canExecute = !selection.isEmpty();
+        Object[] array = selection.toArray();
+        boolean isClassification = false;
+        for (Object object : array) {
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && !((TaxonNodeDto)object).isDoubtful() && ((TaxonNodeDto)object).getTaxonUuid() != null;
+            isClassification = isClassification || ((TaxonNodeDto)object).getTaxonUuid() == null;
+        }
+
+        menuItem.setVisible(canExecute || isClassification);
+        return canExecute;
+    }
+
+
+}

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetExcludedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetExcludedHandler.java
index 7c2b5e20a1835c92982aa350e7028d1041b8017e..e9c98c854c23e53df17fb9cee07fa4e8cb673fd4 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetExcludedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetExcludedHandler.java
@@ -20,25 +20,25 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedOperation;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
 
 /**
  * @author k.luther
  * @since 11.10.2018
  *
  */
-public class SetExcludedHandler extends UnplacedExcludedHandler {
+public class SetExcludedHandler extends UnplacedExcludedDoubtfulHandler {
 
     @Override
     public AbstractOperation prepareOperation(IStructuredSelection selection,
             Shell shell,
             MPart activePart,
             MHandledMenuItem menuItem) {
-        SetUnplacedExcludedOperation operation =
-                new SetUnplacedExcludedOperation(getTrigger(),
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
                         true,
                         taxonNodes,
-                        null, true);
+                        null, true, null);
 
         return operation;
     }
@@ -47,10 +47,12 @@ public class SetExcludedHandler extends UnplacedExcludedHandler {
     private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
         boolean canExecute = !selection.isEmpty();
         Object[] array = selection.toArray();
+        boolean isClassification = false;
         for (Object object : array) {
-            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && !((TaxonNodeDto)object).isExcluded();
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && !((TaxonNodeDto)object).isExcluded() && ((TaxonNodeDto)object).getTaxonUuid() != null;
+            isClassification = isClassification || ((TaxonNodeDto)object).getTaxonUuid() == null;
         }
-        menuItem.setVisible(canExecute);
+        menuItem.setVisible(canExecute || isClassification);
         return canExecute;
     }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetUnplacedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetUnplacedHandler.java
index ec3a53f91b42944f981eb783020b9c19cd1afbaf..dd48fbdf1b27ff6149bf4ecdd91e4a0e2daec567 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetUnplacedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetUnplacedHandler.java
@@ -20,24 +20,24 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedOperation;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
 
 /**
  * @author k.luther
  * @since 11.10.2018
  *
  */
-public class SetUnplacedHandler extends UnplacedExcludedHandler {
+public class SetUnplacedHandler extends UnplacedExcludedDoubtfulHandler {
     @Override
     public AbstractOperation prepareOperation(IStructuredSelection selection,
             Shell shell,
             MPart activePart,
             MHandledMenuItem menuItem) {
-        SetUnplacedExcludedOperation operation =
-                new SetUnplacedExcludedOperation(getTrigger(),
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
                         true,
                         taxonNodes,
-                        true, null);
+                        true, null, null);
 
         return operation;
     }
@@ -46,10 +46,12 @@ public class SetUnplacedHandler extends UnplacedExcludedHandler {
     private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
         boolean canExecute = !selection.isEmpty();
         Object[] array = selection.toArray();
+        boolean isClassification = false;
         for (Object object : array) {
-            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && !((TaxonNodeDto)object).isUnplaced();
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && !((TaxonNodeDto)object).isUnplaced() && ((TaxonNodeDto)object).getTaxonUuid() != null;
+            isClassification = isClassification || ((TaxonNodeDto)object).getTaxonUuid() == null;
         }
-        menuItem.setVisible(canExecute);
+        menuItem.setVisible(canExecute || isClassification);
         return canExecute;
     }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedDoubtfulHandler.java
similarity index 95%
rename from eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedHandler.java
rename to eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedDoubtfulHandler.java
index 4e36cf7994cf5f14aa7ad851019338a850be1cee..0e8a8b31f8baf4797197e80febe7ed4db3dc00c7 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/UnplacedExcludedDoubtfulHandler.java
@@ -30,10 +30,10 @@ import eu.etaxonomy.taxeditor.operation.e4.RemotingCdmHandlerE4;
  * @since 11.10.2018
  *
  */
-public abstract class UnplacedExcludedHandler extends RemotingCdmHandlerE4{
+public abstract class UnplacedExcludedDoubtfulHandler extends RemotingCdmHandlerE4{
     protected List<UUID> taxonNodes ;
 
-    public UnplacedExcludedHandler() {
+    public UnplacedExcludedDoubtfulHandler() {
         super(TaxonNavigatorLabels.SET_UNPLACED);
     }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedDoubtfulOperation.java
similarity index 85%
rename from eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedOperation.java
rename to eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedDoubtfulOperation.java
index 2def57dfbefc4637181a2f13cc85b3960264ef49..4c7355ae4900b84ffc144c42b147496965b343a8 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetUnplacedExcludedDoubtfulOperation.java
@@ -28,19 +28,20 @@ import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation;
  * @since 11.10.2018
  *
  */
-public class SetUnplacedExcludedOperation extends RemotingCdmUpdateOperation {
+public class SetUnplacedExcludedDoubtfulOperation extends RemotingCdmUpdateOperation {
     private final static String LABEL = Messages.TaxonNavigatorLabels_SET_UNPLACED;
     private List<UUID> sourceTaxonNodeUuids;
     private Boolean unplaced = null;
     private Boolean excluded = null;
+    private Boolean doubtful = null;
     /**
      * @param source
      * @param async
      */
-    public SetUnplacedExcludedOperation(Object source,
+    public SetUnplacedExcludedDoubtfulOperation(Object source,
             boolean async,
             List<UUID> sourceTaxonNodeUuids,
-            Boolean unplaced, Boolean excluded) {
+            Boolean unplaced, Boolean excluded, Boolean doubtful) {
         super(LABEL, Action.Update, source, async);
         this.sourceTaxonNodeUuids = sourceTaxonNodeUuids;
         if (unplaced != null){
@@ -49,6 +50,9 @@ public class SetUnplacedExcludedOperation extends RemotingCdmUpdateOperation {
         if (excluded != null){
             this.excluded = excluded;
         }
+        if (doubtful != null){
+            this.doubtful = doubtful;
+        }
     }
 
     /**
@@ -66,6 +70,9 @@ public class SetUnplacedExcludedOperation extends RemotingCdmUpdateOperation {
             if (excluded != null){
                 node.setExcluded(excluded);
             }
+            if (doubtful != null){
+                node.setDoubtful(doubtful);
+            }
         }
         List<MergeResult<TaxonNode>> results = CdmApplicationState.getService(ITaxonNodeService.class).merge(nodes, true);
         UpdateResult updateResult = new UpdateResult();