Merge pull request #79 from ProgrammingLife3/newDetailView

Made DetailView scrollable!

Author: mathieupost

src/main/java/tudelft/ti2806/pl3/controls/MouseManager.java

@@ -5,7 +5,7 @@
 import org.graphstream.ui.swingViewer.View;
 import org.graphstream.ui.swingViewer.util.DefaultMouseManager;
 import tudelft.ti2806.pl3.data.wrapper.WrapperClone;
-import tudelft.ti2806.pl3.detailView.DetailView;
+import tudelft.ti2806.pl3.detailview.DetailView;
 
 import java.awt.BorderLayout;
 import java.awt.event.MouseEvent;
@@ -18,8 +18,9 @@
 public class MouseManager extends DefaultMouseManager {
 	private static final int MARGIN = 5;
 
-	WrapperClone node = null;
-	DetailView detailView;
+	private WrapperClone node = null;
+	private DetailView detailView;
+	private boolean clicked = false;
 
 	public MouseManager() {
 		detailView = new DetailView();
@@ -31,9 +32,28 @@ public void init(GraphicGraph graph, View view) {
 		view.setLayout(null);
 	}
 
+	@Override
+	public void mouseClicked(MouseEvent e) {
+		super.mouseClicked(e);
+		int x = e.getX();
+		int y = e.getY();
+
+		WrapperClone clickedNode = getNodeAtPosition(x, y);
+		if (clickedNode == null) {
+			clicked = false;
+			removeDetailView();
+		} else {
+			clicked = true;
+			showDetailView(clickedNode, x, y);
+		}
+	}
+
 	@Override
 	public void mouseMoved(MouseEvent e) {
 		super.mouseMoved(e);
+		if (clicked) {
+			return;
+		}
 		int x = e.getX();
 		int y = e.getY();
 		mouseMoved(x, y);
@@ -47,18 +67,22 @@ public void mouseMoved(MouseEvent e) {
 	 * 		y location of the mouse cursor.
 	 */
 	public void mouseMoved(int x, int y) {
-		ArrayList<GraphicElement> graphicElements = view.allNodesOrSpritesIn(x - MARGIN, y - MARGIN, x + MARGIN, y + MARGIN);
-		if (graphicElements.size() == 0) {
+		node = getNodeAtPosition(x, y);
+		if (node == null) {
 			removeDetailView();
+		} else {
+			showDetailView(node, x, y);
+		}
+	}
+
+	private WrapperClone getNodeAtPosition(int x, int y) {
+		ArrayList<GraphicElement> graphicElements =
+				view.allNodesOrSpritesIn(x - MARGIN, y - MARGIN, x + MARGIN, y + MARGIN);
+		if (graphicElements.size() == 0) {
+			return null;
 		} else {
 			GraphicElement element = graphicElements.get(0);
-			WrapperClone wrapper = element.getAttribute("node", WrapperClone.class);
-			if (node != wrapper) {
-				node = wrapper;
-				view.add(detailView, BorderLayout.WEST);
-				detailView.setNode(node, x, y);
-				view.updateUI();
-			}
+			return element.getAttribute("node", WrapperClone.class);
 		}
 	}
 
@@ -70,4 +94,10 @@ public void removeDetailView() {
 		view.remove(detailView);
 		view.updateUI();
 	}
+
+	private void showDetailView(WrapperClone node, int x, int y) {
+		view.add(detailView, BorderLayout.WEST);
+		detailView.setNode(node, x, y);
+		view.updateUI();
+	}
 }

src/main/java/tudelft/ti2806/pl3/detailView/DetailView.java renamed to src/main/java/tudelft/ti2806/pl3/detailview/DetailView.java

@@ -1,32 +1,49 @@
-package tudelft.ti2806.pl3.detailView;
+package tudelft.ti2806.pl3.detailview;
 
 import tudelft.ti2806.pl3.data.wrapper.WrapperClone;
 
-import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
 
 /**
  * This view is added when more details about a node are needed.
  * @author mathieu
  */
 public class DetailView extends JPanel {
 	private static final int BORDER = 10;
-	private static final int MAX_ROWS = 5;
 	private static final int POSITION_OFFSET = 30;
+	public static final String REF_GENOME = "REF";
+
+	/**
+	 * Custom string comparator to prioritize the TKK_REF genome string.
+	 */
+	private Comparator<String> comparator = (o1, o2) -> {
+		if (o1.contains(REF_GENOME)) {
+			return -1;
+		} else if (o2.contains(REF_GENOME)) {
+			return 1;
+		}
+		return o1.compareTo(o2);
+	};
 
 	/**
 	 * Constructs a DetailView and set a border and the preferred layout.
 	 */
 	public DetailView() {
-		BoxLayout layout = new BoxLayout(this, BoxLayout.Y_AXIS);
+		BoxLayout layout = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(layout);
 		setBorder(BorderFactory.createEmptyBorder(BORDER, BORDER, BORDER, BORDER));
 	}
@@ -43,67 +60,39 @@ public DetailView() {
 	public void setNode(WrapperClone node, int x, int y) {
 		removeAll();
 
-		Set<String> genomes = new HashSet<>();
-		node.getGenome().forEach(genome -> genomes.add(genome.getIdentifier()));
-		addLabels("Genomes:", genomes, "TKK_REF");
-
-		if (node.getLabels().size() > 0) {
-			add(" ");
-		}
-
-		Set<String> labels = new HashSet<>();
-		node.getLabels().forEach(label -> labels.add(label.getText()));
-		addLabels("Labels:", labels);
+		addList(node.getGenome(), "Genomes: ");
+		addList(node.getLabels(), "Labels: ");
 
 		Dimension size = getPreferredSize();
 		setBounds(x, y, size.width, size.height);
 	}
 
 	/**
-	 * Same as addLabels(String, Set, String) but without a filter.
-	 */
-	private void addLabels(String title, Set<String> set) {
-		addLabels(title, set, null);
-	}
-
-	/**
-	 * Add JLabels for every object in the given set.
+	 * Adds a collection as a scrollable list to itself.
+	 * @param collection
+	 * 		the collection to be added as list.
 	 * @param title
-	 * 		Label to be displayed above the list of labels.
-	 * @param set
-	 * 		The set of objects to be displayed in the list.
-	 * @param filter
-	 * 		A string that will always be displayed if found in the set.
+	 * 		if not null, this string will be added above the list as header.
 	 */
-	private void addLabels(String title, Set<String> set, String filter) {
-		if (set.size() > 0) {
-			add(title);
+	private void addList(Collection collection, String title) {
+		if (collection.size() == 0) {
+			return;
 		}
-
-		Iterator<String> iterator = set.iterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			String nextString = iterator.next();
-			if (filter != null && filter.equals(nextString)) {
-				filter = null;
-				if (i >= MAX_ROWS) {
-					add(nextString);
-					i++;
-					break;
-				}
-			}
-			if (i < MAX_ROWS) {
-				add(nextString);
-				i++;
-			}
+		Set<String> stringSet = new HashSet<>(collection.size());
+		Iterator iterator = collection.iterator();
+		for (int i = 0; i < collection.size(); i++) {
+			stringSet.add(iterator.next().toString());
 		}
-		if (i < set.size()) {
-			add("...");
+		String[] array = stringSet.toArray(new String[stringSet.size()]);
+		Arrays.sort(array, comparator);
+		JList<Object> list = new JList<>(array);
+		list.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+		list.setLayoutOrientation(JList.VERTICAL);
+		JScrollPane listScroller = new JScrollPane(list);
+		if (title != null) {
+			listScroller.setColumnHeaderView(new JLabel(title));
 		}
-	}
-
-	public Component add(String label) {
-		return super.add(new JLabel(label));
+		add(listScroller);
 	}
 
 	@Override