Thread: [Gridarta-commit] SF.net SVN: gridarta:[9527] trunk/src (Page 7)

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

Revision: 9527
          http://sourceforge.net/p/gridarta/code/9527
Author:   akirschbaum
Date:     2013-12-10 20:36:58 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Add "Browse archetypes" to archetypes menu.

Modified Paths:
--------------
    trunk/src/atrinik/ChangeLog
    trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
    trunk/src/crossfire/ChangeLog
    trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/action.properties
    trunk/src/daimonin/ChangeLog
    trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
    trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
    trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
    trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_de.properties
    trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_fr.properties
    trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_sv.properties
    trunk/src/model/src/main/java/net/sf/gridarta/model/archetype/Archetype.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
    trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/GameObjectText.java

Added Paths:
-----------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/action/BrowseArchetypesAction.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialog.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialogManager.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesTableModel.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/ClosingLabel.java
    trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/TableHeaderCellRenderer.java

Modified: trunk/src/atrinik/ChangeLog
===================================================================

--- trunk/src/atrinik/ChangeLog	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/atrinik/ChangeLog	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1,3 +1,8 @@
+2013-12-10  Andreas Kirschbaum
+
+	* Add "Browse archetypes" to archetypes menu. It shows a dialog to
+	browse attribute values of archetypes.
+
 2013-12-04  Andreas Kirschbaum
 
 	* Switch to adjacent map if the map cursor attempts to move off

Modified: trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/atrinik/src/main/resources/net/sf/gridarta/var/atrinik/action.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -28,7 +28,7 @@
 file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
-archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
+archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes browseArchetypes
 #pickmaps.menu: See gridarta
 resources.menu=collectArches collectSpells - reloadFaces - viewTreasurelists
 tools.menu=newScript editScript - controlServer controlClient - validateMap cleanCompletelyBlockedSquares - zoom gc

Modified: trunk/src/crossfire/ChangeLog
===================================================================
--- trunk/src/crossfire/ChangeLog	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/crossfire/ChangeLog	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1,3 +1,8 @@
+2013-12-10  Andreas Kirschbaum
+
+	* Add "Browse archetypes" to archetypes menu. It shows a dialog to
+	browse attribute values of archetypes.
+
 2013-12-04  Andreas Kirschbaum
 
 	* Switch to adjacent map if the map cursor attempts to move off

Modified: trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/action.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/crossfire/src/main/resources/net/sf/gridarta/var/crossfire/action.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -28,7 +28,7 @@
 file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
-archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
+archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes browseArchetypes
 #pickmaps.menu: See gridarta
 resources.menu=collectArches - reloadFaces - viewTreasurelists
 tools.menu=newScript editScript - controlServer controlClient - validateMap - zoom gc

Modified: trunk/src/daimonin/ChangeLog
===================================================================
--- trunk/src/daimonin/ChangeLog	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/daimonin/ChangeLog	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1,3 +1,8 @@
+2013-12-10  Andreas Kirschbaum
+
+	* Add "Browse archetypes" to archetypes menu. It shows a dialog to
+	browse attribute values of archetypes.
+
 2013-12-04  Andreas Kirschbaum
 
 	* Switch to adjacent map if the map cursor attempts to move off

Modified: trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/daimonin/src/main/resources/net/sf/gridarta/var/daimonin/action.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -28,7 +28,7 @@
 file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps reloadMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - find findNext findPrev replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll invertSelection expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
-archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
+archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes browseArchetypes
 #pickmaps.menu: See gridarta
 resources.menu=collectArches collectSpells - reloadFaces - viewTreasurelists
 tools.menu=newScript editScript - controlServer controlClient - validateMap cleanCompletelyBlockedSquares - zoom gc

Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/BrowseArchetypesAction.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/action/BrowseArchetypesAction.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/action/BrowseArchetypesAction.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,78 @@
+/*
+ * 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.action;
+
+import java.awt.Component;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import net.sf.gridarta.gui.dialog.browsearchetypes.BrowseArchetypesDialogManager;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.utils.AbstractDialogManager;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.archetypeset.ArchetypeSet;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.EditorAction;
+import net.sf.japi.swing.action.ActionMethod;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An {@link EditorAction} that displays the browse archetypes dialog.
+ * @author Andreas Kirschbaum
+ */
+public class BrowseArchetypesAction<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements EditorAction {
+
+    /**
+     * The browse archetypes dialog manager.
+     */
+    @NotNull
+    private final AbstractDialogManager dialogManager;
+
+    /**
+     * Creates a new instance.
+     * @param parent the parent component for the dialog
+     * @param archetypeChooserControl the archetype chooser control to search
+     * @param objectChooser the object chooser to use when selecting search
+     * results
+     * @param archetypeSet the archetype set for looking up archetypes
+     * @param closingIcon the icon to display in the closing buttons of the
+     * archetype browser
+     */
+    public BrowseArchetypesAction(@NotNull final Component parent, @NotNull final ArchetypeChooserControl<G, A, R> archetypeChooserControl, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ImageIcon closingIcon) {
+        dialogManager = new BrowseArchetypesDialogManager<G, A, R>(parent, archetypeChooserControl, objectChooser, archetypeSet, closingIcon);
+    }
+
+    /**
+     * Shows the browse archetypes dialog.
+     */
+    @ActionMethod
+    public void browseArchetypes() {
+        dialogManager.showDialog();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setAction(@NotNull final Action action, @NotNull final String name) {
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/action/BrowseArchetypesAction.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialog.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialog.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialog.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,361 @@
+/*
+ * 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.dialog.browsearchetypes;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.Collection;
+import java.util.TreeSet;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.JTableHeader;
+import javax.swing.table.TableColumnModel;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.utils.GUIConstants;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.archetypeset.ArchetypeSet;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.ActionBuilderUtils;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A dialog that displays archetypes.
+ * @author Andreas Kirschbaum
+ */
+public class BrowseArchetypesDialog<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JOptionPane {
+
+    /**
+     * The serial Version UID.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The {@link ActionBuilder}.
+     */
+    @NotNull
+    private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+    /**
+     * The archetype set to search.
+     */
+    @NotNull
+    private final ArchetypeChooserControl<G, A, R> archetypeChooserControl;
+
+    /**
+     * The insertion object chooser to use when selecting search results.
+     */
+    @NotNull
+    private final ObjectChooser<G, A, R> objectChooser;
+
+    /**
+     * The attribute names currently not shown.
+     */
+    @NotNull
+    private final Collection<String> availableAttributes = new TreeSet<String>();
+
+    /**
+     * The model of {@link #archetypesTable}.
+     */
+    @NotNull
+    private final BrowseArchetypesTableModel<G, A, R> archetypesTableModel;
+
+    /**
+     * The model of {@link #addAttributeComboBox}.
+     */
+    @NotNull
+    private final DefaultComboBoxModel addAttributeComboBoxModel = new DefaultComboBoxModel();
+
+    /**
+     * The {@link JTable} showing the selected archetypes.
+     * @serial
+     */
+    @NotNull
+    private final JTable archetypesTable;
+
+    /**
+     * The dialog.
+     * @serial
+     */
+    @NotNull
+    private final JDialog dialog;
+
+    /**
+     * The button for adding the {@link #addAttributeComboBox selected
+     * attribute} to {@link #archetypesTable}.
+     */
+    @NotNull
+    private final JButton addAttributeButton;
+
+    /**
+     * The attribute to add to {@link #archetypesTable} if {@link
+     * #addAttributeButton} is selected.
+     */
+    @NotNull
+    private final JComboBox addAttributeComboBox;
+
+    /**
+     * Creates a new instance.
+     * @param parentComponent the parent component for the dialog
+     * @param archetypeChooserControl the archetype chooser control to to
+     * search
+     * @param objectChooser the object chooser to use when selecting search
+     * results
+     * @param archetypeSet the archetype set to show
+     * @param closingIcon the icon to display in the closing buttons of the
+     * table
+     */
+    public BrowseArchetypesDialog(@NotNull final Component parentComponent, @NotNull final ArchetypeChooserControl<G, A, R> archetypeChooserControl, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ImageIcon closingIcon) {
+        this.archetypeChooserControl = archetypeChooserControl;
+        this.objectChooser = objectChooser;
+        archetypesTableModel = new BrowseArchetypesTableModel<G, A, R>(archetypeSet);
+        archetypesTable = new JTable(archetypesTableModel);
+
+        for (final Archetype<?, ?, ?> archetype : archetypeSet.getArchetypes()) {
+            for (final String attribute : archetype.getAttributeKeys()) {
+                availableAttributes.add(attribute);
+            }
+        }
+        if (availableAttributes.remove("value")) {
+            archetypesTableModel.addAttribute("value");
+        }
+
+        archetypesTable.setFillsViewportHeight(true);
+        archetypesTable.setAutoCreateRowSorter(true);
+        archetypesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        archetypesTable.setRowSelectionAllowed(true);
+        archetypesTable.setColumnSelectionAllowed(false);
+        final ListSelectionListener listSelectionListener = new ListSelectionListener() {
+
+            @Override
+            public void valueChanged(@NotNull final ListSelectionEvent e) {
+                highlightSelectedEntry();
+            }
+
+        };
+        archetypesTable.getSelectionModel().addListSelectionListener(listSelectionListener);
+        final JTableHeader tableHeader = archetypesTable.getTableHeader();
+        tableHeader.setReorderingAllowed(true);
+        final TableHeaderCellRenderer renderer = new TableHeaderCellRenderer(closingIcon, tableHeader.getDefaultRenderer());
+        tableHeader.setDefaultRenderer(renderer);
+        final MouseListener mouseListener = new MouseListener() {
+
+            /**
+             * Whether the mouse button is currently pressed.
+             */
+            private boolean pressed;
+
+            @Override
+            public void mouseClicked(@NotNull final MouseEvent e) {
+                if (pressed) {
+                    pressed = false;
+                    if (SwingUtilities.isLeftMouseButton(e)) {
+                        final TableColumnModel columnModel = archetypesTable.getColumnModel();
+                        final int viewColumn = columnModel.getColumnIndexAtX(e.getX());
+                        final int columnIndex = archetypesTable.convertColumnIndexToModel(viewColumn);
+                        final int offsetX = renderer.getX(columnIndex);
+                        int cx = 0;
+                        for (int i = 0; i < columnIndex; i++) {
+                            cx += columnModel.getColumn(i).getWidth();
+                        }
+                        final int ex = e.getX();
+                        if (offsetX >= 0 && ex - cx >= offsetX) {
+                            final String attribute = archetypesTableModel.removeAttribute(columnIndex);
+                            if (attribute != null) {
+                                availableAttributes.add(attribute);
+                                updateComboBox();
+                                addAttributeComboBoxModel.setSelectedItem(attribute);
+                            }
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void mousePressed(@NotNull final MouseEvent e) {
+                pressed = true;
+            }
+
+            @Override
+            public void mouseReleased(@NotNull final MouseEvent e) {
+            }
+
+            @Override
+            public void mouseEntered(@NotNull final MouseEvent e) {
+            }
+
+            @Override
+            public void mouseExited(@NotNull final MouseEvent e) {
+            }
+
+        };
+        tableHeader.addMouseListener(mouseListener);
+        addAttributeButton = new JButton(ACTION_BUILDER.createAction(false, "browseArchetypesAddAttribute", this));
+        addAttributeComboBox = new JComboBox(addAttributeComboBoxModel);
+        final ItemListener itemListener = new ItemListener() {
+
+            @Override
+            public void itemStateChanged(@NotNull final ItemEvent e) {
+                updateActions();
+            }
+
+        };
+        addAttributeComboBox.addItemListener(itemListener);
+        setMessage(createPanel());
+
+        final JPanel addAttributePanel = new JPanel();
+        addAttributePanel.setLayout(new BoxLayout(addAttributePanel, BoxLayout.LINE_AXIS));
+        addAttributePanel.add(addAttributeButton);
+        addAttributePanel.add(addAttributeComboBox);
+        setOptions(new Object[] { addAttributePanel });
+
+        updateComboBox();
+        addAttributeComboBox.setSelectedIndex(Math.min(0, addAttributeComboBoxModel.getSize() - 1));
+
+        dialog = createDialog(parentComponent, ActionBuilderUtils.getString(ACTION_BUILDER, "browseArchetypes.title"));
+        dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        dialog.setModal(false);
+        dialog.setResizable(true);
+        dialog.pack();
+        dialog.setMinimumSize(new Dimension(200, 200));
+        dialog.setSize(new Dimension(800, 600));
+        dialog.setLocationRelativeTo(parentComponent);
+        setInitialValue(archetypesTable);
+        updateActions();
+    }
+
+    /**
+     * Opens the dialog. Returns immediately.
+     */
+    public void showDialog() {
+        dialog.setVisible(true);
+        dialog.toFront();
+    }
+
+    /**
+     * Creates the GUI.
+     * @return the panel containing the GUI
+     */
+    @NotNull
+    private JPanel createPanel() {
+        final JPanel mainPanel = new JPanel(new BorderLayout());
+
+        mainPanel.setBorder(GUIConstants.DIALOG_BORDER);
+
+        final JScrollPane scrollPane = new JScrollPane(archetypesTable);
+        scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
+
+        mainPanel.add(scrollPane, BorderLayout.CENTER);
+        return mainPanel;
+    }
+
+    /**
+     * Action method for "add attribute".
+     */
+    @ActionMethod
+    public void browseArchetypesAddAttribute() {
+        doAddAttribute(true);
+    }
+
+    /**
+     * Adds an attribute to the table.
+     * @param performAction whether the action should be performed
+     * @return whether the action can or was performed
+     */
+    private boolean doAddAttribute(final boolean performAction) {
+        final String attributeName = (String) addAttributeComboBox.getSelectedItem();
+        if (attributeName == null) {
+            return false;
+        }
+
+        if (performAction) {
+            if (availableAttributes.remove(attributeName)) {
+                archetypesTableModel.addAttribute(attributeName);
+                final int selectedIndex = Math.max(addAttributeComboBox.getSelectedIndex(), 0);
+                updateComboBox();
+                addAttributeComboBox.setSelectedIndex(Math.min(selectedIndex, addAttributeComboBoxModel.getSize() - 1));
+            }
+            updateActions();
+        } else if (!availableAttributes.contains(attributeName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Updates the actions' states to reflect the current selection.
+     */
+    private void updateActions() {
+        addAttributeButton.setEnabled(doAddAttribute(false));
+        addAttributeComboBox.setEnabled(!availableAttributes.isEmpty());
+    }
+
+    /**
+     * Updates the contents of {@link #addAttributeComboBoxModel}. The current
+     * selection is lost.
+     */
+    private void updateComboBox() {
+        addAttributeComboBoxModel.removeAllElements();
+        for (final String attribute : availableAttributes) {
+            addAttributeComboBoxModel.addElement(attribute);
+        }
+    }
+
+    /**
+     * Highlights the selected row from {@link #archetypesTable} in the
+     * insertion object chooser.
+     */
+    private void highlightSelectedEntry() {
+        final int index = archetypesTable.getSelectedRow();
+        if (index == -1) {
+            return;
+        }
+
+        final R archetype = archetypesTableModel.get(archetypesTable.getRowSorter().convertRowIndexToModel(index));
+        objectChooser.moveArchetypeChooserToFront();
+        archetypeChooserControl.selectArchetype(archetype);
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialog.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialogManager.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialogManager.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialogManager.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,117 @@
+/*
+ * 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.dialog.browsearchetypes;
+
+import java.awt.Component;
+import javax.swing.ImageIcon;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.utils.AbstractDialogManager;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.archetypeset.ArchetypeSet;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A dialog manager for the browse archetypes dialog.
+ * @author Andreas Kirschbaum
+ */
+public class BrowseArchetypesDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractDialogManager {
+
+    /**
+     * The synchronization object for accessing {@link #browseArchetypesDialog}.
+     */
+    @NotNull
+    private final Object sync = new Object();
+
+    /**
+     * The {@link BrowseArchetypesDialog} instance or <code>null</code> if the
+     * dialog isn't built yet.
+     */
+    @Nullable
+    private BrowseArchetypesDialog<G, A, R> browseArchetypesDialog;
+
+    /**
+     * The parent {@link Component} for the dialog.
+     */
+    @NotNull
+    private final Component parent;
+
+    /**
+     * The {@link ArchetypeChooserControl} to search.
+     */
+    @NotNull
+    private final ArchetypeChooserControl<G, A, R> archetypeChooserControl;
+
+    /**
+     * The {@link ObjectChooser} to use when selecting search results.
+     */
+    @NotNull
+    private final ObjectChooser<G, A, R> objectChooser;
+
+    /**
+     * The {@link ArchetypeSet} for looking up archetypes.
+     */
+    @NotNull
+    private final ArchetypeSet<G, A, R> archetypeSet;
+
+    /**
+     * The icon to display in the closing buttons of the archetype browser.
+     */
+    @NotNull
+    private final ImageIcon closingIcon;
+
+    /**
+     * Creates a new instance.
+     * @param parent the parent component for the dialog
+     * @param archetypeChooserControl the archetype chooser control to search
+     * @param objectChooser the object chooser to use when selecting search
+     * results
+     * @param archetypeSet the archetype set for looking up archetypes
+     * @param closingIcon the icon to display in the closing buttons of the
+     * archetype browser
+     */
+    public BrowseArchetypesDialogManager(@NotNull final Component parent, @NotNull final ArchetypeChooserControl<G, A, R> archetypeChooserControl, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ImageIcon closingIcon) {
+        this.parent = parent;
+        this.archetypeChooserControl = archetypeChooserControl;
+        this.objectChooser = objectChooser;
+        this.archetypeSet = archetypeSet;
+        this.closingIcon = closingIcon;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void showDialog() {
+        BrowseArchetypesDialog<G, A, R> dialog;
+        synchronized (sync) {
+            dialog = browseArchetypesDialog;
+            if (dialog == null) {
+                dialog = new BrowseArchetypesDialog<G, A, R>(parent, archetypeChooserControl, objectChooser, archetypeSet, closingIcon);
+                browseArchetypesDialog = dialog;
+            }
+        }
+        dialog.showDialog();
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesDialogManager.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesTableModel.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesTableModel.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesTableModel.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,250 @@
+/*
+ * 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.dialog.browsearchetypes;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+import javax.swing.table.AbstractTableModel;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.archetypeset.ArchetypeSet;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A {@link javax.swing.table.TableModel} that displays a selected set of
+ * attributes within a list of archetypes.
+ * @author Andreas Kirschbaum
+ */
+public class BrowseArchetypesTableModel<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractTableModel {
+
+    /**
+     * The serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The {@link ArchetypeSet} from which archetypes are shown.
+     */
+    @NotNull
+    private final ArchetypeSet<G, A, R> archetypeSet;
+
+    /**
+     * The shown archetypes.
+     */
+    @NotNull
+    private final List<R> archetypes = new ArrayList<R>();
+
+    /**
+     * The shown attributes.
+     */
+    @NotNull
+    private final List<String> attributes = new ArrayList<String>();
+
+    /**
+     * The classes corresponding to {@link #attributes}.
+     */
+    @NotNull
+    private final List<Class<?>> classes = new ArrayList<Class<?>>();
+
+    /**
+     * Caches mapping of attribute name to table column class.
+     */
+    @NotNull
+    private final Map<String, Class<?>> classMap = new WeakHashMap<String, Class<?>>();
+
+    /**
+     * Creates a new instance.
+     * @param archetypeSet the archetype set from which archetypes are shown
+     */
+    public BrowseArchetypesTableModel(@NotNull final ArchetypeSet<G, A, R> archetypeSet) {
+        this.archetypeSet = archetypeSet;
+        update();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getRowCount() {
+        return archetypes.size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getColumnCount() {
+        return 2 + attributes.size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nullable
+    @Override
+    public Object getValueAt(final int rowIndex, final int columnIndex) {
+        if (rowIndex < 0 || rowIndex >= archetypes.size()) {
+            return null;
+        }
+        final Archetype<?, ?, ?> archetype = archetypes.get(rowIndex);
+        if (columnIndex == 0) {
+            return archetype.getArchetypeName();
+        } else if (columnIndex == 1) {
+            return archetype.getBestName();
+        } else if (columnIndex >= 0 && columnIndex < 2 + attributes.size()) {
+            final String attribute = attributes.get(columnIndex - 2);
+            final String value = archetype.getAttributeString(attribute);
+            final Class<?> attributeClass = classes.get(columnIndex - 2);
+            if (attributeClass == Long.class) {
+                if (value.isEmpty()) {
+                    return null;
+                }
+                try {
+                    return Long.valueOf(value);
+                } catch (final NumberFormatException ignored) {
+                }
+            }
+            return value;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getColumnName(final int column) {
+        if (column == 0) {
+            return "Archetype";
+        } else if (column == 1) {
+            return "Name";
+        } else if (column >= 0 && column < 2 + attributes.size()) {
+            return attributes.get(column - 2);
+        } else {
+            return super.getColumnName(column);
+        }
+    }
+
+    @Override
+    public Class<?> getColumnClass(final int columnIndex) {
+        if (columnIndex < 2) {
+            return String.class;
+        } else if (columnIndex >= 0 && columnIndex < 2 + attributes.size()) {
+            return classes.get(columnIndex - 2);
+        } else {
+            return super.getColumnClass(columnIndex);
+        }
+    }
+
+    /**
+     * Updates {@link #archetypes} to include all archetypes from {@link
+     * #archetypeSet} that define at least one show attribute.
+     */
+    private void update() {
+        archetypes.clear();
+        for (final R archetype : archetypeSet.getArchetypes()) {
+            boolean include = false;
+            for (final String attribute : attributes) {
+                if (!archetype.getAttributeString(attribute).isEmpty()) {
+                    include = true;
+                    break;
+                }
+            }
+            if (include) {
+                archetypes.add(archetype);
+            }
+        }
+        fireTableStructureChanged();
+    }
+
+    /**
+     * Adds a column for an attribute to the table.
+     * @param attribute the attribute
+     */
+    public void addAttribute(@NotNull final String attribute) {
+        classes.add(getAttributeClass(attribute));
+        attributes.add(attribute);
+        update();
+    }
+
+    /**
+     * Returns the class for rendering attribute values.
+     * @param attribute the attribute
+     * @return the class
+     */
+    @NotNull
+    private Class<?> getAttributeClass(@NotNull final String attribute) {
+        final Class<?> existingClass = classMap.get(attribute);
+        if (existingClass != null) {
+            return existingClass;
+        }
+
+        for (final Archetype<?, ?, ?> archetype : archetypeSet.getArchetypes()) {
+            final String value = archetype.getAttributeString(attribute);
+            if (value.isEmpty()) {
+                // skip empty values
+                continue;
+            }
+            try {
+                Long.parseLong(value);
+            } catch (final NumberFormatException ignored) {
+                classMap.put(attribute, String.class);
+                return String.class;
+            }
+        }
+        classMap.put(attribute, Long.class);
+        return Long.class;
+    }
+
+    /**
+     * Removes an attribute from the table.
+     * @param index the index of the column
+     * @return the attribute or {@code null} if the index is invalid
+     */
+    @Nullable
+    public String removeAttribute(final int index) {
+        final String attribute;
+        try {
+            attribute = attributes.remove(index - 2);
+            classes.remove(index - 2);
+        } catch (final IndexOutOfBoundsException ignored) {
+            return null;
+        }
+        update();
+        return attribute;
+    }
+
+    /**
+     * Return one archetype.
+     * @param index the table row index
+     * @return the row content
+     */
+    @NotNull
+    @SuppressWarnings("TypeMayBeWeakened")
+    public R get(final int index) {
+        return archetypes.get(index);
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/BrowseArchetypesTableModel.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/ClosingLabel.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/ClosingLabel.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/ClosingLabel.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,63 @@
+/*
+ * 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.dialog.browsearchetypes;
+
+import java.awt.Graphics;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link JLabel} that tracks the x coordinate at which it was painted last.
+ * @author Andreas Kirschbaum
+ */
+public class ClosingLabel extends JLabel {
+
+    /**
+     * The remembered x coordinate.
+     */
+    private int paintX;
+
+    /**
+     * Creates a new instance.
+     * @param icon the icon to display
+     */
+    public ClosingLabel(@NotNull final Icon icon) {
+        super(icon);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void paintComponent(@NotNull final Graphics g) {
+        paintX = getX();
+        super.paintComponent(g);
+    }
+
+    /**
+     * Returns the x coordinate at which this label was painted last.
+     * @return the x coordinate
+     */
+    public int getPaintX() {
+        return paintX;
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/ClosingLabel.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/TableHeaderCellRenderer.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/TableHeaderCellRenderer.java	                        (rev 0)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/TableHeaderCellRenderer.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -0,0 +1,118 @@
+/*
+ * 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.dialog.browsearchetypes;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link TableCellRenderer} that adds a closing icon.
+ * @author Andreas Kirschbaum
+ */
+public class TableHeaderCellRenderer implements TableCellRenderer {
+
+    /**
+     * The icon.
+     */
+    @NotNull
+    private final ImageIcon closingIcon;
+
+    /**
+     * The default {@link TableCellRenderer} of the associated table.
+     */
+    @NotNull
+    private final TableCellRenderer tableCellRenderer;
+
+    /**
+     * The panel that renders the cell. It contains both the original contents
+     * of the cell and a closing icon.
+     */
+    @NotNull
+    private final Container panel = new JPanel(new BorderLayout());
+
+    /**
+     * The closing icons. A separate instance is created for each table column
+     * as each column may have a different width and thus a different x position
+     * of the closing label.
+     */
+    @NotNull
+    private final List<ClosingLabel> labels = new ArrayList<ClosingLabel>();
+
+    /**
+     * Creates a new instance.
+     * @param closingIcon the icon to display as the closing buttons
+     * @param tableCellRenderer the default table cell renderer of the
+     * associated table
+     */
+    public TableHeaderCellRenderer(@NotNull final ImageIcon closingIcon, @NotNull final TableCellRenderer tableCellRenderer) {
+        this.closingIcon = closingIcon;
+        this.tableCellRenderer = tableCellRenderer;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Component getTableCellRendererComponent(@NotNull final JTable table, @NotNull final Object value, final boolean isSelected, final boolean hasFocus, final int row, final int column) {
+        panel.removeAll();
+        final Component x = tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+        panel.add(x, BorderLayout.CENTER);
+        if (column >= 2) {
+            ClosingLabel label;
+            try {
+                label = labels.get(column);
+            } catch (final IndexOutOfBoundsException ignored) {
+                while (labels.size() < column) {
+                    labels.add(new ClosingLabel(closingIcon));
+                }
+                label = new ClosingLabel(closingIcon);
+                assert labels.size() == column;
+                labels.add(label);
+            }
+            panel.add(label, BorderLayout.EAST);
+        }
+        return panel;
+    }
+
+    /**
+     * Returns the x coordinate of a closing icon.
+     * @param index the index of the closing icon
+     * @return the x coordinate or {@code -1} if the index is invalid
+     */
+    public int getX(final int index) {
+        final ClosingLabel label;
+        try {
+            label = labels.get(index);
+        } catch (final ArrayIndexOutOfBoundsException ignored) {
+            return -1;
+        }
+
+        return label.getPaintX();
+    }
+
+}


Property changes on: trunk/src/gridarta/src/main/java/net/sf/gridarta/gui/dialog/browsearchetypes/TableHeaderCellRenderer.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/GUIMainControl.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -36,6 +36,7 @@
 import net.sf.gridarta.action.AddBookmarkAction;
 import net.sf.gridarta.action.AddToSelectionAction;
 import net.sf.gridarta.action.ArchAttributesAction;
+import net.sf.gridarta.action.BrowseArchetypesAction;
 import net.sf.gridarta.action.CleanCompletelyBlockedSquaresAction;
 import net.sf.gridarta.action.CloseAllMapsAction;
 import net.sf.gridarta.action.CollectArchesAction;
@@ -409,6 +410,7 @@
         final Action moveSquareInvAction = createAction("moveSquareInv", "Selected Square View", new MoveSquareInvAction<G, A, R>(selectedSquareModel, projectModel.getMapManager()));
         final Action moveSquareTopAction = createAction("moveSquareTop", "Selected Square View", new MoveSquareTopAction<G, A, R>(selectedSquareModel, projectModel.getMapManager()));
         createAction("findArchetypes", "Archetypes", new FindArchetypesAction<G, A, R>(parent, archetypeChooserControl, objectChooser, projectModel.getArchetypeTypeSet()));
+        createAction("browseArchetypes", "Archetypes", new BrowseArchetypesAction<G, A, R>(parent, archetypeChooserControl, objectChooser, projectModel.getArchetypeSet(), resourceIcons.getResourceIcon(ResourceIcons.CLOSE_TAB_SMALL_ICON)));
         createAction("moveSquarePrev", "Selected Square View", new MoveSquarePrevAction<G, A, R>(selectedSquareModel, projectModel.getMapManager()));
         createAction("moveSquareNext", "Selected Square View", new MoveSquareNextAction<G, A, R>(selectedSquareModel, projectModel.getMapManager()));
         createAction("prevWindow", "Map,Window", mapDesktop);

Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1511,7 +1511,10 @@
 findArchetypes.shortdescription=Opens the find archetypes dialog.
 findArchetypes.accel=ctrl alt pressed A
 
+browseArchetypes.text=Browse archetypes
+browseArchetypes.shortdescription=Opens the browse archetypes dialog.
 
+
 #########
 # Window
 
@@ -1836,3 +1839,9 @@
 pluginViewNoScripts=no scripts available
 pluginViewConsoleTitle=Beanshell scripts I/O Console
 pluginViewProvideParameters=Please provide runtime parameters for {0}.
+
+
+# Browse Archetypes Dialog
+browseArchetypesAddAttribute.text=Add Attribute
+browseArchetypesAddAttribute.shortdescription=Displays an attribute.
+browseArchetypes.title=Browse Archetypes

Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_de.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_de.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1279,7 +1279,10 @@
 findArchetypes.text=Archetypen finden
 findArchetypes.shortdescription=\u00d6ffnet den Dialog zum Suchen von Archetypen.
 
+browseArchetypes.text=Archetypen anzeigen
+browseArchetypes.shortdescription=\u00d6ffnet den Dialog zum Anzeigen von Archetypen.
 
+
 #########
 # Window
 
@@ -1581,3 +1584,9 @@
 pluginViewNoScripts=Keine Editor-Scripte vorhanden
 pluginViewConsoleTitle=Editor-Script-Konsole
 pluginViewProvideParameters=Bitte Laufzeitparameter f\xFCr {0} eingeben.
+
+
+# Browse Archetypes Dialog
+browseArchetypesAddAttribute.text=Attribut anzeigen
+browseArchetypesAddAttribute.shortdescription=F\xFCgt das Attribut zur Tabelle hinzu.
+browseArchetypes.title=Archetypen anzeigen

Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_fr.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_fr.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1269,7 +1269,10 @@
 findArchetypes.text=Chercher un arch\u00e9type
 findArchetypes.shortdescription=Ouvre le dialogue de recherche d'arch\u00e9type.
 
+#browseArchetypes.text=
+#browseArchetypes.shortdescription=
 
+
 #########
 # Window
 
@@ -1566,3 +1569,9 @@
 #pluginViewNoScripts=
 #pluginViewConsoleTitle=
 #pluginViewProvideParameters=
+
+
+# Browse Archetypes Dialog
+#browseArchetypesAddAttribute.text=
+#browseArchetypesAddAttribute.shortdescription=
+#browseArchetypes.title=

Modified: trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_sv.properties	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/gridarta/src/main/resources/net/sf/gridarta/messages_sv.properties	2013-12-10 20:36:58 UTC (rev 9527)
@@ -1271,7 +1271,10 @@
 
 #findArchetypes.text=
 
+#browseArchetypes.text=
+#browseArchetypes.shortdescription=
 
+
 #########
 # Window
 
@@ -1567,3 +1570,9 @@
 #pluginViewNoScripts=
 #pluginViewConsoleTitle=
 #pluginViewProvideParameters=
+
+
+# Browse Archetypes Dialog
+#browseArchetypesAddAttribute.text=
+#browseArchetypesAddAttribute.shortdescription=
+#browseArchetypes.title=

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/archetype/Archetype.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/archetype/Archetype.java	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/archetype/Archetype.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -19,6 +19,7 @@
 
 package net.sf.gridarta.model.archetype;
 
+import java.util.Collection;
 import java.util.Iterator;
 import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.gameobject.GameObject;
@@ -178,4 +179,11 @@
      */
     void setArtifact();
 
+    /**
+     * Returns all attribute keys of this archetype.
+     * @return the attribute keys
+     */
+    @NotNull
+    Collection<String> getAttributeKeys();
+
 }

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/AbstractBaseObject.java	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/AbstractBaseObject.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -20,6 +20,7 @@
 package net.sf.gridarta.model.baseobject;
 
 import java.awt.Point;
+import java.util.Collection;
 import javax.swing.ImageIcon;
 import net.sf.gridarta.model.anim.AnimationObject;
 import net.sf.gridarta.model.anim.AnimationObjects;
@@ -910,7 +911,6 @@
         return faceObjSource;
     }
 
-
     /**
      * Sets object animation <code>animation <var>animName</var></code>.
      * @param animName object animation <code>animation <var>animName</var></code>
@@ -1183,4 +1183,13 @@
         }
     }
 
+    /**
+     * Returns all attribute keys of this object.
+     * @return the attribute keys
+     */
+    @NotNull
+    public Collection<String> getAttributeKeys() {
+        return gameObjectText.getAttributeKeys();
+    }
+
 }

Modified: trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/GameObjectText.java
===================================================================
--- trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/GameObjectText.java	2013-12-10 19:57:47 UTC (rev 9526)
+++ trunk/src/model/src/main/java/net/sf/gridarta/model/baseobject/GameObjectText.java	2013-12-10 20:36:58 UTC (rev 9527)
@@ -20,7 +20,9 @@
 package net.sf.gridarta.model.baseobject;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import net.sf.gridarta.utils.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -243,4 +245,20 @@
         return setObjectText(result.toString());
     }
 
+    /**
+     * Returns all attribute keys of this object.
+     * @return the attribute keys
+     */
+    @NotNull
+    public Collection<String> getAttributeKeys() {
+        final Collection<String> keys = new HashSet<String>();
+        for (final String line : StringUtils.PATTERN_END_OF_LINE.split(objectText.toString(), 0)) {
+            final int index = line.indexOf(' ');
+            if (index != -1) {
+                keys.add(line.substring(0, index));
+            }
+        }
+        return keys;
+    }
+
 }

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:[9527] trunk/src (Page 7)

gridarta-commit