X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fgui%2FMainWindow.java;h=bb69578dcee425637eab2c023ced025b79fc8a9e;hb=70ea21939e6071954eeb05f2a42e7a92a02013f2;hp=7d6449793abdca20ec0f1531c2ab9b349298a509;hpb=a5c77e5321c39d49a36ac0c5c5a979bbeeb4e24e;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/gui/MainWindow.java b/src/main/java/net/pterodactylus/sonitus/gui/MainWindow.java
index 7d64497..bb69578 100644
--- a/src/main/java/net/pterodactylus/sonitus/gui/MainWindow.java
+++ b/src/main/java/net/pterodactylus/sonitus/gui/MainWindow.java
@@ -30,9 +30,9 @@ import javax.swing.JTabbedPane;
 import javax.swing.Timer;
 import javax.swing.WindowConstants;
 
-import net.pterodactylus.sonitus.data.Controlled;
+import net.pterodactylus.sonitus.data.ControlledComponent;
 import net.pterodactylus.sonitus.data.Pipeline;
-import net.pterodactylus.sonitus.gui.PipelinePanel.ComponentHoverListener;
+import net.pterodactylus.sonitus.gui.PipelinePanel.ComponentSelectionListener;
 import net.pterodactylus.sonitus.main.Version;
 
 import com.google.common.base.Optional;
@@ -58,7 +58,7 @@ public class MainWindow extends JFrame {
 	private final JPanel infoPanel = new JPanel(infoPanelCardLayout);
 
 	/** The mapping from controlled components to info panels. */
-	private final Map<Controlled, ComponentInfoPanel> controlledInfoPanels = Maps.newHashMap();
+	private final Map<ControlledComponent, ComponentInfoPanel> controlledInfoPanels = Maps.newHashMap();
 
 	/**
 	 * Creates a new main window.
@@ -72,11 +72,11 @@ public class MainWindow extends JFrame {
 		tabbedPane.setBorder(BorderFactory.createEmptyBorder(12, 12, 12, 12));
 		final JPanel pipelineInfoPanel = new JPanel(new BorderLayout(12, 12));
 		PipelinePanel pipelinePanel = new PipelinePanel(pipeline);
-		pipelinePanel.addComponentHoverListener(new ComponentHoverListener() {
+		pipelinePanel.addComponentHoverListener(new ComponentSelectionListener() {
 
 			@Override
-			public void componentEntered(Controlled controlled) {
-				infoPanelCardLayout.show(infoPanel, controlled.name());
+			public void componentSelected(ControlledComponent controlledComponent) {
+				infoPanelCardLayout.show(infoPanel, controlledComponent.name());
 			}
 		});
 		pipelineInfoPanel.add(pipelinePanel, BorderLayout.CENTER);
@@ -86,10 +86,10 @@ public class MainWindow extends JFrame {
 		setSize(new Dimension(800, 450));
 
 		/* create info panels for all components. */
-		for (Controlled controlled : pipeline) {
-			ComponentInfoPanel componentInfoPanel = new ComponentInfoPanel(controlled);
-			infoPanel.add(componentInfoPanel, controlled.name());
-			controlledInfoPanels.put(controlled, componentInfoPanel);
+		for (ControlledComponent controlledComponent : pipeline) {
+			ComponentInfoPanel componentInfoPanel = new ComponentInfoPanel(controlledComponent);
+			infoPanel.add(componentInfoPanel, controlledComponent.name());
+			controlledInfoPanels.put(controlledComponent, componentInfoPanel);
 		}
 
 		Timer timer = new Timer(250, new ActionListener() {
@@ -97,7 +97,7 @@ public class MainWindow extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent actionEvent) {
 				/* update all info panels. */
-				for (Controlled controlled : MainWindow.this.pipeline) {
+				for (ControlledComponent controlled : MainWindow.this.pipeline) {
 					ComponentInfoPanel componentInfoPanel = controlledInfoPanels.get(controlled);
 					componentInfoPanel.input(MainWindow.this.pipeline.trafficCounter(controlled).input());
 					componentInfoPanel.output(MainWindow.this.pipeline.trafficCounter(controlled).output());