X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2FSelectorDisplay.java;h=fa6630dc5b71400bd4f7202fb688f9a911cc3f6f;hp=0f2b66b4610c93a102c7289414fac6af2c27c703;hb=1a735a99408fd3b0c5ac4fe7b2fdbdbb23d38f40;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636

diff --git a/tim/prune/gui/SelectorDisplay.java b/tim/prune/gui/SelectorDisplay.java
index 0f2b66b..fa6630d 100644
--- 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)
@@ -132,7 +132,7 @@ public class SelectorDisplay extends GenericDisplay
 
 		// 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)
 			{
@@ -211,6 +211,7 @@ public class SelectorDisplay extends GenericDisplay
 		{
 			_trackpointsLabel.setText(I18nManager.getText("details.notrack"));
 			_filenameLabel.setText("");
+			_filenameLabel.setToolTipText("");
 		}
 		else
 		{
@@ -219,14 +220,22 @@ public class SelectorDisplay extends GenericDisplay
 			int numFiles = _trackInfo.getFileInfo().getNumFiles();
 			if (numFiles == 1)
 			{
+				final String filenameString = _trackInfo.getFileInfo().getFilename();
 				_filenameLabel.setText(I18nManager.getText("details.track.file") + ": "
-					+ _trackInfo.getFileInfo().getFilename());
+					+ filenameString);
+				_filenameLabel.setToolTipText(filenameString);
 			}
 			else if (numFiles > 1)
 			{
-				_filenameLabel.setText(I18nManager.getText("details.track.numfiles") + ": " + numFiles);
+				final String labelText = I18nManager.getText("details.track.numfiles") + ": " + numFiles;
+				_filenameLabel.setText(labelText);
+				_filenameLabel.setToolTipText(labelText);
+			}
+			else
+			{
+				_filenameLabel.setText("");
+				_filenameLabel.setToolTipText("");
 			}
-			else _filenameLabel.setText("");
 		}
 
 		// Update scroller settings
@@ -313,7 +322,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());