BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0f6807
)
last changes for #5325
author
Katja Luther
<k.luther@bgbm.org>
Wed, 28 Oct 2015 08:41:27 +0000
(09:41 +0100)
committer
Katja Luther
<k.luther@bgbm.org>
Wed, 28 Oct 2015 08:41:27 +0000
(09:41 +0100)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
index d0eca25f8ee5798022727bc76924e64fba0b9a35..c6a9a0cd843ad506a4354b548984f49fc1f9b0be 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
@@
-10,6
+10,7
@@
package eu.etaxonomy.taxeditor.editor.name.handler;
package eu.etaxonomy.taxeditor.editor.name.handler;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.List;
import java.util.Set;
import java.util.UUID;
@@
-87,7
+88,8
@@
public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
TaxonNode parentNode = (TaxonNode) HibernateProxyHelper.deproxy(((TaxonEditorInput) input).getTaxonNode().getParent());
TaxonNode parentNode = (TaxonNode) HibernateProxyHelper.deproxy(((TaxonEditorInput) input).getTaxonNode().getParent());
- List<UUID> excludeTaxa = null;
+ List<UUID> excludeTaxa = new ArrayList<UUID>();
+ excludeTaxa.add(taxon.getUuid());
TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null, ((TaxonEditorInput) input).getTaxonNode().getClassification());
TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null, ((TaxonEditorInput) input).getTaxonNode().getClassification());
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
index b2c7b64532116f49938fa32c2d68de829fee13ce..281e83df6290ab6223b5259c0678fd58953c276f 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
@@
-9,6
+9,10
@@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.handlers.HandlerUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
@@
-48,11
+52,13
@@
public class MoveSynonymToAnotherAcceptedTaxonHandler extends AbstractHandler im
}
Synonym synonym = (Synonym) selection.getFirstElement();
}
Synonym synonym = (Synonym) selection.getFirstElement();
+ Taxon oldParent = ((TaxonEditorInput)input).getTaxon();
+ List<UUID> excludeTaxa = new ArrayList<UUID>();
+ excludeTaxa.add(oldParent.getUuid());
+
TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select new accepted taxon", null, null, ((TaxonEditorInput)input).getTaxonNode().getClassification());
if(newParentNode!=null){
TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select new accepted taxon", null, null, ((TaxonEditorInput)input).getTaxonNode().getClassification());
if(newParentNode!=null){
- Taxon oldParent = ((TaxonEditorInput)input).getTaxon();
-
- MoveSynonymToAnotherAcceptedTaxonOperation operation = new MoveSynonymToAnotherAcceptedTaxonOperation("Change accepted Taxon of Synonym", EditorUtil.getUndoContext(),
+ MoveSynonymToAnotherAcceptedTaxonOperation operation = new MoveSynonymToAnotherAcceptedTaxonOperation("Change accepted Taxon of Synonym", EditorUtil.getUndoContext(),
oldParent.getUuid(), synonym.getUuid(), newParentNode.getTaxon(), editor);
AbstractUtility.executeOperation(operation);
oldParent.getUuid(), synonym.getUuid(), newParentNode.getTaxon(), editor);
AbstractUtility.executeOperation(operation);
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index f9051e871d833b20795f36ed3fd5557b6fba29d0..c708ca558b74c44378d2e7c0d3f8669603bea338 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@
-975,5
+975,12
@@
public class TransientClassificationService implements IClassificationService {
return defaultService.loadWithUpdate(arg0);
}
return defaultService.loadWithUpdate(arg0);
}
+ @Override
+ public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
+ UUID classificationUuid, List<UUID> excludeTaxa) {
+
+ return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, excludeTaxa);
+ }
+
}
}
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java
index f79c91facdce45f3236ed2b7dcac8c44e80b4125..a60bd2e321a302423561dbccd02174752214d513 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java
@@
-108,7
+108,7
@@
public class ChangeAcceptedTaxonToSynonymHandler extends DeleteHandler
}*/
List<UUID> excludeTaxa = new ArrayList<UUID>();
}*/
List<UUID> excludeTaxa = new ArrayList<UUID>();
- excludeTaxa.add(
oldAcceptedTaxonNode
.getUuid());
+ excludeTaxa.add(
((TaxonNode)oldAcceptedTaxonNode).getTaxon()
.getUuid());
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event),
taxonNavigator.getConversationHolder(),
"Choose the accepted taxon",
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event),
taxonNavigator.getConversationHolder(),
"Choose the accepted taxon",
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
index a42c6dfb066a615ef639bff23fb4bb3c24b4de75..c4f6df32c9b70e35c86839f607bfbf87c21a834e 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
@@
-97,7
+97,7
@@
public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand
@Override
public AbstractOperation prepareOperation(ExecutionEvent event) {
List<UUID> excludeTaxa = new ArrayList<UUID>();
@Override
public AbstractOperation prepareOperation(ExecutionEvent event) {
List<UUID> excludeTaxa = new ArrayList<UUID>();
- excludeTaxa.add(
oldTaxonNode
.getUuid());
+ excludeTaxa.add(
((TaxonNode)oldTaxonNode).getTaxon()
.getUuid());
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event),
new ConversationHolderMock(),
"Choose the accepted taxon",
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event),
new ConversationHolderMock(),
"Choose the accepted taxon",
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
index 288211858c672f3abcccc0e1114cedf64e7fc0e2..9152461c3b74b661ece95c4b933cc9092b9c4005 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
@@
-85,7
+85,7
@@
public class RemotingMoveTaxonNodeHandler extends RemotingCdmHandler {
TaxonNode parentTaxonNode;
List<UUID> excludeTaxa = new ArrayList<UUID>();
TaxonNode parentTaxonNode;
List<UUID> excludeTaxa = new ArrayList<UUID>();
- excludeTaxa.add(
oldTaxonNode
.getUuid());
+ excludeTaxa.add(
((TaxonNode)oldTaxonNode).getTaxon()
.getUuid());
boolean moveToNewParent = true;
boolean moveToNewParent = true;