[vassalengine-svn] SF.net SVN: vassalengine:[8036] VASSAL-src/branches/george973-android

[<geo...@us...>]

Revision: 8036
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8036&view=rev
Author:   george973
Date:     2012-01-17 18:07:46 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Widget fixed

Modified Paths:
--------------
    VASSAL-src/branches/george973-android/src/VASSAL/build/Widget.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/module/ChartWindow.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/module/PieceWindow.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/widget/BoxWidget.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/widget/ListWidget.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/widget/PanelWidget.java
    VASSAL-src/branches/george973-android/src/VASSAL/build/widget/TabWidget.java

Added Paths:
-----------
    VASSAL-src/branches/george973-android/src-android/vassal/build/WidgetHelp.java

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/Widget.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/Widget.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/Widget.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -25,6 +25,7 @@
 
 import VASSAL.build.module.documentation.HelpFile;
 import VASSAL.i18n.Localization;
+import vassal.build.WidgetHelp;
 
 /**
  * A general-purpose configurable GUI container
@@ -102,31 +103,10 @@
     return super.getConfigureComponents();
   }
 
-  /**
-   * @return the Component for this widget.  For efficiency, the
-   * Component may be initialized lazily instead of being created
-   * in the {@link Buildable#build} method
-   */
-  public abstract java.awt.Component getComponent();
-
   public HelpFile getHelpFile() {
     return null;
   }
+  
+  public WidgetHelp helper;
 
-  public static class MyCellRenderer extends javax.swing.DefaultListCellRenderer {
-    private static final long serialVersionUID = 1L;
-
-    public java.awt.Component getListCellRendererComponent
-      (javax.swing.JList list,
-       Object value,
-       int index,
-       boolean isSelected,
-       boolean cellHasFocus) {
-      super.getListCellRendererComponent
-        (list, value, index, isSelected, cellHasFocus);
-      if (value instanceof Configurable)
-        setText(((Configurable) value).getConfigureName());
-      return this;
-    }
-  }
 }

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/module/ChartWindow.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/module/ChartWindow.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/module/ChartWindow.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -163,14 +163,14 @@
 
   public void add(Buildable b) {
     if (b instanceof Widget) {
-      root.add(((Widget) b).getComponent());
+      root.add(((Widget) b).helper.getComponent());
     }
     super.add(b);
   }
 
   public void remove(Buildable b) {
     if (b instanceof Widget) {
-      root.remove(((Widget) b).getComponent());
+      root.remove(((Widget) b).helper.getComponent());
     }
     super.remove(b);
   }

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/module/PieceWindow.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/module/PieceWindow.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/module/PieceWindow.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -167,14 +167,14 @@
 
   public void add(Buildable b) {
     if (b instanceof Widget) {
-      root.add(((Widget) b).getComponent());
+      root.add(((Widget) b).helper.getComponent());
     }
     super.add(b);
   }
 
   public void remove(Buildable b) {
     if (b instanceof Widget) {
-      root.remove(((Widget) b).getComponent());
+      root.remove(((Widget) b).helper.getComponent());
     }
     super.remove(b);
   }

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/widget/BoxWidget.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/widget/BoxWidget.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/widget/BoxWidget.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -36,6 +36,7 @@
 import VASSAL.build.Buildable;
 import VASSAL.build.Configurable;
 import VASSAL.build.Widget;
