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:
dbde6b7
)
minor
author
Katja Luther
<k.luther@bgbm.org>
Mon, 11 May 2015 11:49:42 +0000
(11:49 +0000)
committer
Katja Luther
<k.luther@bgbm.org>
Mon, 11 May 2015 11:49:42 +0000
(11:49 +0000)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDragSourceEffect.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDragSourceEffect.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDragSourceEffect.java
index c1362a2872339f0d1db37602736cbd51b5edd5f8..2c24b900473a00c1a23fd61601f4a40fc167928a 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDragSourceEffect.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDragSourceEffect.java
@@
-3,7
+3,6
@@
*/
package eu.etaxonomy.taxeditor.editor.name.dnd;
*/
package eu.etaxonomy.taxeditor.editor.name.dnd;
-import org.eclipse.swt.SWTException;
import org.eclipse.swt.dnd.DragSourceEffect;
import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.dnd.DragSourceEffect;
import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.widgets.Control;
@@
-35,9
+34,8
@@
public class NameEditorDragSourceEffect extends DragSourceEffect {
/** {@inheritDoc} */
@Override
public void dragFinished(DragSourceEvent event) {
/** {@inheritDoc} */
@Override
public void dragFinished(DragSourceEvent event) {
+ // TODO Auto-generated method stub
super.dragFinished(event);
super.dragFinished(event);
-
}
}
-
}
}
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java
index f04ccb16d5502f8d478a521af2473926eb7c1300..c8bccaa26f795ba7294ed37f037927e00c138a89 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java
@@
-9,7
+9,6
@@
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetAdapter;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.DropTargetAdapter;
import org.eclipse.swt.dnd.DropTargetEvent;
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.reference.Reference;
@@
-69,9
+68,7
@@
public class NameEditorDropTargetListener extends DropTargetAdapter {
/** {@inheritDoc} */
public void drop(DropTargetEvent dropTargetEvent) {
/** {@inheritDoc} */
public void drop(DropTargetEvent dropTargetEvent) {
- if (!EditorUtil.forceUserSave(target.getEditor(), dropTargetEvent.display.getActiveShell())){
- return ;
- }
+
TaxonBase taxonBase = getDroppedTaxonBase(dropTargetEvent);
Assert.isNotNull(taxonBase);
TaxonBase taxonBase = getDroppedTaxonBase(dropTargetEvent);
Assert.isNotNull(taxonBase);
@@
-105,7
+102,6
@@
public class NameEditorDropTargetListener extends DropTargetAdapter {
private AbstractPostOperation createOperation(TaxonBase taxonBase) {
private AbstractPostOperation createOperation(TaxonBase taxonBase) {
-
if(taxonBase instanceof Synonym){
Synonym synonym = (Synonym) taxonBase;
if(taxonBase instanceof Synonym){
Synonym synonym = (Synonym) taxonBase;