X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=ui%2FListModel.java;h=12f6aa6217b0d66cda7a0fafe45997935284e6c6;hb=e47e88eb1890632fdae5d5b0b0a84c2881a2c69b;hp=7103dbac9a911203d92a1677795f481e8d9d07b2;hpb=ae474ca4ecdbbb4fbf45712cd650f99f91de649f;p=fanfix.git

diff --git a/ui/ListModel.java b/ui/ListModel.java
index 7103dba..12f6aa6 100644
--- a/ui/ListModel.java
+++ b/ui/ListModel.java
@@ -251,7 +251,7 @@ public class ListModel<T> extends DefaultListModel6<T> {
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" }) // JList<?> not in Java 1.6
 	public ListModel(final JList list, final JPopupMenu popup,
-			TooltipCreator<T> tooltipCreator) {
+			final TooltipCreator<T> tooltipCreator) {
 		this.list = list;
 		this.tooltipCreator = tooltipCreator;
 
@@ -276,13 +276,9 @@ public class ListModel<T> extends DefaultListModel6<T> {
 					fireElementChanged(oldIndex);
 					fireElementChanged(index);
 
-					Window oldTooltip = tooltip;
-					tooltip = null;
-					if (oldTooltip != null) {
-						oldTooltip.setVisible(false);
-					}
+					if (tooltipCreator != null) {
+						showTooltip(null);
 
-					if (ListModel.this.tooltipCreator != null) {
 						tooltipWatcher.delay("tooltip",
 								new SwingWorker<Void, Void>() {
 									@Override
@@ -293,6 +289,8 @@ public class ListModel<T> extends DefaultListModel6<T> {
 
 									@Override
 									protected void done() {
+										showTooltip(null);
+
 										if (index < 0
 												|| index != hoveredIndex) {
 											return;
@@ -303,7 +301,7 @@ public class ListModel<T> extends DefaultListModel6<T> {
 											return;
 										}
 
-										tooltip = newTooltip(index, me);
+										showTooltip(newTooltip(index, me));
 									}
 								});
 					}
@@ -345,12 +343,7 @@ public class ListModel<T> extends DefaultListModel6<T> {
 								list.locationToIndex(e.getPoint()));
 					}
 
-					Window oldTooltip = tooltip;
-					tooltip = null;
-					if (oldTooltip != null) {
-						oldTooltip.setVisible(false);
-					}
-
+					showTooltip(null);
 					popup.show(list, e.getX(), e.getY());
 				}
 			}
@@ -568,29 +561,45 @@ public class ListModel<T> extends DefaultListModel6<T> {
 
 	private Window newTooltip(final int index, final MouseEvent me) {
 		final T value = ListModel.this.get(index);
-
 		final Window newTooltip = tooltipCreator.generateTooltip(value, true);
-
 		if (newTooltip != null) {
 			newTooltip.addMouseListener(new MouseAdapter() {
 				@Override
 				public void mouseClicked(MouseEvent e) {
-
 					Window promotedTooltip = tooltipCreator
 							.generateTooltip(value, false);
-					promotedTooltip.setLocation(newTooltip.getLocation());
+					if (promotedTooltip != null) {
+						promotedTooltip.setLocation(me.getXOnScreen(),
+								me.getYOnScreen());
+						promotedTooltip.setVisible(true);
+					}
+
 					newTooltip.setVisible(false);
-					promotedTooltip.setVisible(true);
 				}
 			});
-			newTooltip.setLocation(me.getXOnScreen(), me.getYOnScreen());
 
-			newTooltip.setVisible(true);
+			newTooltip.setLocation(me.getXOnScreen(), me.getYOnScreen());
+			showTooltip(newTooltip);
 		}
 
 		return newTooltip;
 	}
 
+	private void showTooltip(Window tooltip) {
+		synchronized (tooltipCreator) {
+			if (this.tooltip != null) {
+				this.tooltip.setVisible(false);
+				this.tooltip.dispose();
+			}
+
+			this.tooltip = tooltip;
+
+			if (tooltip != null) {
+				tooltip.setVisible(true);
+			}
+		}
+	}
+
 	/**
 	 * Generate a {@link ListCellRenderer} that supports {@link Hoverable}
 	 * elements.