seeking

src/de/raumzeitlabor/pr0nwall/ds/FrameList.java

@@ -1,7 +1,5 @@
 package de.raumzeitlabor.pr0nwall.ds;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 

src/de/raumzeitlabor/pr0nwall/ds/LED.java

@@ -5,7 +5,6 @@
 
 public class LED {
 	private boolean enabled = false;
-	private Shape shape;
 
 	public boolean isEnabled() {
 		return enabled;
@@ -15,19 +14,8 @@ public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
 
-	public void toggleEnabled() {
+	public boolean toggleEnabled() {
 		this.enabled = !this.enabled;
-	}
-
-	public boolean hasShape() {
-		return shape != null;
-	}
-
-	public void setShape(Shape s) {
-		this.shape = s;
-	}
-
-	public Shape getShape() {
-		return shape;
+		return this.enabled;
 	}
 }

src/de/raumzeitlabor/pr0nwall/gui/FrameSeeker.java

@@ -8,10 +8,12 @@
 import javax.swing.JSlider;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import de.raumzeitlabor.pr0nwall.ds.FrameList;
 
-public class FrameSeeker extends JSlider implements MouseWheelListener {
+public class FrameSeeker extends JSlider implements MouseWheelListener, ChangeListener {
 
 	/**
 	 * 
@@ -21,7 +23,7 @@ public class FrameSeeker extends JSlider implements MouseWheelListener {
 	private LEDPanel panel;
 
 	public FrameSeeker(LEDPanel panel) {
-		setMajorTickSpacing(5);
+		setMajorTickSpacing(1);
 		setMinorTickSpacing(1);
 		setSnapToTicks(true);
 		setPaintTicks(true);
@@ -35,22 +37,24 @@ public FrameSeeker(LEDPanel panel) {
                 new EmptyBorder(5, 10, 5, 10)));
 
 		addMouseWheelListener(this);
+		addChangeListener(this);
 
 		this.panel = panel;
 	}
 
 	public void refresh() {
-		setValue(panel.getCurrentFrameNumber());
 		setMaximum(panel.getNumberOfFrames());
 	}
 
 	@Override
 	public void mouseWheelMoved(MouseWheelEvent e) {
 		int newVal = getValue() + e.getWheelRotation();
-
-		if (newVal >= 1 && newVal <= panel.getNumberOfFrames()) {
-			panel.seekToFrame(newVal);
-			refresh();
-		}
+		panel.seekToFrame(newVal);
+	}
+
+	@Override
+	public void stateChanged(ChangeEvent arg0) {
+		int newVal = getValue();
+		panel.seekToFrame(newVal);
 	}
 }