+import vassal.build.WidgetHelp;
 
 /**
  * A Widget that corresponds to a panel with a {@link JComboBox} above
@@ -72,7 +73,7 @@
       w.addPropertyChangeListener(this);
       //      w.setAllowableConfigureComponents(getAllowableConfigureComponents());
       if (panel != null) {
-        multiPanel.add(getKey(w), w.getComponent());
+        multiPanel.add(getKey(w), w.helper.getComponent());
       }
     }
     super.add(b);
@@ -106,7 +107,7 @@
       }
 
       box.setModel(widgets);
-      box.setRenderer(new Widget.MyCellRenderer());
+      box.setRenderer(new WidgetHelp.MyCellRenderer());
       box.addItemListener(this);
       panel.add(box);
       panel.add(multiPanel);
@@ -128,7 +129,7 @@
     if (box.getSelectedItem() != null) {
       Widget w = (Widget) box.getSelectedItem();
       if (!built.contains(w)) {
-        multiPanel.add(getKey(w), w.getComponent());
+        multiPanel.add(getKey(w), w.helper.getComponent());
         built.add(w);
       }
       layout.show(multiPanel, getKey(w));

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/widget/ListWidget.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/widget/ListWidget.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/widget/ListWidget.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -36,6 +36,7 @@
 import VASSAL.build.Configurable;
 import VASSAL.build.Widget;
 import VASSAL.tools.ScrollPane;
+import vassal.build.WidgetHelp;
 
 /**
  * A Widget that corresponds to a panel with a {@link JList} sitting
@@ -80,12 +81,12 @@
 
       for (Buildable b : getBuildables()) {
         Widget w = (Widget) b;
-        multiPanel.add(getKey(w), w.getComponent());
+        multiPanel.add(getKey(w), w.helper.getComponent());
       }
 
       list.setModel(widgets);
       list.addListSelectionListener(this);
-      list.setCellRenderer(new Widget.MyCellRenderer());
+      list.setCellRenderer(new WidgetHelp.MyCellRenderer());
       list.setFixedCellWidth(80);
       list.setVisibleRowCount(3);
       split.setLeftComponent(multiPanel);
@@ -106,7 +107,7 @@
       Widget w = (Widget) b;
       widgets.addElement(w);
       if (panel != null) {
-        multiPanel.add(getKey(w), w.getComponent());
+        multiPanel.add(getKey(w), w.helper.getComponent());
         list.revalidate();
       }
     }

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/widget/PanelWidget.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/widget/PanelWidget.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/widget/PanelWidget.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -62,7 +62,7 @@
       panel = new JPanel();
       panel.setLayout(getLayout(panel));
       for (Widget w : widgets) {
-        final Component c = w.getComponent();
+        final Component c = w.helper.getComponent();
         if (c instanceof JComponent) {
           ((JComponent) c).setAlignmentX(0.0F);
           ((JComponent) c).setAlignmentY(0.0F);
@@ -94,7 +94,7 @@
       final Widget w = (Widget) b;
       widgets.add(w);
       if (panel != null) {
-        final Component c = w.getComponent();
+        final Component c = w.helper.getComponent();
         if (c instanceof JComponent) {
           ((JComponent) c).setAlignmentX(0.0F);
           ((JComponent) c).setAlignmentY(0.0F);
@@ -111,7 +111,7 @@
     if (b instanceof Widget) {
       final Widget w = (Widget) b;
       if (panel != null) {
-        panel.remove(w.getComponent());
+        panel.remove(w.helper.getComponent());
       }
       widgets.remove(w);
     }

Modified: VASSAL-src/branches/george973-android/src/VASSAL/build/widget/TabWidget.java
===================================================================
--- VASSAL-src/branches/george973-android/src/VASSAL/build/widget/TabWidget.java	2012-01-17 17:41:22 UTC (rev 8035)
+++ VASSAL-src/branches/george973-android/src/VASSAL/build/widget/TabWidget.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -53,7 +53,7 @@
   public void stateChanged(ChangeEvent e) {
     int index = tab.getSelectedIndex();
     if (index >= 0) {
-      tab.setComponentAt(index, widgets.get(index).getComponent());
+      tab.setComponentAt(index, widgets.get(index).helper.getComponent());
     }
   }
 
@@ -67,7 +67,7 @@
           tab.addTab(w.getConfigureName(), new JPanel());
         }
         else {
-          tab.addTab(w.getConfigureName(), w.getComponent());
+          tab.addTab(w.getConfigureName(), w.helper.getComponent());
         }
         w.addPropertyChangeListener(this);
         tab.addChangeListener(this);

Added: VASSAL-src/branches/george973-android/src-android/vassal/build/WidgetHelp.java
===================================================================
--- VASSAL-src/branches/george973-android/src-android/vassal/build/WidgetHelp.java	                        (rev 0)
+++ VASSAL-src/branches/george973-android/src-android/vassal/build/WidgetHelp.java	2012-01-17 18:07:46 UTC (rev 8036)
@@ -0,0 +1,7 @@
+package vassal.build;
+
+public abstract class WidgetHelp {
+	
+	abstract public Object getComponent();
+
+}

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