Version 16, February 2014

[GpsPrune.git] / tim / prune / gui / SelectorDisplay.java

diff --git a/tim/prune/gui/SelectorDisplay.java b/tim/prune/gui/SelectorDisplay.java
index f0772bf2695a3aed6ab7a803623dbe180c2fbe3a..a4df9cd0df3a680ec486192c31c041e60ea0c446 100644 (file)
--- a/tim/prune/gui/SelectorDisplay.java
+++ b/tim/prune/gui/SelectorDisplay.java
@@ -43,15 +43,15 @@ public class SelectorDisplay extends GenericDisplay
        private int _visiblePanels = 1;
        // Waypoints
        private JPanel _waypointListPanel = null;
-       private JList _waypointList = null;
+       private JList<String> _waypointList = null;
        private WaypointListModel _waypointListModel = null;
        // Photos
        private JPanel _photoListPanel = null;
-       private JList _photoList = null;
+       private JList<String> _photoList = null;
        private MediaListModel _photoListModel = null;
        // Audio files
        private JPanel _audioListPanel = null;
-       private JList _audioList = null;
+       private JList<String> _audioList = null;
        private MediaListModel _audioListModel = null;
 
        // scrollbar interval
@@ -106,7 +106,7 @@ public class SelectorDisplay extends GenericDisplay
                        BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
                );
                _waypointListModel = new WaypointListModel(_trackInfo.getTrack());
-               _waypointList = new JList(_waypointListModel);
+               _waypointList = new JList<String>(_waypointListModel);
                _waypointList.setVisibleRowCount(NUM_LIST_ENTRIES);
                _waypointList.addListSelectionListener(new ListSelectionListener() {
                        public void valueChanged(ListSelectionEvent e)
@@ -118,7 +118,7 @@ public class SelectorDisplay extends GenericDisplay
                _listsPanel.add(_waypointListPanel);
                // photo list
                _photoListModel = new MediaListModel(_trackInfo.getPhotoList());
-               _photoList = new JList(_photoListModel);
+               _photoList = new JList<String>(_photoListModel);
                _photoList.setVisibleRowCount(NUM_LIST_ENTRIES);
                _photoList.addListSelectionListener(new ListSelectionListener() {
                        public void valueChanged(ListSelectionEvent e)
@@ -130,9 +130,9 @@ public class SelectorDisplay extends GenericDisplay
                _photoListPanel = makeListPanel("details.lists.photos", _photoList);
                // don't add photo list (because there aren't any photos yet)
 
-               // List for audio files
+               // List for audio clips
                _audioListModel = new MediaListModel(_trackInfo.getAudioList());
-               _audioList = new JList(_audioListModel);
+               _audioList = new JList<String>(_audioListModel);
                _audioList.addListSelectionListener(new ListSelectionListener() {
                        public void valueChanged(ListSelectionEvent e)
                        {
@@ -181,8 +181,8 @@ public class SelectorDisplay extends GenericDisplay
        }
 
        /**
-        * Select the specified audio file
-        * @param inIndex index of selected audio file
+        * Select the specified audio clip
+        * @param inIndex index of selected audio clip
         */
        private void selectAudio(int inIndex)
        {
@@ -253,7 +253,7 @@ public class SelectorDisplay extends GenericDisplay
                {
                        _waypointListModel.fireChanged();
                }
-               if ((inUpdateType |
+               if ((inUpdateType &
                        (DataSubscriber.DATA_ADDED_OR_REMOVED | DataSubscriber.DATA_EDITED | DataSubscriber.PHOTOS_MODIFIED)) > 0)
                {
                        _photoListModel.fireChanged();
@@ -289,7 +289,7 @@ public class SelectorDisplay extends GenericDisplay
                                }
                        }
                }
-               // Same for audio files
+               // Same for audio clips
                if (_audioListModel.getSize() > 0)
                {
                        int audioIndex = _trackInfo.getSelection().getCurrentAudioIndex();
@@ -313,7 +313,7 @@ public class SelectorDisplay extends GenericDisplay
         * @param inList list object
         * @return panel object
         */
-       private static JPanel makeListPanel(String inNameKey, JList inList)
+       private static JPanel makeListPanel(String inNameKey, JList<String> inList)
        {
                JPanel panel = new JPanel();
                panel.setLayout(new BorderLayout());