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

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

Revision: 1519
          http://svn.sourceforge.net/gridarta/?rev=1519&view=rev
Author:   akirschbaum
Date:     2007-01-08 15:04:32 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
Move code related to pickmap panel into PickmapChooserView.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainView.java
    trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserControl.java
    trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserView.java
    trunk/daimonin/src/daieditor/CMainView.java
    trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserControl.java
    trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserView.java

Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainView.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/crossfire/src/cfeditor/CMainView.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -45,7 +45,6 @@
 import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JDesktopPane;
@@ -53,7 +52,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.JSplitPane;
 import javax.swing.JTabbedPane;
-import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.event.InternalFrameEvent;
 import net.sf.gridarta.gui.GSplitPane;
@@ -146,9 +144,6 @@
     /** Attributes panel (bottom). */
     private GameObjectAttributesPanel mapArchPanel;
 
-    /** Panel with pickmaps. */
-    private JTabbedPane pickmapPanel;
-
     /** <code>true</code> when pickmap is active, <code>false</code> when
      * archlist is active. */
     private boolean pickmapActive = false;
@@ -210,11 +205,7 @@
         // Add all the subviews
         getContentPane().setLayout(new BorderLayout());
 
-        // initialize pickmap panel
-        pickmapPanel = new JTabbedPane(SwingConstants.TOP);
-        // initialize pickmap panel (needed early during the loading process)
-        pickmapChooserControl = new PickmapChooserControl(pickmapPanel);
-        pickmapPanel.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0));
+        pickmapChooserControl = new PickmapChooserControl();
 
         statusBar = new StatusBar(mainControl);
         getContentPane().add(statusBar, BorderLayout.SOUTH);
@@ -365,7 +356,7 @@
      * @return the JTabbedPane with all pickmaps
      */
     public JTabbedPane getPickmapPanel() {
-        return pickmapPanel;
+        return pickmapChooserControl.getPickmapPanel();
     }
 
     // show a arch in the arch map panel

Modified: trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserControl.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserControl.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -74,14 +74,13 @@
 
     /**
      * Create a PickmapChooserControl.
-     * @param tabpane Tabbed pane to create view on.
      */
-    public PickmapChooserControl(final JTabbedPane tabpane) {
+    public PickmapChooserControl() {
         mainControl = CMainControl.getInstance();
-        view = new PickmapChooserView(tabpane);
         actions = new Actions(this);
+        view = new PickmapChooserView();
         actions.init();
-        tabpane.addChangeListener(new PickmapSelectionListener(this));
+        view.addChangeListener(new PickmapSelectionListener(this));
     }
 
     /**
@@ -397,4 +396,12 @@
         mainControl.getMainView().update(mainControl.getMainView().getGraphics());
     }
 
+    /**
+     * Returns the JTabbedPane with all pickmaps.
+     * @return the JTabbedPane with all pickmaps
+     */
+    public JTabbedPane getPickmapPanel() {
+        return view.getPickmapPanel();
+    }
+
 } // class PickmapChooserControl

Modified: trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserView.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/crossfire/src/cfeditor/gui/pickmapchooser/PickmapChooserView.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -22,10 +22,15 @@
 
 package cfeditor.gui.pickmapchooser;
 
+import cfeditor.IGUIConstants;
 import java.awt.Component;
+import javax.swing.BorderFactory;
 import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeListener;
 import net.sf.japi.swing.ActionFactory;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * A View for choosing pickmaps.
@@ -38,31 +43,43 @@
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("cfeditor");
 
-    private final JTabbedPane tabpane;  // tab pane with pickmaps
+    /** Panel with pickmaps. */
+    private final JTabbedPane pickmapPanel = new JTabbedPane(SwingConstants.TOP);
 
-    public PickmapChooserView(final JTabbedPane tabpane) {
-        // the main-panel for pickmaps:
-        this.tabpane = tabpane;
+    public PickmapChooserView() {
+        pickmapPanel.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0));
     }
 
