Thread: [Gridarta-commit] SF.net SVN: gridarta: [1266] trunk (Page 14)

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

Revision: 1266
          http://svn.sourceforge.net/gridarta/?rev=1266&view=rev
Author:   akirschbaum
Date:     2006-12-24 03:59:06 -0800 (Sun, 24 Dec 2006)

Log Message:
-----------
Make connection view highlight affected game objects in the map view.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/CMapArchPanel.java
    trunk/daimonin/src/daieditor/CMapArchPanel.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/connectionview/
    trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java
    trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java
    trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java

Removed Paths:
-------------
    trunk/src/app/net/sf/gridarta/gui/ConnectionControl.java
    trunk/src/app/net/sf/gridarta/gui/ConnectionView.java

Modified: trunk/crossfire/ChangeLog
===================================================================

--- trunk/crossfire/ChangeLog	2006-12-24 11:53:19 UTC (rev 1265)
+++ trunk/crossfire/ChangeLog	2006-12-24 11:59:06 UTC (rev 1266)
@@ -1,5 +1,8 @@
 2006-12-24  Andreas Kirschbaum
 
+	* Make connection view highlight affected game objects in the map
+	view.
+
 	* Add some French and Svedish translations.
 
 	* Update main window title.

Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-12-24 11:53:19 UTC (rev 1265)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -56,7 +56,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
-import net.sf.gridarta.gui.ConnectionControl;
+import net.sf.gridarta.gui.connectionview.ConnectionControl;
 import net.sf.gridarta.gui.GSplitPane;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ActionMethod;

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-12-24 11:53:19 UTC (rev 1265)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -61,7 +61,7 @@
 import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
-import net.sf.gridarta.gui.ConnectionControl;
+import net.sf.gridarta.gui.connectionview.ConnectionControl;
 import net.sf.gridarta.gui.GSplitPane;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.ActionMethod;

Deleted: trunk/src/app/net/sf/gridarta/gui/ConnectionControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ConnectionControl.java	2006-12-24 11:53:19 UTC (rev 1265)
+++ trunk/src/app/net/sf/gridarta/gui/ConnectionControl.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -1,58 +0,0 @@
-/*
- * Gridarta Java Editor.
- * Copyright (C) 2006  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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-package net.sf.gridarta.gui;
-
-import net.sf.gridarta.MainControl;
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * The controller for the connection view.
- *
- * @author Andreas Kirschbaum
- */
-public class ConnectionControl {
-
-    /** The Logger for printing log messages. */
-    private static final Logger log = Logger.getLogger(ConnectionControl.class);
-
-    /** The view for this controller. */
-    @NotNull private final ConnectionView view;
-
-    /*
-     * Create a new instance.
-     *
-     * @param mainControl the main control to use
-     */
-    public ConnectionControl(@NotNull final MainControl mainControl) {
-        view = new ConnectionView(mainControl);
-    }
-
-    /**
-     * Return the view for this controller.
-     *
-     * @return the view for this controller
-     */
-    @NotNull public ConnectionView getView() {
-        return view;
-    }
-
-} // class ConnectionControl

