gridarta-commit Mailing List for gridarta (Page 23)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9185
          http://gridarta.svn.sourceforge.net/gridarta/?rev=9185&view=rev
Author:   akirschbaum
Date:     2012-06-15 19:57:18 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Rename MapUserListenerManager to MapMouseListener.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListenerManager.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapMouseListener.java

Removed Paths:
-------------
    trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java

Copied: trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapMouseListener.java (from rev 9184, trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java)
===================================================================

--- trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapMouseListener.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapMouseListener.java	2012-06-15 19:57:18 UTC (rev 9185)
@@ -0,0 +1,194 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.mapuserlistener;
+
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import net.sf.gridarta.gui.map.event.MouseOpEvent;
+import net.sf.gridarta.gui.map.event.MouseOpListener;
+import net.sf.gridarta.gui.map.mapview.MapView;
+import net.sf.gridarta.gui.map.renderer.MapRenderer;
+import net.sf.gridarta.gui.panel.tools.ToolPalette;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Tracks mouse actions and calls the appropriate {@link MouseOpListener
+ * MouseOpListeners}.
+ * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
+ * @author Andreas Kirschbaum
+ */
+public class MapMouseListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+
+    /**
+     * The {@link ToolPalette} for mapping mouse events to {@link
+     * MouseOpListener actions}.
+     */
+    @NotNull
+    private final ToolPalette<G, A, R> toolPalette;
+
+    /**
+     * The {@link MapRenderer} being tracked for mouse actions.
+     */
+    @NotNull
+    private final MapRenderer renderer;
+
+    /**
+     * Temporary point. Stored in a field to avoid frequent reallocation.
+     */
+    @NotNull
+    private final Point tmpPoint = new Point();
+
+    /**
+     * The parameters for the currently processed event. Stored in a field to
+     * avoid frequent reallocation.
+     */
+    @NotNull
+    private final MouseOpEvent<G, A, R> mouseOpEvent;
+
+    /**
+     * The {@link MouseListener} attached to {@link #renderer}.
+     */
+    @NotNull
+    private final MouseListener mouseListener = new MouseListener() {
+
+        @Override
+        public void mouseClicked(@NotNull final MouseEvent e) {
+            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
+            if (mouseOpListener != null) {
+                mouseOpListener.clicked(mouseOpEvent);
+            }
+        }
+
+        @Override
+        public void mousePressed(@NotNull final MouseEvent e) {
+            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
+            if (mouseOpListener != null) {
+                mouseOpListener.pressed(mouseOpEvent);
+            }
+        }
+
+        @Override
+        public void mouseReleased(@NotNull final MouseEvent e) {
+            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
+            if (mouseOpListener != null) {
+                mouseOpListener.released(mouseOpEvent);
+            }
+        }
+
+        @Override
+        public void mouseEntered(@NotNull final MouseEvent e) {
+            // ignore
+        }
+
+        @Override
+        public void mouseExited(@NotNull final MouseEvent e) {
+            // ignore
+        }
+
+    };
+
+    /**
+     * The {@link MouseMotionListener} attached to {@link #renderer}.
+     */
+    @NotNull
+    private final MouseMotionListener mouseMotionListener = new MouseMotionListener() {
+
+        @Override
+        public void mouseDragged(@NotNull final MouseEvent e) {
+            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
+            if (mouseOpListener != null) {
+                mouseOpListener.dragged(mouseOpEvent);
+            }
+        }
+
+        @Override
+        public void mouseMoved(@NotNull final MouseEvent e) {
+            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
+            if (mouseOpListener != null) {
+                mouseOpListener.moved(mouseOpEvent);
+            }
+        }
+
+    };
+
+    /**
+     * Creates a new instance.
+     * @param renderer the map renderer to track for mouse actions
+     * @param toolPalette the tool palette for mapping mouse events to actions
+     * @param mapView the map view associated with the renderer
+     */
+    public MapMouseListener(@NotNull final MapRenderer renderer, @NotNull final ToolPalette<G, A, R> toolPalette, @NotNull final MapView<G, A, R> mapView) {
+        this.toolPalette = toolPalette;
+        this.renderer = renderer;
+        renderer.addMouseListener(mouseListener);
+        renderer.addMouseMotionListener(mouseMotionListener);
+        mouseOpEvent = new MouseOpEvent<G, A, R>(mapView);
+    }
+
+    /**
+     * Must be called when this object is freed. Unregisters all listeners.
+     */
+    public void closeNotify() {
+        renderer.removeMouseListener(mouseListener);
+        renderer.removeMouseMotionListener(mouseMotionListener);
+    }
+
+    /**
+     * Initializes {@link #mouseOpEvent} from a {@link MouseEvent}.
+     * @param event the mouse event
+     */
+    private void initEvent(@NotNull final MouseEvent event) {
+        mouseOpEvent.setButton(event.getButton());
+        mouseOpEvent.setId(event.getID());
+        mouseOpEvent.setMapLocation(getMapLocation(event));
+        mouseOpEvent.setModifiers(event.getModifiersEx());
+        mouseOpEvent.setClickCount(event.getClickCount());
+        event.consume();
+    }
+
+    /**
+     * Get the mouse operation for a MouseEvent.
+     * @param event the mouse event to get mouse operation for
+     * @return the mouse operation for <var>event</var>
+     */
+    @Nullable
+    private MouseOpListener<G, A, R> getMouseOperation(@NotNull final MouseEvent event) {
+        initEvent(event);
+        return toolPalette.getTool(mouseOpEvent);
+    }
+
+    /**
+     * Get the map location for a MouseEvent.
+     * @param event the mouse event to get map location for
+     * @return the map location for <var>event</var> or <code>null</code> if
+     *         outside map
+     */
+    @Nullable
+    private Point getMapLocation(@NotNull final MouseEvent event) {
+        return renderer.getSquareLocationAt(event.getPoint(), tmpPoint);
+    }
+
+}


