[Title] edit chart drag bug.

[Type] bug
[Module] edit chart dlg.
[Priority] normal
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
index fdbb403..0f729c2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
@@ -73,6 +73,7 @@ public class TimelineEditItemsDialog extends Dialog {
        
        private TimelineChartManager chartManager = TimelineChartManager.getInstance();
 
+       private boolean DragItemStartPlg = true;
        private int ItemIndexA = 0;
        private int ItemIndexB = 0;
        private int ItemDragOverIndex = 0;
@@ -125,7 +126,7 @@ public class TimelineEditItemsDialog extends Dialog {
                @Override
                public void handleClickEvent(DACustomButton button) {
                        // FIXME remove this
-                       chartManager.addCustomChart(new UserCustomChart(55, "custom"));
+                       //chartManager.addCustomChart(new UserCustomChart(55, "custom"));
                        shell.dispose();
                }
        };
@@ -267,6 +268,9 @@ public class TimelineEditItemsDialog extends Dialog {
                source.setTransfer(types);
                source.addDragListener(new DragSourceAdapter() {
                        public void dragSetData(DragSourceEvent event) {
+                               
+                       //      System.out.print("dragSetData \n");
+                               
                                DragSource ds = (DragSource) event.widget;
                                Table table = (Table) ds.getControl();
                                TableItem[] selection = table.getSelection();
@@ -285,7 +289,10 @@ public class TimelineEditItemsDialog extends Dialog {
                target.addDropListener(new DropTargetAdapter() {
                        public void dragEnter(DropTargetEvent event) {
 
-                               ItemIndexA = chartTableViewer.getTable().getSelectionIndex();
+                               if ( DragItemStartPlg == true ){
+                                       ItemIndexA = chartTableViewer.getTable().getSelectionIndex();
+                                       DragItemStartPlg = false;
+                                       }
 
                                if (event.detail == DND.DROP_DEFAULT) {
                                        event.detail = (event.operations & DND.DROP_COPY) != 0 ? DND.DROP_COPY : DND.DROP_NONE;
@@ -297,7 +304,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                }
                        }
 
-                       public void dragOver(DropTargetEvent event) {
+                       public void dragOver(DropTargetEvent event) {           
                                event.feedback = DND.FEEDBACK_SELECT | DND.FEEDBACK_SCROLL;
 
                                DropTarget target = (DropTarget) event.widget;
@@ -333,11 +340,11 @@ public class TimelineEditItemsDialog extends Dialog {
 
                                        
                                        
-                                       strIndexA = chartTableItems[ItemIndexB].getText(3);
-                                       strIndexB = chartTableItems[ItemIndexA].getText(3);
+                                       strIndexA = chartTableItems[ItemIndexA].getText(3);
+                                       strIndexB = chartTableItems[ItemIndexB].getText(3);
 
-                                       chartTableItems[ItemIndexA].setText(3, strIndexA);
-                                       chartTableItems[ItemIndexB].setText(3, strIndexB);
+                                       chartTableItems[ItemIndexB].setText(3, strIndexA);
+                                       chartTableItems[ItemIndexA].setText(3, strIndexB);
 
                                        
                                        
@@ -348,15 +355,15 @@ public class TimelineEditItemsDialog extends Dialog {
                                        tempIndex = ItemIndexA;
                                        ItemIndexA = ItemIndexB;
                                        ItemIndexB = tempIndex;
-                                       
-                                       
-                                       
-                                       
+
                                }
                                ItemDragOverIndex = ItemIndexB;
                        }
 
                        public void drop(DropTargetEvent event) {
+                               
+                               System.out.print("drop \n");
+                               DragItemStartPlg = true;
                                if (TextTransfer.getInstance().isSupportedType(event.currentDataType)) {
                                }
                        }