Deleted: trunk/src/app/net/sf/gridarta/gui/ConnectionView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ConnectionView.java	2006-12-24 11:53:19 UTC (rev 1265)
+++ trunk/src/app/net/sf/gridarta/gui/ConnectionView.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -1,129 +0,0 @@
-/*
- * Gridarta Java Editor.
- * Copyright (C) 2005  Christian Hujer
- * Copyright (C) 2006  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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-package net.sf.gridarta.gui;
-
-import java.awt.BorderLayout;
-import java.util.ArrayList;
-import java.util.TreeMap;
-import java.util.List;
-import java.util.Map;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import net.sf.gridarta.MainControl;
-import net.sf.gridarta.MainControlListener;
-import net.sf.gridarta.gameobject.GameObject;
-import net.sf.gridarta.map.MapArchObject;
-import net.sf.gridarta.map.MapControl;
-import net.sf.gridarta.map.MapModel;
-import net.sf.gridarta.map.MapModelEvent;
-import net.sf.gridarta.map.MapModelListener;
-import net.sf.gridarta.map.MapSquare;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A Panel that holds information about the connections of the selected arch on the selected map.
- * It is unfinished.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @author Andreas Kirschbaum
- * @todo more user interface features
- * @todo make this a MapHighlightModel
- * @todo better react on changes, don't always scan the whole map
- * @todo attach
- * @serial exclude
- */
-public final class ConnectionView extends JPanel implements MainControlListener, MapModelListener {
-
-    /** The conections. */
-    private final Map<Integer, List<GameObject>> connections = new TreeMap<Integer, List<GameObject>>();
-
-    /** The List with the connections. */
-    private JList connectionList = new JList();
-
-    /** Map control corresponding to {@link #connectionList}. */
-    private MapControl mapControl = null;
-
-    /** Create a ConnectionPanel. */
-    public ConnectionView(@NotNull final MainControl mainControl) {
-        setLayout(new BorderLayout());
-        add(new JScrollPane(connectionList));
-        mainControl.addMainControlListener(this);
-    }
-
-    /** {@inheritDoc} */
-    public void mapSizeChanged(final MapModelEvent e) {
-        scanMapForConnections(e.getMapModel());
-    }
-
-    /** {@inheritDoc} */
-    public void mapSquaresChanged(final MapModelEvent e) {
-        scanMapForConnections(e.getMapModel());
-    }
-
-    /** {@inheritDoc} */
-    public void mapObjectsChanged(final MapModelEvent e) {
-        scanMapForConnections(e.getMapModel());
-    }
-
-    /** {@inheritDoc} */
-    public void currentMapChanged(@Nullable final MapControl mapControl) {
-        this.mapControl = mapControl;
-        scanMapForConnections(mapControl == null ? null : mapControl.getMapModel());
-    }
-
-    /** {@inheritDoc} */
-    public void mapCreated(@NotNull final MapControl mapControl) {
-        mapControl.getMapModel().addMapModelListener(this);
-    }
-
-    /** {@inheritDoc} */
-    public void mapClosing(@NotNull final MapControl mapControl) {
-        mapControl.getMapModel().removeMapModelListener(this);
-    }
-
-    /**
-     * Scans a map for the contained connections.
-     * @param model Model of map to scan
-     */
-    public void scanMapForConnections(final MapModel model) {
-        connections.clear();
-        if (model != null && mapControl != null && mapControl.getMapModel() == model) {
-            for (final MapSquare<? extends GameObject> mapSquare : (MapModel<? extends GameObject, MapArchObject>) model) {
-                for (final GameObject archObject : mapSquare) {
-                    final String connectionSpec = archObject.getAttributeString("connected", false);
-                    if (connectionSpec != null && connectionSpec.matches("\\d+(, *\\d+)*")) {
-                        for (String s : connectionSpec.trim().split(",\\s*")) {
-                            final Integer connection = Integer.valueOf(s);
-                            if (!connections.containsKey(connection)) {
-                                connections.put(connection, new ArrayList<GameObject>());
-                            }
-                            connections.get(connection).add(archObject);
-                        }
-                    }
-                }
-            }
-        }
-        connectionList.setListData(connections.keySet().toArray());
-    }
-
-} // class ConnectionView

Added: trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Connection.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -0,0 +1,90 @@
+/*
+ * Gridarta Java Editor.
+ * Copyright (C) 2006  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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+package net.sf.gridarta.gui.connectionview;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import net.sf.gridarta.gameobject.GameObject;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The class <code>Connection</code> stores information for a single connected
+ * value (connection number).
+ *
+ * @author Andreas Kirschbaum
+ */
+public class Connection implements Iterable<GameObject> {
+
+    /** The Logger for printing log messages. */
+    private static final Logger _log = Logger.getLogger(Connection.class);
+
+    /**
+     * The connection number.
+     */
+    private final int connectionNumber;
+
+    /**
+     * The game objects for this connection.
+     *
+     * @note a list is used to allow accessing the game objects by index
+     *
+     * @note the initial capacity of 2 assumes that most connection values have
+     * only two game objects: the triggering object and the triggered object
+     */
+    private final ArrayList<GameObject> gameObjects = new ArrayList<GameObject>(2);
+
+    /**
+     * Create a new instance.
+     *
+     * @param connectionNumber the connection number
+     */
+    public Connection(final int connectionNumber) {
+        this.connectionNumber = connectionNumber;
+    }
+
+    /**
+     * Return the connection number.
+     *
+     * @return the connection number
+     */
+    public int getConnectionNumber() {
+        return connectionNumber;
+    }
+
+    /**
+     * Add a game object.
+     *
+     * @param gameObject the game object to add
+     */
+    public void addGameObject(@NotNull final GameObject gameObject) {
+	if (!gameObjects.contains(gameObject)) {
+	    gameObjects.add(gameObject);
+	}
+    }
+
+    /** {@inheritDoc} */
+    public Iterator<GameObject> iterator() {
+	return Collections.unmodifiableList(gameObjects).iterator();
+    }
+
+} // class Connection


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