Property changes on: trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapMouseListener.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Deleted: trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java	2012-06-15 19:56:17 UTC (rev 9184)
+++ trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java	2012-06-15 19:57:18 UTC (rev 9185)
@@ -1,194 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2011 The Gridarta Developers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package net.sf.gridarta.gui.mapuserlistener;
-
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import net.sf.gridarta.gui.map.event.MouseOpEvent;
-import net.sf.gridarta.gui.map.event.MouseOpListener;
-import net.sf.gridarta.gui.map.mapview.MapView;
-import net.sf.gridarta.gui.map.renderer.MapRenderer;
-import net.sf.gridarta.gui.panel.tools.ToolPalette;
-import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.maparchobject.MapArchObject;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Tracks mouse actions and calls the appropriate {@link MouseOpListener
- * MouseOpListeners}.
- * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
- * @author Andreas Kirschbaum
- */
-public class MapUserListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
-
-    /**
-     * The {@link ToolPalette} for mapping mouse events to {@link
-     * MouseOpListener actions}.
-     */
-    @NotNull
-    private final ToolPalette<G, A, R> toolPalette;
-
-    /**
-     * The {@link MapRenderer} being tracked for mouse actions.
-     */
-    @NotNull
-    private final MapRenderer renderer;
-
-    /**
-     * Temporary point. Stored in a field to avoid frequent reallocation.
-     */
-    @NotNull
-    private final Point tmpPoint = new Point();
-
-    /**
-     * The parameters for the currently processed event. Stored in a field to
-     * avoid frequent reallocation.
-     */
-    @NotNull
-    private final MouseOpEvent<G, A, R> mouseOpEvent;
-
-    /**
-     * The {@link MouseListener} attached to {@link #renderer}.
-     */
-    @NotNull
-    private final MouseListener mouseListener = new MouseListener() {
-
-        @Override
-        public void mouseClicked(@NotNull final MouseEvent e) {
-            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
-            if (mouseOpListener != null) {
-                mouseOpListener.clicked(mouseOpEvent);
-            }
-        }
-
-        @Override
-        public void mousePressed(@NotNull final MouseEvent e) {
-            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
-            if (mouseOpListener != null) {
-                mouseOpListener.pressed(mouseOpEvent);
-            }
-        }
-
-        @Override
-        public void mouseReleased(@NotNull final MouseEvent e) {
-            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
-            if (mouseOpListener != null) {
-                mouseOpListener.released(mouseOpEvent);
-            }
-        }
-
-        @Override
-        public void mouseEntered(@NotNull final MouseEvent e) {
-            // ignore
-        }
-
-        @Override
-        public void mouseExited(@NotNull final MouseEvent e) {
-            // ignore
-        }
-
-    };
-
-    /**
-     * The {@link MouseMotionListener} attached to {@link #renderer}.
-     */
-    @NotNull
-    private final MouseMotionListener mouseMotionListener = new MouseMotionListener() {
-
-        @Override
-        public void mouseDragged(@NotNull final MouseEvent e) {
-            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
-            if (mouseOpListener != null) {
-                mouseOpListener.dragged(mouseOpEvent);
-            }
-        }
-
-        @Override
-        public void mouseMoved(@NotNull final MouseEvent e) {
-            final MouseOpListener<G, A, R> mouseOpListener = getMouseOperation(e);
-            if (mouseOpListener != null) {
-                mouseOpListener.moved(mouseOpEvent);
-            }
-        }
-
-    };
-
-    /**
-     * Creates a new instance.
-     * @param renderer the map renderer to track for mouse actions
-     * @param toolPalette the tool palette for mapping mouse events to actions
-     * @param mapView the map view associated with the renderer
-     */
-    public MapUserListener(@NotNull final MapRenderer renderer, @NotNull final ToolPalette<G, A, R> toolPalette, @NotNull final MapView<G, A, R> mapView) {
-        this.toolPalette = toolPalette;
-        this.renderer = renderer;
-        renderer.addMouseListener(mouseListener);
-        renderer.addMouseMotionListener(mouseMotionListener);
-        mouseOpEvent = new MouseOpEvent<G, A, R>(mapView);
-    }
-
-    /**
-     * Must be called when this object is freed. Unregisters all listeners.
-     */
-    public void closeNotify() {
-        renderer.removeMouseListener(mouseListener);
-        renderer.removeMouseMotionListener(mouseMotionListener);
-    }
-
-    /**
-     * Initializes {@link #mouseOpEvent} from a {@link MouseEvent}.
-     * @param event the mouse event
-     */
-    private void initEvent(@NotNull final MouseEvent event) {
-        mouseOpEvent.setButton(event.getButton());
-        mouseOpEvent.setId(event.getID());
-        mouseOpEvent.setMapLocation(getMapLocation(event));
-        mouseOpEvent.setModifiers(event.getModifiersEx());
-        mouseOpEvent.setClickCount(event.getClickCount());
-        event.consume();
-    }
-
-    /**
-     * Get the mouse operation for a MouseEvent.
-     * @param event the mouse event to get mouse operation for
-     * @return the mouse operation for <var>event</var>
-     */
-    @Nullable
-    private MouseOpListener<G, A, R> getMouseOperation(@NotNull final MouseEvent event) {
-        initEvent(event);
-        return toolPalette.getTool(mouseOpEvent);
-    }
-
-    /**
-     * Get the map location for a MouseEvent.
-     * @param event the mouse event to get map location for
-     * @return the map location for <var>event</var> or <code>null</code> if
-     *         outside map
-     */
-    @Nullable
-    private Point getMapLocation(@NotNull final MouseEvent event) {
-        return renderer.getSquareLocationAt(event.getPoint(), tmpPoint);
-    }
-
-}