+    void addChangeListener(@NotNull final ChangeListener changeListener) {
+        pickmapPanel.addChangeListener(changeListener);
+    }
+
     void addPanel(final String name, final Component mapView) {
         int i;
-        for (i = 0; i < tabpane.getTabCount() && name.compareToIgnoreCase(tabpane.getTitleAt(i)) < 0; i++) {
+        for (i = 0; i < pickmapPanel.getTabCount() && name.compareToIgnoreCase(pickmapPanel.getTitleAt(i)) < 0; i++) {
             ;
         }
-        tabpane.insertTab(name, null, mapView, null, i);
+        pickmapPanel.insertTab(name, null, mapView, null, i);
     }
 
     void removePanel(final Component mapView) {
-        tabpane.remove(mapView);
+        pickmapPanel.remove(mapView);
     }
 
     void selectPanel(final Component mapView) {
-        tabpane.setSelectedComponent(mapView);
+        pickmapPanel.setSelectedComponent(mapView);
     }
 
     String getSelectedPanelTitle() {
-        return tabpane.getTitleAt(tabpane.getSelectedIndex());
+        return pickmapPanel.getTitleAt(pickmapPanel.getSelectedIndex());
     }
 
+    /**
+     * Returns the JTabbedPane with all pickmaps.
+     * @return the JTabbedPane with all pickmaps
+     */
+    public JTabbedPane getPickmapPanel() {
+        return pickmapPanel;
+    }
+
 } // class PickmapChooserView

Modified: trunk/daimonin/src/daieditor/CMainView.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainView.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/daimonin/src/daieditor/CMainView.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -46,7 +46,6 @@
 import java.util.prefs.Preferences;
 import static java.util.prefs.Preferences.userNodeForPackage;
 import javax.swing.Action;
-import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JDesktopPane;
 import javax.swing.JMenu;
@@ -56,7 +55,6 @@
 import static javax.swing.JSplitPane.HORIZONTAL_SPLIT;
 import static javax.swing.JSplitPane.VERTICAL_SPLIT;
 import javax.swing.JTabbedPane;
-import javax.swing.SwingConstants;
 import javax.swing.event.InternalFrameEvent;
 import net.sf.gridarta.gui.GSplitPane;
 import net.sf.gridarta.gui.MainView;
@@ -150,9 +148,6 @@
     /** Attributes panel (bottom). */
     private GameObjectAttributesPanel mapArchPanel;
 
-    /** Panel with pickmaps. */
-    private JTabbedPane pickmapPanel;
-
     /** <code>true</code> when pickmap is active, <code>false</code> when
      * archlist is active. */
     private boolean pickmapActive = false;
@@ -219,11 +214,7 @@
         final int divLocationDown = prefs.getInt(DIVIDER_LOCATION_KEY2, (int) (defheight * 0.76));
         final int divLocation = prefs.getInt(DIVIDER_LOCATION_KEY, (int) (defwidth * 0.17));
 
-        pickmapPanel = new JTabbedPane(SwingConstants.TOP);
-        // initialize pickmap panel (needed early during the loading process)
-        pickmapChooserControl = new PickmapChooserControl(pickmapPanel);
-        pickmapPanel.setComponentPopupMenu(ACTION_FACTORY.createPopupMenu(true, "pickmaps"));
-        pickmapPanel.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0));
+        pickmapChooserControl = new PickmapChooserControl();
 
         statusBar = new StatusBar(mainControl);
         archPanel = new InsertionObjectChooser(mainControl);
@@ -360,7 +351,7 @@
      * @return the JTabbedPane with all pickmaps
      */
     public JTabbedPane getPickmapPanel() {
-        return pickmapPanel;
+        return pickmapChooserControl.getPickmapPanel();
     }
 
     // show a arch in the arch map panel

Modified: trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserControl.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserControl.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -72,14 +72,13 @@
 
     /**
      * Create a PickmapChooserControl.
-     * @param tabpane Tabbed pane to create view on.
      */