Copied: trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java (from rev 1264, trunk/src/app/net/sf/gridarta/gui/ConnectionControl.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -0,0 +1,95 @@
+/*
+ * Gridarta Java Editor.
+ * Copyright (C) 2006  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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+package net.sf.gridarta.gui.connectionview;
+
+import java.awt.Point;
+import java.util.List;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import net.sf.gridarta.MainControl;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gui.map.MapGrid;
+import net.sf.gridarta.map.MapControl;
+import net.sf.gridarta.map.MapModel;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The controller for the connection view.
+ *
+ * @author Andreas Kirschbaum
+ */
+public class ConnectionControl {
+
+    /** The Logger for printing log messages. */
+    private static final Logger log = Logger.getLogger(ConnectionControl.class);
+
+    /** The view for this controller. */
+    @NotNull private final ConnectionView view;
+
+    /*
+     * Create a new instance.
+     *
+     * @param mainControl the main control to use
+     */
+    public ConnectionControl(@NotNull final MainControl mainControl) {
+        view = new ConnectionView(mainControl);
+
+        view.addListSelectionListener(new ListSelectionListener() {
+                public void valueChanged(final ListSelectionEvent e) {
+                    highlightSelectedEntries();
+                }
+            });
+    }
+
+    /**
+     * Return the view for this controller.
+     *
+     * @return the view for this controller
+     */
+    @NotNull public ConnectionView getView() {
+        return view;
+    }
+
+    /**
+     * Set the map selection to the currently selected entries.
+     */
+    private void highlightSelectedEntries() {
+        final MapControl mapControl = view.getMapControl();
+        if (mapControl == null) {
+            return;
+        }
+
+        final MapGrid mapGrid = mapControl.getMapGrid();
+        mapGrid.unSelect();
+
+        final Point point = new Point();
+
+        final List<Connection> connections = view.getSelectedConnections();
+        for (final Connection connection : connections) {
+            for (final GameObject object : connection) {
+                point.setLocation(object.getMapX(), object.getMapY());
+                mapGrid.select(point, point, MapGrid.SelectionMode.ADD);
+            }
+        }
+    }
+
+} // class ConnectionControl

Copied: trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java (from rev 1264, trunk/src/app/net/sf/gridarta/gui/ConnectionView.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java	2006-12-24 11:59:06 UTC (rev 1266)
@@ -0,0 +1,192 @@
+/*
+ * Gridarta Java Editor.
+ * Copyright (C) 2005  Christian Hujer
+ * Copyright (C) 2006  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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+package net.sf.gridarta.gui.connectionview;
+
+import java.awt.BorderLayout;
+import java.util.ArrayList;
+import java.util.TreeMap;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.event.ListSelectionListener;
+import net.sf.gridarta.MainControl;
+import net.sf.gridarta.MainControlListener;
+import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.map.MapControl;
+import net.sf.gridarta.map.MapModel;
+import net.sf.gridarta.map.MapModelEvent;
+import net.sf.gridarta.map.MapModelListener;
+import net.sf.gridarta.map.MapSquare;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Panel that holds information about the connections of the selected arch on the selected map.
+ * It is unfinished.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author Andreas Kirschbaum
+ * @todo more user interface features
+ * @todo make this a MapHighlightModel
+ * @todo better react on changes, don't always scan the whole map
+ * @todo attach
+ * @serial exclude
+ */
+public final class ConnectionView extends JPanel implements MainControlListener, MapModelListener {
+
+    /** The Logger for printing log messages. */
+    private static final Logger log = Logger.getLogger(ConnectionControl.class);
+
+    /** The connections. */
+    private final Map<Integer, Connection> connections = new TreeMap<Integer, Connection>();
+
+    /** The List with the connections. */
+    private JList connectionList = new JList();
+
+    /** Map control corresponding to {@link #connectionList}. */
+    private MapControl mapControl = null;
+
+    /** Create a ConnectionPanel. */
+    public ConnectionView(@NotNull final MainControl mainControl) {
+        setLayout(new BorderLayout());
+        add(new JScrollPane(connectionList));
+        mainControl.addMainControlListener(this);
+    }
+
+    /**
+     * Return the current map control.
+     *
+     * @return the current map control, or <code>null</code> if none is
+     * available
+     */
+    @Nullable public MapControl getMapControl() {
+        return mapControl;
+    }
+
+    /**
+     * Register a {@link ListSelectionListener} for the connection list.
+     *
+     * @param listener the listener to register
+     */
+    void addListSelectionListener(@NotNull final ListSelectionListener listener) {
+        connectionList.addListSelectionListener(listener);
+    }
+
+    /** {@inheritDoc} */
+    public void mapSizeChanged(final MapModelEvent e) {
+        if (mapControl == null || e.getMapModel() != mapControl.getMapModel()) {
+            return;
+        }
+
+        scanMapForConnections();
+    }
+
+    /** {@inheritDoc} */
+    public void mapSquaresChanged(final MapModelEvent e) {
+        if (mapControl == null || e.getMapModel() != mapControl.getMapModel()) {
+            return;
+        }
+
+        scanMapForConnections();
+    }
+
+    /** {@inheritDoc} */
+    public void mapObjectsChanged(final MapModelEvent e) {
+        if (mapControl == null || e.getMapModel() != mapControl.getMapModel()) {
+            return;
+        }
+
+        scanMapForConnections();
+    }
+
+    /** {@inheritDoc} */
+    public void currentMapChanged(@Nullable final MapControl mapControl) {
+        this.mapControl = mapControl;
+        scanMapForConnections();
+    }
+
+    /** {@inheritDoc} */
+    public void mapCreated(@NotNull final MapControl mapControl) {
+        mapControl.getMapModel().addMapModelListener(this);
+    }
+
+    /** {@inheritDoc} */
+    public void mapClosing(@NotNull final MapControl mapControl) {
+        mapControl.getMapModel().removeMapModelListener(this);
+    }
+
+    /**
+     * Scans the current map ({@link #mapControl}) for the contained
+     * connections.
+     */
+    public void scanMapForConnections() {
+        connections.clear();
+        if (mapControl != null) {
+            scanMapForConnections(mapControl.getMapModel());
+        }
+        connectionList.setListData(connections.keySet().toArray());
+    }
+
+    /**
+     * Scans the given map for the contained connections.
+     *
+     * @param mapModel the map model to process
+     */
+    public void scanMapForConnections(@NotNull final MapModel mapModel) {
+        for (final MapSquare<? extends GameObject> mapSquare : (MapModel<? extends GameObject, MapArchObject>) mapModel) {
+            for (final GameObject gameObject : mapSquare) {
+                final String connectionSpec = gameObject.getAttributeString("connected", false);
+                if (connectionSpec != null && connectionSpec.matches("\\d+(, *\\d+)*")) {
+                    for (String s : connectionSpec.trim().split(",\\s*")) {
+                        final Integer connectionNumber = Integer.valueOf(s);
+                        if (!connections.containsKey(connectionNumber)) {
+                            connections.put(connectionNumber, new Connection(connectionNumber));
+                        }
+                        connections.get(connectionNumber).addGameObject(gameObject);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Return a list of all selected connections.
+     *
+     * @return a list of all selected connections
+     */
+    public List<Connection> getSelectedConnections() {
+        final ArrayList<Connection> result = new ArrayList<Connection>();
+        for (final Object selection : connectionList.getSelectedValues()) {
+            final Connection connection = connections.get((Integer) selection);
+            if (connection == null) {
+                log.warn("getSelectedConnections: cannot find connection number " + selection);
+            } else {
+                result.add(connection);
+            }
+        }
+        return result;
+    }
+
+} // class ConnectionView


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




Thread: [Gridarta-commit] SF.net SVN: gridarta: [1266] trunk (Page 14)

gridarta-commit