Modified: trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListenerManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListenerManager.java	2012-06-15 19:56:17 UTC (rev 9184)
+++ trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListenerManager.java	2012-06-15 19:57:18 UTC (rev 9185)
@@ -35,7 +35,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Tracks map views and attaches/detaches {@link MapUserListener} instances.
+ * Tracks map views and attaches/detaches {@link MapMouseListener} instances.
  * @author Andreas Kirschbaum
  */
 public class MapUserListenerManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
@@ -53,10 +53,10 @@
     private final MapViewsManager<G, A, R> mapViewsManager;
 
     /**
-     * Maps {@link MapView} instance to attached {@link MapUserListener}.
+     * Maps {@link MapView} instance to attached {@link MapMouseListener}.
      */
     @NotNull
-    private final Map<MapView<G, A, R>, MapUserListener<G, A, R>> mapUserListeners = new IdentityHashMap<MapView<G, A, R>, MapUserListener<G, A, R>>();
+    private final Map<MapView<G, A, R>, MapMouseListener<G, A, R>> mapUserListeners = new IdentityHashMap<MapView<G, A, R>, MapMouseListener<G, A, R>>();
 
     /**
      * The {@link MapManagerListener} for tracking {@link MapControl}
@@ -94,15 +94,15 @@
 
         @Override
         public void mapViewCreated(@NotNull final MapView<G, A, R> mapView) {
-            final MapUserListener<G, A, R> mapUserListener = new MapUserListener<G, A, R>(mapView.getRenderer(), toolPalette, mapView);
-            mapUserListeners.put(mapView, mapUserListener);
+            final MapMouseListener<G, A, R> mapMouseListener = new MapMouseListener<G, A, R>(mapView.getRenderer(), toolPalette, mapView);
+            mapUserListeners.put(mapView, mapMouseListener);
         }
 
         @Override
         public void mapViewClosing(@NotNull final MapView<G, A, R> mapView) {
-            final MapUserListener<G, A, R> mapUserListener = mapUserListeners.remove(mapView);
-            assert mapUserListener != null;
-            mapUserListener.closeNotify();
+            final MapMouseListener<G, A, R> mapMouseListener = mapUserListeners.remove(mapView);
+            assert mapMouseListener != null;
+            mapMouseListener.closeNotify();
         }
 
     };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar	Apr	May (103)	Jun (121)	Jul (16)	Aug (67)	Sep (126)	Oct (161)	Nov (164)	Dec (588)
2007	Jan (394)	Feb (181)	Mar (131)	Apr (180)	May (255)	Jun (11)	Jul (79)	Aug (70)	Sep (274)	Oct (138)	Nov (195)	Dec (8)
2008	Jan (3)	Feb (142)	Mar (162)	Apr (124)	May (148)	Jun (157)	Jul (425)	Aug (373)	Sep (264)	Oct (315)	Nov (225)	Dec (6)
2009	Jan (67)	Feb (78)	Mar (279)	Apr (294)	May (92)	Jun (65)	Jul (134)	Aug (41)	Sep (138)	Oct (125)	Nov (126)	Dec (122)
2010	Jan (15)	Feb (48)	Mar (9)	Apr (195)	May (373)	Jun (507)	Jul (42)	Aug (16)	Sep (38)	Oct (81)	Nov (64)	Dec (18)
2011	Jan (13)	Feb (12)	Mar (39)	Apr (1)	May (2)	Jun (27)	Jul (27)	Aug (31)	Sep (14)	Oct (102)	Nov (20)	Dec (37)
2012	Jan (22)	Feb (1)	Mar (1)	Apr (2)	May (2)	Jun (18)	Jul (6)	Aug (1)	Sep (1)	Oct	Nov	Dec
2013	Jan (1)	Feb (2)	Mar (1)	Apr (1)	May (47)	Jun (7)	Jul (107)	Aug	Sep	Oct (112)	Nov (31)	Dec (17)
2014	Jan (29)	Feb (111)	Mar (34)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct (2)	Nov (18)	Dec (10)

gridarta-commit Mailing List for gridarta (Page 23)

gridarta-commit — svn commit digest list (high traffic)