Revision: 592 Author: heuermh Date: Mon Jul 27 19:27:36 2009 Log: Issue 19, Issue 90 ; rolling back changes made in r395 http://code.google.com/p/piccolo2d/source/detail?r=592
Modified: /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PInputManager.java /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEvent.java /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PInputManagerTest.java /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PBasicInputEventListenerTest.java /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java ======================================= --- /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PInputManager.java Fri Jan 23 12:25:52 2009 +++ /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/PInputManager.java Mon Jul 27 19:27:36 2009 @@ -89,7 +89,7 @@ * Set the node that should receive key events. */ public void setKeyboardFocus(PInputEventListener eventHandler) { - PInputEvent focusEvent = new PInputEvent(this, null, null); + PInputEvent focusEvent = new PInputEvent(this, null); if (keyboardFocus != null) { dispatchEventToListener(focusEvent, FocusEvent.FOCUS_LOST, keyboardFocus); @@ -228,7 +228,7 @@ if (nextInput == null) return; - PInputEvent e = new PInputEvent(this, nextInput, nextInputSource); + PInputEvent e = new PInputEvent(this, nextInput); Point2D newCurrentCanvasPosition = null; Point2D newLastCanvasPosition = null; ======================================= --- /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEvent.java Sat Jul 18 05:08:49 2009 +++ /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEvent.java Mon Jul 27 19:27:36 2009 @@ -64,14 +64,12 @@ private InputEvent inputEvent; private PPickPath pickPath; private PInputManager inputManager; - private PCamera inputSource; private boolean handled; - public PInputEvent(PInputManager inputManager, InputEvent event, PCamera inputSource) { + public PInputEvent(PInputManager inputManager, InputEvent event) { super(); inputEvent = event; this.inputManager = inputManager; - this.inputSource = inputSource; } public void pushCursor(Cursor cursor) { @@ -102,7 +100,7 @@ * getTopCamera. */ public PCamera getCamera() { - return (getPath() == null) ? inputSource : getPath().getBottomCamera(); + return getPath().getBottomCamera(); } /** @@ -110,7 +108,7 @@ * with the PCanvas that requested the current repaint. */ public PCamera getTopCamera() { - return (getPath() == null) ? inputSource : getPath().getTopCamera(); + return getPath().getTopCamera(); } /** ======================================= --- /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PInputManagerTest.java Tue Jul 14 12:23:14 2009 +++ /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/PInputManagerTest.java Mon Jul 27 19:27:36 2009 @@ -78,14 +78,14 @@ public void testKeyPressedDispatchesToCurrentFocus() { manager.setKeyboardFocus(mockListener); - PInputEvent event = new PInputEvent(manager, null, null); + PInputEvent event = new PInputEvent(manager, null); manager.keyPressed(event); assertEquals(2, mockListener.getNotificationCount()); assertEquals(KeyEvent.KEY_PRESSED, mockListener.getNotification(1).type); } public void testKeyReleasedDispatchesToCurrentFocus() { manager.setKeyboardFocus(mockListener); - PInputEvent event = new PInputEvent(manager, null, null); + PInputEvent event = new PInputEvent(manager, null); manager.keyReleased(event); assertEquals(2, mockListener.getNotificationCount()); assertEquals(KeyEvent.KEY_RELEASED, mockListener.getNotification(1).type); @@ -93,7 +93,7 @@ public void testKeyTypedDispatchesToCurrentFocus() { manager.setKeyboardFocus(mockListener); - PInputEvent event = new PInputEvent(manager, null, null); + PInputEvent event = new PInputEvent(manager, null); manager.keyTyped(event); assertEquals(2, mockListener.getNotificationCount()); assertEquals(KeyEvent.KEY_TYPED, mockListener.getNotification(1).type); ======================================= --- /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PBasicInputEventListenerTest.java Sun Jul 19 09:01:04 2009 +++ /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PBasicInputEventListenerTest.java Mon Jul 27 19:27:36 2009 @@ -53,7 +53,7 @@ private PInputEvent buildInputEvent() { PCanvas canvas = new PCanvas(); MouseEvent mouseEvent = new MouseEvent(canvas, 1, System.currentTimeMillis(), 0, 0, 0, 1, false); - PInputEvent event = new PInputEvent(canvas.getRoot().getDefaultInputManager(), mouseEvent, canvas.getCamera()); + PInputEvent event = new PInputEvent(canvas.getRoot().getDefaultInputManager(), mouseEvent); return event; } ======================================= --- /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java Tue Jul 21 07:46:08 2009 +++ /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java Mon Jul 27 19:27:36 2009 @@ -7,7 +7,6 @@ import javax.swing.JPanel; import junit.framework.TestCase; -import edu.umd.cs.piccolo.PCamera; import edu.umd.cs.piccolo.PInputManager; public class PInputEventFilterTest extends TestCase { @@ -216,9 +215,8 @@ private PInputEvent buildTestEvent(int modifiers, int clickCount) { JComponent component = new JPanel(); PInputManager inputManager = new PInputManager(); - PCamera camera = new PCamera(); MouseEvent event = new MouseEvent(component, 1, System.currentTimeMillis(), modifiers, 1, 1, clickCount, false); - return new PInputEvent(inputManager, event, camera); + return new PInputEvent(inputManager, event); } } ======================================= --- /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java Tue Jul 21 07:46:08 2009 +++ /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java Mon Jul 27 19:27:36 2009 @@ -5,7 +5,10 @@ import java.awt.event.MouseEvent; import junit.framework.TestCase; +import edu.umd.cs.piccolo.PCamera; import edu.umd.cs.piccolo.PCanvas; +import edu.umd.cs.piccolo.util.PBounds; +import edu.umd.cs.piccolo.util.PPickPath; public class PInputEventTest extends TestCase { private PCanvas canvas; @@ -17,12 +20,10 @@ canvas.setPreferredSize(new Dimension(100, 100)); canvas.setBounds(0, 0, 100, 100); swingEvent = buildSwingClick(5, 5); - - mouseEvent = new PInputEvent(canvas.getRoot().getDefaultInputManager(), swingEvent, canvas.getCamera()); - } - - public void testGetCameraUsesInputSourceIfPathIsNull() { - assertEquals(canvas.getCamera(), mouseEvent.getCamera()); + PCamera camera = canvas.getCamera(); + PPickPath pickPath = new PPickPath(camera, new PBounds(0, 0, 10, 10)); + mouseEvent = new PInputEvent(canvas.getRoot().getDefaultInputManager(), swingEvent); + mouseEvent.setPath(pickPath); } public void testInputManagerShouldBeSameAsGivenToConstructor() { --~--~---------~--~----~------------~-------~--~----~ Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en -~----------~----~----~----~------~----~------~--~---