-    public PickmapChooserControl(final JTabbedPane tabpane) {
+    public PickmapChooserControl() {
         mainControl = CMainControl.getInstance();
-        view = new PickmapChooserView(tabpane);
         actions = new Actions(this);
+        view = new PickmapChooserView();
         actions.init();
-        tabpane.addChangeListener(new PickmapSelectionListener(this, mainControl));
+        view.addChangeListener(new PickmapSelectionListener(this, mainControl));
     }
 
     /**
@@ -438,4 +437,12 @@
         mainControl.getMainView().update(mainControl.getMainView().getGraphics());
     }
 
+    /**
+     * Returns the JTabbedPane with all pickmaps.
+     * @return the JTabbedPane with all pickmaps
+     */
+    public JTabbedPane getPickmapPanel() {
+        return view.getPickmapPanel();
+    }
+
 } // class PickmapChooserControl

Modified: trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserView.java	2007-01-08 22:24:56 UTC (rev 1518)
+++ trunk/daimonin/src/daieditor/gui/pickmapchooser/PickmapChooserView.java	2007-01-08 23:04:32 UTC (rev 1519)
@@ -22,10 +22,15 @@
 
 package daieditor.gui.pickmapchooser;
 
+import daieditor.IGUIConstants;
 import java.awt.Component;
+import javax.swing.BorderFactory;
 import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeListener;
 import net.sf.japi.swing.ActionFactory;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * A View for choosing pickmaps.
@@ -38,35 +43,48 @@
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
 
-    private final JTabbedPane tabpane;  // tab pane with pickmaps
+    /** Panel with pickmaps. */
+    private JTabbedPane pickmapPanel = new JTabbedPane(SwingConstants.TOP);
 
-    public PickmapChooserView(final JTabbedPane tabpane) {
-        // the main-panel for pickmaps:
-        this.tabpane = tabpane;
+    public PickmapChooserView() {
+        pickmapPanel.setComponentPopupMenu(ACTION_FACTORY.createPopupMenu(true, "pickmaps"));
+        pickmapPanel.setBorder(BorderFactory.createEmptyBorder(IGUIConstants.SPACE_PICKARCH_TOP, 0, 0, 0));
     }
 
+    void addChangeListener(@NotNull final ChangeListener changeListener) {
+        pickmapPanel.addChangeListener(changeListener);
+    }
+
     int addPanel(final String name, final Component mapView, final int index) {
-        if (index < 0 || index >= tabpane.getTabCount()) {
-            tabpane.addTab(name, mapView);
-            return tabpane.getTabCount() - 1;
+        if (index < 0 || index >= pickmapPanel.getTabCount()) {
+            pickmapPanel.addTab(name, mapView);
+            return pickmapPanel.getTabCount() - 1;
         } else {
-            tabpane.insertTab(name, null, mapView, null, index);
+            pickmapPanel.insertTab(name, null, mapView, null, index);
             return index;
         }
     }
 
     void removePanel(final int index) {
-        tabpane.remove(index);
+        pickmapPanel.remove(index);
     }
 
     void selectPanel(final int index) {
-        if (index >= 0 && index < tabpane.getTabCount()) {
-            tabpane.setSelectedIndex(index);
+        if (index >= 0 && index < pickmapPanel.getTabCount()) {
+            pickmapPanel.setSelectedIndex(index);
         }
     }
 
     String getSelectedPanelTitle() {
-        return tabpane.getTitleAt(tabpane.getSelectedIndex());
+        return pickmapPanel.getTitleAt(pickmapPanel.getSelectedIndex());
     }
 
+    /**
+     * Returns the JTabbedPane with all pickmaps.
+     * @return the JTabbedPane with all pickmaps
+     */
+    public JTabbedPane getPickmapPanel() {
+        return pickmapPanel;
+    }
+
 } // class PickmapChooserView


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: [1519] trunk (Page 20)

gridarta-commit