Attempted fix for clicking not working

PicPuzzle/src/NonogramComponent.java

@@ -4,15 +4,15 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.util.ArrayList;
 
 import javax.swing.SwingUtilities;
+import javax.swing.event.MouseInputListener;
 
 /**
  * Represent the GUI part of a {@link Nonogram}
  */
-public class NonogramComponent extends Component implements MouseMotionListener {
+public class NonogramComponent extends Component implements MouseInputListener {
 
 	/**
 	 * 
@@ -39,8 +39,8 @@ public class NonogramComponent extends Component implements MouseMotionListener
 		listeners = new ArrayList<NonogramEventListener>();
 		
 		addMouseMotionListener(this);
+		addMouseListener(this);
 		setPreferredSize(new Dimension(width*PIXELS_PER_SQUARE+1, height*PIXELS_PER_SQUARE+1));
-		
 	}
 	
 	/**
@@ -87,10 +87,8 @@ public class NonogramComponent extends Component implements MouseMotionListener
 			g2.drawLine(0, y*PIXELS_PER_SQUARE, height*PIXELS_PER_SQUARE, y*PIXELS_PER_SQUARE);
 		}
 	}
-
-	@Override
-	public void mouseDragged(MouseEvent e) {
-		
+	
+	private void mouseUpdate(MouseEvent e) {
 		boolean left = SwingUtilities.isLeftMouseButton(e);
 		boolean right = SwingUtilities.isRightMouseButton(e);
 		int x = e.getX() / PIXELS_PER_SQUARE;
@@ -103,7 +101,29 @@ public class NonogramComponent extends Component implements MouseMotionListener
 		}
 	}
 
+	@Override
+	public void mouseDragged(MouseEvent e) {
+		mouseUpdate(e);
+	}
+
 	@Override
 	public void mouseMoved(MouseEvent e) {}
+
+	@Override
+	public void mouseClicked(MouseEvent e) {}
+
+	@Override
+	public void mouseEntered(MouseEvent e) {}
+
+	@Override
+	public void mouseExited(MouseEvent e) {}
+
+	@Override
+	public void mousePressed(MouseEvent e) {
+		mouseUpdate(e);
+	}
+
+	@Override
+	public void mouseReleased(MouseEvent e) {}
 	
 }