Changeset 1517 for trunk

Timestamp:

03/10/20 16:03:37 (4 years ago)

Author:

bnemhaus

Message:

Fixed an issue where Apollo PLACE gesture was causing creating polylines not to work.

Explanation: It used to be that Apollo would get first go at interpreting mouse/keyboard actions and would then optionally pass off to Expeditee. This was changed with the new GIO rework for both base Expeditee and Apollo getting to run their gestures. In this scenario, Expeditee was getting it's go at performing PLACE, and actually doing polylines correctly, but then Apollo was getting it's go and clearing the FreeItems list (which contained the new part of the polyline).

File:

• trunk/src/org/apollo/ApolloGestureActions.java (modified) (6 diffs)

trunk/src/org/apollo/ApolloGestureActions.java

@@ -1 +1 @@
 package org.apollo;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -210 +211 @@
                                 new GestureAction() {                           
                                         
-                                        final List<SampledTrack> sampledTracks = new LinkedList<SampledTrack>();
+                                        final List<SampledTrack> sampledTracksOnFreeItems = new ArrayList<SampledTrack>();
                         
                                         @Override
@@ -223 +224 @@
                                                                 final SampledTrack st = (SampledTrack) w;
                                                                 st.setIgnoreInjection(true); 
-                                                                sampledTracks.add(st);
+                                                                sampledTracksOnFreeItems.add(st);
                                                         }
                                                 });
@@ -229 +230 @@
                                                  
                                         @Override
-                                        public void exec(final Gesture gesture) {
+                                        public void exec(final Gesture gesture) {                                               
                                                 final PickUpGestureData data = (PickUpGestureData) gesture.getData();
                                                 final List<Item> widgetPieces = new LinkedList<Item>();
                                                 if (data.getCopy()) {
-                                                        sampledTracks.forEach(st -> { 
+                                                        sampledTracksOnFreeItems.forEach(st -> { 
                                                                 st.getItems().forEach(i -> { 
                                                                         StandardGestureActions.anchor(i);
@@ -239 +240 @@
                                                                 });
                                                         });
-                                                        FreeItems.getInstance().clear();
+                                                        //FreeItems.getInstance().clear();
+                                                        FreeItems.getInstance().removeAll(widgetPieces);
                                                         anchorTracks(widgetPieces);
                                                         final List<Item> toPickup = new LinkedList<Item>();
-                                                        sampledTracks.forEach(st -> { 
+                                                        sampledTracksOnFreeItems.forEach(st -> { 
                                                                 try {
                                                                         final Widget copy = st.copy();
@@ -260 +262 @@
                                         @Override
                                         public void finalise(final Gesture gesture) {
-                                                sampledTracks.forEach(st -> st.setIgnoreInjection(false));
-                                                sampledTracks.clear();
+                                                sampledTracksOnFreeItems.forEach(st -> st.setIgnoreInjection(false));
+                                                sampledTracksOnFreeItems.clear();
                                         }
                                 });