Changeset 1156 for trunk

Timestamp:

09/20/18 14:20:32 (6 years ago)

Author:

bln4

Message:

org.apollo.widgets.SampledTrack ->

Raised visibility of SampledTrack.ignoreInjection through a getter and setter. This is used in a fix for moving SampledTracks.

File:

• trunk/src/org/apollo/widgets/SampledTrack.java (modified) (8 diffs)

trunk/src/org/apollo/widgets/SampledTrack.java

@@ -41 +41 @@
 import org.apollo.gui.PlaybackControlPopup;
 import org.apollo.gui.SampledTrackGraphView;
+import org.apollo.gui.SampledTrackGraphView.EffecientInvalidator;
 import org.apollo.gui.Strokes;
-import org.apollo.gui.SampledTrackGraphView.EffecientInvalidator;
 import org.apollo.io.AudioIO;
+import org.apollo.io.AudioIO.AudioFileLoader;
 import org.apollo.io.AudioPathManager;
 import org.apollo.io.IconRepository;
-import org.apollo.io.AudioIO.AudioFileLoader;
 import org.apollo.items.EmulatedTextItem;
 import org.apollo.items.EmulatedTextItem.TextChangeListener;
@@ -77 +77 @@
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
 import org.expeditee.items.widgets.Widget;
-import org.expeditee.taskmanagement.EntitySaveManager;
 
 /**
@@ -237 +236 @@
                         fulltrackView.setBackColor(SampledTrackGraphView.DEFAULT_BACKGROUND_COLOR, SampledTrackGraphView.DEFAULT_BACKGROUND_HIGHTLIGHTS_COLOR);
                 }
-                
-                EntitySaveManager.getInstance().saveAll();
-
         }
 
@@ -307 +303 @@
                                         
                                         // Determine where popup should show
-                                        int x = SampledTrack.this.getX();
+                                        //int x = SampledTrack.this.getX();
                                         int y = SampledTrack.this.getY() - playbackControlPopup.getFullBounds().getHeight() - 2; // by default show above
                                         
@@ -1442 +1438 @@
                                         MouseEvent me = MouseEventRouter.getCurrentMouseEvent();
                                         
-                                        if (!ignoreInjection && me != null && me != lastInsertME &&
+                                        if (!isIgnoreInjection() && me != null && me != lastInsertME &&
                                                         (me.getButton() == MouseEvent.BUTTON2 ||
                                                                         me.getButton() == MouseEvent.BUTTON3)) {
@@ -1466 +1462 @@
                                                 }
                                                         
-                                        } else if (!ignoreInjection && me == lastInsertME) {
+                                        } else if (!isIgnoreInjection() && me == lastInsertME) {
                                                 // Note due to a injection removing this widget while in the midst of
                                                 // anchoring, the widget parent event filtering will not work thus
@@ -1794 +1790 @@
         
                                 // Anchor it
-                                rightSideTrack.ignoreInjection = true;
+                                rightSideTrack.setIgnoreInjection(true);
                                 target.addAllItems(rightSideTrack.getItems());
-                                rightSideTrack.ignoreInjection = false;
+                                rightSideTrack.setIgnoreInjection(false);
                                 
                                 // Adjust initiation time to be exact
@@ -2136 +2132 @@
                 return false;
         }
+
+        public boolean isIgnoreInjection() {
+                return ignoreInjection;
+        }
+
+        public void setIgnoreInjection(boolean ignoreInjection) {
+                this.ignoreInjection = ignoreInjection;
+        }
 }