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:
6845022
)
fix move taxonnode in natural order
author
Katja Luther
<k.luther@bgbm.org>
Thu, 15 Oct 2015 09:26:11 +0000
(11:26 +0200)
committer
Katja Luther
<k.luther@bgbm.org>
Thu, 15 Oct 2015 09:26:11 +0000
(11:26 +0200)
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
index e0f8a056682c00baa38a17452a86ab1df8f46d55..bdf2eb91cfed78ef4a8ac22aa47a92c4b91d722f 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
@@
-238,7
+238,7
@@
public class TreeNodeDropAdapter extends ViewerDropAdapter implements IPostOpera
TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode;
AbstractPostOperation operation = new MoveTaxonOperation
TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode;
AbstractPostOperation operation = new MoveTaxonOperation
- ("Move Taxon", workspaceUndoContext, uuids, targetNode
.getParent()
, this, taxonNavigator, false);
+ ("Move Taxon", workspaceUndoContext, uuids, targetNode, this, taxonNavigator, false);
NavigationUtil.executeOperation(operation);
logger.info("Moved taxa to new parent " + targetITaxonTreeNode);
NavigationUtil.executeOperation(operation);
logger.info("Moved taxa to new parent " + targetITaxonTreeNode);
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
index 842f9a8c6fb0b43ff0cf68a2cc98fac3f1957b10..6b698ffcff7b570b5d594d0724a0f60be9286269 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
@@
-244,7
+244,7
@@
public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
NavigationUtil.executeOperation(operation, null);
} else {
AbstractPostOperation operation = new MoveTaxonOperation
NavigationUtil.executeOperation(operation, null);
} else {
AbstractPostOperation operation = new MoveTaxonOperation
- ("Move Taxon", workspaceUndoContext, uuids, targetNode
.getParent()
, this, taxonNavigator, false);
+ ("Move Taxon", workspaceUndoContext, uuids, targetNode, this, taxonNavigator, false);
NavigationUtil.executeOperation(operation);
}
logger.info("Moved taxa to new parent " + targetITaxonTreeNode);
NavigationUtil.executeOperation(operation);
}
logger.info("Moved taxa to new parent " + targetITaxonTreeNode);
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
index 830d572a4cb9088551fbeca75738c0cfdec9846b..eef8af10c273dad438d0a6265e88a86113949038 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
@@
-84,7
+84,7
@@
public class MoveTaxonOperation extends AbstractPersistentPostOperation {
bind();
monitor.worked(20);
bind();
monitor.worked(20);
- UpdateResult result = CdmStore.getService(ITaxonNodeService.class).moveTaxonNodes(this.taxonNodesUuid,newParentTreeNode.getUuid());
+ UpdateResult result = CdmStore.getService(ITaxonNodeService.class).moveTaxonNodes(this.taxonNodesUuid,newParentTreeNode.getUuid()
, moveToParentNode
);
// try {
// for (TaxonNode taxonNode : taxonNodes){
// TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode,
// try {
// for (TaxonNode taxonNode : taxonNodes){
// TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode,
diff --git
a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
index 65e5144786e02ec4063cc8ca92468a7910b2ee86..fca68db76daef3c4f9fabf1ed99af86a723e82cf 100644
(file)
--- a/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
+++ b/
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
@@
-32,7
+32,7
@@
public class RemotingMoveTaxonOperation extends RemotingCdmUpdateOperation {
private final static String LABEL = "Move Taxon operation";
private final static String LABEL = "Move Taxon operation";
- private Set<UUID> taxonNodesToMoveUuid;
+ private
final
Set<UUID> taxonNodesToMoveUuid;
private final UUID newParentTreeNodeUuid;
private final boolean moveToParentNode;
private final UUID newParentTreeNodeUuid;
private final boolean moveToParentNode;
@@
-77,7
+77,7
@@
public class RemotingMoveTaxonOperation extends RemotingCdmUpdateOperation {
@Override
protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
return CdmApplicationState.getService(ITaxonNodeService.class).moveTaxonNodes(taxonNodesToMoveUuid,
@Override
protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
return CdmApplicationState.getService(ITaxonNodeService.class).moveTaxonNodes(taxonNodesToMoveUuid,
- newParentTreeNodeUuid);
+ newParentTreeNodeUuid
, moveToParentNode
);
}
}
}
}