Revision: 2959
http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2959&view=rev
Author: uckelman
Date: 2008-02-01 12:13:57 -0800 (Fri, 01 Feb 2008)
Log Message:
-----------
Merged trunk 2949:HEAD.
Modified Paths:
--------------
VASSAL-src/branches/uckelman-working/src/VASSAL/Info.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/AbstractBuildable.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/AutoConfigurable.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/GameModule.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ChartWindow.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DiceButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DieManager.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DoActionButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Documentation.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalKeyCommand.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalOptions.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/InternetDiceButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Inventory.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Map.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ModuleExtension.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/NotesWindow.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PieceWindow.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PlayerRoster.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Plugin.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PredefinedSetup.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrivateMap.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypeDefinition.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypesContainer.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/RandomTextButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDiceButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDie.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDieFace.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ToolbarMenu.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/AboutScreen.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/BrowserHelpFile.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/HelpFile.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/Tutorial.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorManager.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorSwatch.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontManager.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontStyle.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImage.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImageDefinitions.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayout.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayoutsContainer.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItem.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/Item.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItem.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItem.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItem.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItem.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItemInstance.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/CounterDetailViewer.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DeckGlobalKeyCommand.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DrawPile.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/GlobalMap.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HidePiecesButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HighlightLastMoved.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/ImageSaver.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LOS_Thread.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayerControl.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayeredPieceCollection.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MapShader.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MassKeyCommand.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/PieceRecenterer.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighter.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighters.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SetupStack.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/StackMetrics.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/TextSaver.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/Zoomer.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/Board.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/HexGrid.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/Region.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/RegionGrid.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/SquareGrid.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/ZonedGrid.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/mapgrid/HexGridNumbering.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/mapgrid/RegularGridNumbering.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/mapgrid/Zone.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/mapgrid/ZoneHighlight.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/boardPicker/board/mapgrid/ZonedGridHighlighter.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/properties/ChangePropertyButton.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/properties/GlobalProperties.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/properties/GlobalProperty.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/CounterTurnLevel.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/ListTurnLevel.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/TurnComponent.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/TurnGlobalHotkey.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/TurnLevel.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/turn/TurnTracker.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/BoxWidget.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/Chart.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/HtmlChart.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/ListWidget.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/MapWidget.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/PanelWidget.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/PieceSlot.java
VASSAL-src/branches/uckelman-working/src/VASSAL/build/widget/TabWidget.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/BasicPiece.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/CounterGlobalKeyCommand.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/MovementMarkable.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/PieceDefiner.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/PlaceMarker.java
VASSAL-src/branches/uckelman-working/src/VASSAL/counters/Replace.java
VASSAL-src/branches/uckelman-working/src/VASSAL/i18n/Language.java
VASSAL-src/branches/uckelman-working/src/VASSAL/i18n/TranslatableMarker.java
VASSAL-src/branches/uckelman-working/src/VASSAL/i18n/Translation.java
VASSAL-src/branches/uckelman-working/src/VASSAL/i18n/VassalTranslation.java
VASSAL-src/branches/uckelman-working/src/VASSAL/preferences/BasicPreference.java
VASSAL-src/branches/uckelman-working/src/VASSAL/preferences/EnumPreference.java
VASSAL-src/branches/uckelman-working/src/VASSAL/tools/SavedGameUpdater.java
Added Paths:
-----------
VASSAL-src/branches/uckelman-working/src/VASSAL/build/GpIdSupport.java
Removed Paths:
-------------
VASSAL-src/branches/uckelman-working/src/VASSAL/build/TopLevelComponent.java
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/Info.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/Info.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/Info.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -32,7 +32,7 @@
* Class for storing release-related information
*/
public final class Info {
- private static final String VERSION = "3.1.0-svn2914"; //$NON-NLS-1$
+ private static final String VERSION = "3.1.0-svn2930"; //$NON-NLS-1$
private static File homeDir;
private static Boolean is2dEnabled;
private static Boolean isDndEnabled;
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/AbstractBuildable.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/AbstractBuildable.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/AbstractBuildable.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -114,8 +114,8 @@
/**
* @return all build components that are an instance of the given class
*/
- public <T> Collection<T> getComponentsOf(Class<T> target) {
- ArrayList<T> l = new ArrayList<T>();
+ public <T> List<T> getComponentsOf(Class<T> target) {
+ final ArrayList<T> l = new ArrayList<T>();
for (Buildable b : buildComponents) {
if (target.isInstance(b)) {
l.add(target.cast(b));
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/AutoConfigurable.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/AutoConfigurable.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/AutoConfigurable.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -61,7 +61,7 @@
* Valid classes are: String, Integer, Double, Boolean, Image,
* File, Color, and KeyStroke
*/
- public Class[] getAttributeTypes();
+ public Class<?>[] getAttributeTypes();
/**
* Because attributes are not always applicable in all cases, this method returns an interface
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/GameModule.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/GameModule.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/GameModule.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -28,7 +28,6 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Random;
import javax.swing.JComponent;
@@ -101,7 +100,7 @@
* such as {@link DataArchive}, {@link ServerConnection}, {@link Logger},
* and {@link Prefs}.</p>
*/
-public abstract class GameModule extends AbstractConfigurable implements CommandEncoder, ToolBarComponent, PropertySource, MutablePropertiesContainer, TopLevelComponent {
+public abstract class GameModule extends AbstractConfigurable implements CommandEncoder, ToolBarComponent, PropertySource, MutablePropertiesContainer, GpIdSupport {
protected static final String DEFAULT_NAME = "Unnamed module"; //$NON-NLS-1$
public static final String MODULE_NAME = "name"; //$NON-NLS-1$
public static final String MODULE_VERSION = "version"; //$NON-NLS-1$
@@ -121,8 +120,7 @@
protected MutablePropertiesContainer propsContainer = new Impl();
protected PropertyChangeListener repaintOnPropertyChange = new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- for (Iterator maps = Map.getAllMaps(); maps.hasNext(); ) {
- Map map = (Map) maps.next();
+ for (Map map : Map.getMapList()) {
map.repaint();
}
}
@@ -155,11 +153,11 @@
protected int nextGpId = 0;
/*
- * Store the currently building top level component. Only meaningful while
+ * Store the currently building GpId source. Only meaningful while
* the GameModule or an Extension is actually in the process of being built
* during module/extension load.
*/
- protected TopLevelComponent currentTopLevelComponent = null;
+ protected GpIdSupport gpidSupport = null;
/**
* @return the top-level frame of the controls window
@@ -303,9 +301,8 @@
return new String[]{Resources.getString("Editor.GameModule.name_label"), Resources.getString("Editor.GameModule.version_label")}; //$NON-NLS-1$ //$NON-NLS-2$
}
- @SuppressWarnings("unchecked")
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
String.class
};
@@ -723,7 +720,7 @@
}
else {
theModule = module;
- theModule.setTopLevelComponent(theModule);
+ theModule.setGpIdSupport(theModule);
try {
theModule.build();
}
@@ -759,12 +756,12 @@
return String.valueOf(nextGpId++);
}
- public void setTopLevelComponent(TopLevelComponent c) {
- currentTopLevelComponent = c;
+ public void setGpIdSupport(GpIdSupport s) {
+ gpidSupport = s;
}
- public TopLevelComponent getTopLevelComponent() {
- return currentTopLevelComponent;
+ public GpIdSupport getGpIdSupport() {
+ return gpidSupport;
}
/**
Copied: VASSAL-src/branches/uckelman-working/src/VASSAL/build/GpIdSupport.java (from rev 2957, VASSAL-src/trunk/src/VASSAL/build/GpIdSupport.java)
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/GpIdSupport.java (rev 0)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/GpIdSupport.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -0,0 +1,42 @@
+/*
+ * $Id: TopLevelComponent.java 864 2006-03-06 05:24:24Z rodneykinney $
+ *
+ * Copyright (c) 2008 by Brent Easton
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, copies are available
+ * at http://www.opensource.org.
+ */
+
+package VASSAL.build;
+
+/**
+ * GameModule and ModuleExtension are the top-level components and must
+ * provide some Namespace services for generated GamePiece Identifiers.
+ *
+ * Each Extension must have a unique Namespace String. Each PieceSlot is
+ * allocated a unique number in a series maintained for each top level
+ * component.
+ *
+ * Each GampePiece generated is tied to it's originating PieceSlot by the
+ * NameSpace Id and the PieceSlot Id.
+ */
+public interface GpIdSupport {
+
+ /**
+ * Generate a new PieceSlot Id, unique to this top-level component.
+ *
+ * @return PieceSlot Id
+ */
+ public String generateGpId();
+
+}
Deleted: VASSAL-src/branches/uckelman-working/src/VASSAL/build/TopLevelComponent.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/TopLevelComponent.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/TopLevelComponent.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -1,42 +0,0 @@
-/*
- * $Id: TopLevelComponent.java 864 2006-03-06 05:24:24Z rodneykinney $
- *
- * Copyright (c) 2008 by Brent Easton
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License (LGPL) as published by the Free Software Foundation.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, copies are available
- * at http://www.opensource.org.
- */
-
-package VASSAL.build;
-
-/**
- * GameModule and ModuleExtension are the top-level components and must
- * provide some Namespace services for generated GamePiece Identifiers.
- *
- * Each Extension must have a unique Namespace String. Each PieceSlot is
- * allocated a unique number in a series maintained for each top level
- * component.
- *
- * Each GampePiece generated is tied to it's originating PieceSlot by the
- * NameSpace Id and the PieceSlot Id.
- */
-public interface TopLevelComponent {
-
- /**
- * Generate a new PieceSlot Id, unique to this top-level component.
- *
- * @return PieceSlot Id
- */
- public String generateGpId();
-
-}
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ChartWindow.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ChartWindow.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ChartWindow.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -192,9 +192,8 @@
};
}
- @SuppressWarnings("unchecked")
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
String.class,
String.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DiceButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DiceButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DiceButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -183,22 +183,35 @@
}
public String[] getAttributeNames() {
- String s[] = {NAME, BUTTON_TEXT, TOOLTIP, ICON, N_DICE, N_SIDES, PLUS, REPORT_TOTAL, HOTKEY, PROMPT_ALWAYS, REPORT_FORMAT};
- return s;
+ return new String[] {
+ NAME,
+ BUTTON_TEXT,
+ TOOLTIP,
+ ICON,
+ N_DICE,
+ N_SIDES,
+ PLUS,
+ REPORT_TOTAL,
+ HOTKEY,
+ PROMPT_ALWAYS,
+ REPORT_FORMAT
+ };
}
public String[] getAttributeDescriptions() {
- return new String[]{"Name: ",
- "Button text: ",
- "Tooltip text: ",
- "Button icon: ",
- Resources.getString("Dice.number_of_dice"), //$NON-NLS-1$
- Resources.getString("Dice.number_of_sides"), //$NON-NLS-1$
- Resources.getString("Dice.add_to_each_side"), //$NON-NLS-1$
- "Report Total?",
- "Hotkey: ",
- "Prompt for values when button pushed?",
- "Report Format: "};
+ return new String[]{
+ "Name: ",
+ "Button text: ",
+ "Tooltip text: ",
+ "Button icon: ",
+ Resources.getString("Dice.number_of_dice"), //$NON-NLS-1$
+ Resources.getString("Dice.number_of_sides"), //$NON-NLS-1$
+ Resources.getString("Dice.add_to_each_side"), //$NON-NLS-1$
+ "Report Total?",
+ "Hotkey: ",
+ "Prompt for values when button pushed?",
+ "Report Format: "
+ };
}
public static class IconConfig implements ConfigurerFactory {
@@ -213,19 +226,20 @@
}
}
- @SuppressWarnings("unchecked")
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,
- String.class,
- String.class,
- IconConfig.class,
- Integer.class,
- Integer.class,
- Integer.class,
- Boolean.class,
- KeyStroke.class,
- Boolean.class,
- ReportFormatConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ Integer.class,
+ Integer.class,
+ Integer.class,
+ Boolean.class,
+ KeyStroke.class,
+ Boolean.class,
+ ReportFormatConfig.class
+ };
}
private VisibilityCondition cond = new VisibilityCondition() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DieManager.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DieManager.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DieManager.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -323,15 +323,27 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Description", "Multi-roll Default Ndice", "Multi-roll Default Nsides"};
+ return new String[]{
+ "Description",
+ "Multi-roll Default Ndice",
+ "Multi-roll Default Nsides"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, Integer.class, Integer.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ Integer.class,
+ Integer.class
+ };
}
public String[] getAttributeNames() {
- return new String[]{DESC, DFLT_NDICE, DFLT_NSIDES};
+ return new String[]{
+ DESC,
+ DFLT_NDICE,
+ DFLT_NSIDES
+ };
}
public void setAttribute(String key, Object value) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DoActionButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DoActionButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/DoActionButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -144,18 +144,20 @@
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,
- String.class,
- String.class,
- IconConfig.class,
- KeyStroke.class,
- Boolean.class,
- ReportFormatConfig.class,
- Boolean.class,
- SoundConfig.class,
- Boolean.class,
- HotkeyConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ Boolean.class,
+ ReportFormatConfig.class,
+ Boolean.class,
+ SoundConfig.class,
+ Boolean.class,
+ HotkeyConfig.class
+ };
}
public void addTo(Buildable parent) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Documentation.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Documentation.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Documentation.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -91,8 +91,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public Configurer getConfigurer() {
@@ -100,7 +100,12 @@
}
public Class[] getAllowableConfigureComponents() {
- return new Class[]{BrowserHelpFile.class, AboutScreen.class, Tutorial.class, HelpFile.class};
+ return new Class[]{
+ BrowserHelpFile.class,
+ AboutScreen.class,
+ Tutorial.class,
+ HelpFile.class
+ };
}
public static String getConfigureTypeName() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalKeyCommand.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalKeyCommand.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalKeyCommand.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -19,7 +19,6 @@
package VASSAL.build.module;
import java.util.ArrayList;
-import java.util.Iterator;
import VASSAL.build.GameModule;
import VASSAL.build.module.map.MassKeyCommand;
@@ -30,9 +29,9 @@
public class GlobalKeyCommand extends MassKeyCommand {
public void apply() {
- ArrayList<Map> l = new ArrayList<Map>();
- for (Iterator it = Map.getAllMaps(); it.hasNext();) {
- l.add((Map) it.next());
+ final ArrayList<Map> l = new ArrayList<Map>();
+ for (Map m : Map.getMapList()) {
+ l.add(m);
}
GameModule.getGameModule().sendAndLog(
globalCommand.apply(l.toArray(new Map[l.size()]), getFilter()));
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalOptions.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalOptions.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/GlobalOptions.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -350,8 +350,14 @@
return attributes.toArray(new String[attributes.size()]);
}
- public Class[] getAttributeTypes() {
- return new Class[]{Prompt.class, null, Prompt.class, Prompt.class, PlayerIdFormatConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ Prompt.class,
+ null,
+ Prompt.class,
+ Prompt.class,
+ PlayerIdFormatConfig.class
+ };
}
/**
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/InternetDiceButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/InternetDiceButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/InternetDiceButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -52,8 +52,8 @@
return "Internet Dice Button";
}
- public Class[] getAttributeTypes() {
- Class[] c = super.getAttributeTypes();
+ public Class<?>[] getAttributeTypes() {
+ final Class<?>[] c = super.getAttributeTypes();
for (int i = 0; i < c.length; ++i) {
if (c[i] == ReportFormatConfig.class) {
c[i] = InternetReportFormatConfig.class;
@@ -61,6 +61,7 @@
}
return c;
}
+
public static class InternetReportFormatConfig extends ReportFormatConfig {
public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
FormattedStringConfigurer config = (FormattedStringConfigurer) super.getConfigurer(c, key, name);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Inventory.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Inventory.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Inventory.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -415,8 +415,7 @@
private void buildTreeModel() {
// Initialize all pieces with CurrentBoard correctly.
- for (Iterator i = VASSAL.build.module.Map.getAllMaps(); i.hasNext();) {
- VASSAL.build.module.Map m = (VASSAL.build.module.Map) i.next();
+ for (VASSAL.build.module.Map m : VASSAL.build.module.Map.getMapList()) {
m.getPieces();
}
@@ -476,26 +475,78 @@
}
public String[] getAttributeDescriptions() {
- return new String[] {"Name: ", "Button text: ", "Tooltip text: ","Button icon: ", "Hotkey: ", // "Display",
- "Show only pieces matching these properties: ", "Sort and Group By Properties",
- "Label for folders: ", "Show only folders?", "Label for pieces: ", "Sort?", "Label for sort: ",
- "Sorting method: ", "Center on selected piece?",
- "Forward key strokes to selected piece?", "Show right-click menu of piece?", "Draw piece images?", "Zoom factor: ", "Available to these sides"};
+ return new String[] {
+ "Name: ",
+ "Button text: ",
+ "Tooltip text: ",
+ "Button icon: ",
+ "Hotkey: ",
+ // "Display",
+ "Show only pieces matching these properties: ",
+ "Sort and Group By Properties",
+ "Label for folders: ",
+ "Show only folders?",
+ "Label for pieces: ",
+ "Sort?",
+ "Label for sort: ",
+ "Sorting method: ",
+ "Center on selected piece?",
+ "Forward key strokes to selected piece?",
+ "Show right-click menu of piece?",
+ "Draw piece images?",
+ "Zoom factor: ",
+ "Available to these sides"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] {String.class, String.class, String.class, IconConfig.class, KeyStroke.class, // DestConfig.class,
- PropertyExpression.class, String[].class, String.class, Boolean.class,
- PieceFormatConfig.class, Boolean.class, PieceFormatConfig.class,
- SortConfig.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class,
- Double.class, String[].class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ // DestConfig.class,
+ PropertyExpression.class,
+ String[].class,
+ String.class,
+ Boolean.class,
+ PieceFormatConfig.class,
+ Boolean.class,
+ PieceFormatConfig.class,
+ SortConfig.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class,
+ Double.class,
+ String[].class
+ };
}
public String[] getAttributeNames() {
- return new String[] {NAME, BUTTON_TEXT, TOOLTIP, ICON, HOTKEY, // DEST,
- FILTER, GROUP_BY, NON_LEAF_FORMAT, FOLDERS_ONLY, LEAF_FORMAT,
- SORT_PIECES, SORT_FORMAT,
- SORTING, CENTERONPIECE, FORWARD_KEYSTROKE, SHOW_MENU, DRAW_PIECES, PIECE_ZOOM, SIDES};
+ return new String[] {
+ NAME,
+ BUTTON_TEXT,
+ TOOLTIP,
+ ICON,
+ HOTKEY,
+ // DEST,
+ FILTER,
+ GROUP_BY,
+ NON_LEAF_FORMAT,
+ FOLDERS_ONLY,
+ LEAF_FORMAT,
+ SORT_PIECES,
+ SORT_FORMAT,
+ SORTING,
+ CENTERONPIECE,
+ FORWARD_KEYSTROKE,
+ SHOW_MENU,
+ DRAW_PIECES,
+ PIECE_ZOOM,
+ SIDES
+ };
}
public static class IconConfig implements ConfigurerFactory {
@@ -503,6 +554,7 @@
return new IconConfigurer(key, name, "/images/inventory.gif"); //$NON-NLS-1$
}
}
+
public static class PieceFormatConfig implements TranslatableConfigurerFactory {
public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
return new GamePieceFormattedStringConfigurer(key, name);
@@ -513,6 +565,7 @@
// return new StringEnumConfigurer(key, name, DEST_OPTIONS);
// }
// }
+
public static class SortConfig implements ConfigurerFactory {
public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
return new StringEnumConfigurer(key,name,SORT_OPTIONS);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Map.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Map.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Map.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -57,6 +57,7 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -2031,23 +2032,80 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Map Name: ", "Mark pieces that move (if they possess the proper trait): ", "\"Mark unmoved\" button text: ", "\"Mark unmoved\" tooltip text: ", "\"Mark unmoved\" button icon: ", "Horizontal Padding: ",
- "Vertical Padding: ", "Can contain multiple boards?", "Border color for selected counters: ", "Border thickness for selected counters: ",
- "Include toolbar button to show/hide?", "Toolbar button text: ", "Toolbar tooltip text: ", "Toolbar button icon: ", "Hotkey: ", "Auto-report format for movement within this map: ",
- "Auto-report format for movement to this map: ", "Auto-report format for units created in this map: ", "Auto-report format for units modified on this map: ",
- "Key Command to apply to all units ending movement on this map: " };
+ return new String[] {
+ "Map Name: ",
+ "Mark pieces that move (if they possess the proper trait): ",
+ "\"Mark unmoved\" button text: ",
+ "\"Mark unmoved\" tooltip text: ",
+ "\"Mark unmoved\" button icon: ",
+ "Horizontal Padding: ",
+ "Vertical Padding: ",
+ "Can contain multiple boards?",
+ "Border color for selected counters: ",
+ "Border thickness for selected counters: ",
+ "Include toolbar button to show/hide?",
+ "Toolbar button text: ",
+ "Toolbar tooltip text: ",
+ "Toolbar button icon: ",
+ "Hotkey: ",
+ "Auto-report format for movement within this map: ",
+ "Auto-report format for movement to this map: ",
+ "Auto-report format for units created in this map: ",
+ "Auto-report format for units modified on this map: ",
+ "Key Command to apply to all units ending movement on this map: "
+ };
}
public String[] getAttributeNames() {
- return new String[] { NAME, MARK_MOVED, MARK_UNMOVED_TEXT, MARK_UNMOVED_TOOLTIP, MARK_UNMOVED_ICON, EDGE_WIDTH, EDGE_HEIGHT, ALLOW_MULTIPLE, HIGHLIGHT_COLOR, HIGHLIGHT_THICKNESS,
- USE_LAUNCH_BUTTON, BUTTON_NAME, TOOLTIP, ICON, HOTKEY, MOVE_WITHIN_FORMAT, MOVE_TO_FORMAT, CREATE_FORMAT, CHANGE_FORMAT, MOVE_KEY };
+ return new String[] {
+ NAME,
+ MARK_MOVED,
+ MARK_UNMOVED_TEXT,
+ MARK_UNMOVED_TOOLTIP,
+ MARK_UNMOVED_ICON,
+ EDGE_WIDTH,
+ EDGE_HEIGHT,
+ ALLOW_MULTIPLE,
+ HIGHLIGHT_COLOR,
+ HIGHLIGHT_THICKNESS,
+ USE_LAUNCH_BUTTON,
+ BUTTON_NAME,
+ TOOLTIP,
+ ICON,
+ HOTKEY,
+ MOVE_WITHIN_FORMAT,
+ MOVE_TO_FORMAT,
+ CREATE_FORMAT,
+ CHANGE_FORMAT,
+ MOVE_KEY
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { String.class, GlobalOptions.Prompt.class, String.class, String.class, UnmovedIconConfig.class, Integer.class, Integer.class, Boolean.class, Color.class,
- Integer.class, Boolean.class, String.class, String.class, IconConfig.class, KeyStroke.class, MoveWithinFormatConfig.class, MoveToFormatConfig.class,
- CreateFormatConfig.class, ChangeFormatConfig.class, KeyStroke.class };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ GlobalOptions.Prompt.class,
+ String.class,
+ String.class,
+ UnmovedIconConfig.class,
+ Integer.class,
+ Integer.class,
+ Boolean.class,
+ Color.class,
+ Integer.class,
+ Boolean.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ MoveWithinFormatConfig.class,
+ MoveToFormatConfig.class,
+ CreateFormatConfig.class,
+ ChangeFormatConfig.class,
+ KeyStroke.class
+ };
}
+
public static final String LOCATION = "location"; //$NON-NLS-1$
public static final String OLD_LOCATION = "previousLocation"; //$NON-NLS-1$
public static final String OLD_MAP = "previousMap"; //$NON-NLS-1$
@@ -2180,21 +2238,32 @@
}
/**
- * Utility method to return a list of all map components in the module
- *
- * @return
+ * Utility method to return a {@link List} of all map components in the
+ * module.
+ *
+ * @return the list of <code>Map</code>s
*/
-// FIXME: should return a Collection<Map> instead
- public static Iterator getAllMaps() {
- Collection<Map> l = GameModule.getGameModule().getComponentsOf(Map.class);
+ public static List<Map> getMapList() {
+ final List<Map> l = GameModule.getGameModule().getComponentsOf(Map.class);
for (ChartWindow cw :
GameModule.getGameModule().getComponentsOf(ChartWindow.class)) {
for (MapWidget mw : cw.getAllDescendantComponentsOf(MapWidget.class)) {
l.add(mw.getMap());
}
}
- return l.iterator();
+ return l;
}
+
+ /**
+ * Utility method to return a list of all map components in the module
+ *
+ * @return Iterator over all maps
+ * @deprecated Use {@link #getMapList()} instead.
+ */
+ @Deprecated
+ public static Iterator getAllMaps() {
+ return getMapList().iterator();
+ }
/**
* Find a contained Global Variable by name
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ModuleExtension.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ModuleExtension.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ModuleExtension.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -45,8 +45,8 @@
import VASSAL.build.Buildable;
import VASSAL.build.Builder;
import VASSAL.build.GameModule;
+import VASSAL.build.GpIdSupport;
import VASSAL.build.IllegalBuildException;
-import VASSAL.build.TopLevelComponent;
import VASSAL.build.module.documentation.HelpFile;
import VASSAL.build.widget.PieceSlot;
import VASSAL.command.Command;
@@ -61,7 +61,7 @@
* Like a GameModule, it is built from scratch from a 'buildFile' in a DataArchive
* The components described in the buildFile are appended to components in the base DataArchive
*/
-public class ModuleExtension extends AbstractBuildable implements GameComponent, PluginsLoader.PluginElement, TopLevelComponent {
+public class ModuleExtension extends AbstractBuildable implements GameComponent, PluginsLoader.PluginElement, GpIdSupport {
public static final String BASE_MODULE_NAME = "module"; //$NON-NLS-1$
public static final String BASE_MODULE_VERSION = "moduleVersion"; //$NON-NLS-1$
public static final String VERSION = "version"; //$NON-NLS-1$
@@ -99,7 +99,7 @@
final String fileName = "buildFile"; //$NON-NLS-1$
GameModule.getGameModule().getDataArchive().addExtension(archive);
- GameModule.getGameModule().setTopLevelComponent(this); // Record that we are currently building this Extension
+ GameModule.getGameModule().setGpIdSupport(this); // Record that we are currently building this Extension
InputStream in = null;
try {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/NotesWindow.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/NotesWindow.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/NotesWindow.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -239,11 +239,21 @@
}
public String[] getAttributeDescriptions() {
- return new String[] {"Button text: ", "Tooltip text: ", "Button Icon: ", "Hotkey: "};
+ return new String[] {
+ "Button text: ",
+ "Tooltip text: ",
+ "Button Icon: ",
+ "Hotkey: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] {String.class, String.class, IconConfig.class, KeyStroke.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class
+ };
}
public static class IconConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PieceWindow.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PieceWindow.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PieceWindow.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -228,8 +228,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
Boolean.class,
String.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PlayerRoster.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PlayerRoster.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PlayerRoster.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -489,11 +489,19 @@
* abstract classes for i18n.
*/
public String[] getAttributeNames() {
- return new String[] {BUTTON_TEXT, TOOL_TIP, SIDES};
+ return new String[] {
+ BUTTON_TEXT,
+ TOOL_TIP,
+ SIDES
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { String.class, String.class, String.class };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ String.class,
+ String.class
+ };
}
public String getAttributeValueString(String key) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Plugin.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Plugin.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/Plugin.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -88,8 +88,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
@@ -120,4 +120,4 @@
}
-}
\ No newline at end of file
+}
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PredefinedSetup.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PredefinedSetup.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PredefinedSetup.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -71,16 +71,30 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Name: ", "Contains sub-menus?", "Use pre-defined file?", "Saved Game: "};
+ return new String[]{
+ "Name: ",
+ "Contains sub-menus?",
+ "Use pre-defined file?",
+ "Saved Game: "
+ };
}
- @SuppressWarnings("unchecked")
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, Boolean.class, Boolean.class, File.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ Boolean.class,
+ Boolean.class,
+ File.class
+ };
}
public String[] getAttributeNames() {
- return new String[]{NAME, IS_MENU, USE_FILE, FILE};
+ return new String[]{
+ NAME,
+ IS_MENU,
+ USE_FILE,
+ FILE
+ };
}
public String getAttributeValueString(String key) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrivateMap.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrivateMap.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrivateMap.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -86,10 +85,14 @@
return s;
}
- public Class[] getAttributeTypes() {
- Class[] c1 = new Class[]{String[].class, Boolean.class, String.class};
- Class[] c2 = super.getAttributeTypes();
- Class[] c = new Class[c1.length + c2.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?>[] c1 = new Class<?>[]{
+ String[].class,
+ Boolean.class,
+ String.class
+ };
+ final Class<?>[] c2 = super.getAttributeTypes();
+ final Class<?>[] c = new Class<?>[c1.length + c2.length];
System.arraycopy(c1, 0, c, 0, c1.length);
System.arraycopy(c2, 0, c, c1.length, c2.length);
return c;
@@ -109,9 +112,7 @@
owners = (String[]) value;
}
else if (USE_BOARDS.equals(key)) {
- Iterator it = Map.getAllMaps();
- while (it.hasNext()) {
- Map m = (Map) it.next();
+ for (Map m : Map.getMapList()) {
if (m.getMapName().equals(value)) {
surrogate = m;
break;
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypeDefinition.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypeDefinition.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypeDefinition.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -262,8 +262,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypesContainer.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypesContainer.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/PrototypesContainer.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -46,8 +46,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/RandomTextButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/RandomTextButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/RandomTextButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -179,15 +179,15 @@
return l.toArray(new String[l.size()]);
}
- public Class[] getAttributeTypes() {
- ArrayList<Class> l =
- new ArrayList<Class>(Arrays.asList(super.getAttributeTypes()));
+ public Class<?>[] getAttributeTypes() {
+ ArrayList<Class<?>> l =
+ new ArrayList<Class<?>>(Arrays.asList(super.getAttributeTypes()));
ArrayList<String> names =
new ArrayList<String>(Arrays.asList(super.getAttributeNames()));
l.remove(names.indexOf(N_SIDES));
l.add(String[].class);
l.add(Boolean.class);
- return l.toArray(new Class[names.size()]);
+ return l.toArray(new Class<?>[names.size()]);
}
public void setAttribute(String key, Object value) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDiceButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDiceButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDiceButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -249,8 +249,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
String.class,
String.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDie.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDie.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDie.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -56,8 +56,8 @@
return new String[]{"Name: ", "Results format: "};
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, ResultFormatConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{String.class, ResultFormatConfig.class};
}
public static class ResultFormatConfig implements TranslatableConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDieFace.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDieFace.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/SpecialDieFace.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -41,14 +41,19 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Text Value: ", "Numerical value: ", "Icon: "};
+ return new String[]{
+ "Text Value: ",
+ "Numerical value: ",
+ "Icon: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
Integer.class,
- IconConfig.class};
+ IconConfig.class
+ };
}
public static class IconConfig implements ConfigurerFactory {
@@ -126,4 +131,4 @@
public void removeFrom(Buildable parent) {
((SpecialDie) parent).removeFace(this);
}
-}
\ No newline at end of file
+}
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ToolbarMenu.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ToolbarMenu.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/ToolbarMenu.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -96,12 +96,24 @@
Resources.getString(Resources.HOTKEY_LABEL),Resources.getString("Editor.ToolbarMenu.menu_entries")}; //$NON-NLS-1$
}
- public Class[] getAttributeTypes() {
- return new Class[] {String.class, String.class, Icon.class, KeyStroke.class, String[].class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ String.class,
+ Icon.class,
+ KeyStroke.class,
+ String[].class
+ };
}
public String[] getAttributeNames() {
- return new String[] {BUTTON_TEXT, TOOLTIP, BUTTON_ICON, BUTTON_HOTKEY, MENU_ITEMS};
+ return new String[] {
+ BUTTON_TEXT,
+ TOOLTIP,
+ BUTTON_ICON,
+ BUTTON_HOTKEY,
+ MENU_ITEMS
+ };
}
public String getAttributeValueString(String key) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/AboutScreen.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/AboutScreen.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/AboutScreen.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -164,8 +164,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
Image.class
};
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/BrowserHelpFile.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/BrowserHelpFile.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/BrowserHelpFile.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -245,15 +245,26 @@
protected File dir;
public String[] getAttributeDescriptions() {
- return new String[]{"Menu Entry: ", "Contents: ", "Starting Page: "};
+ return new String[]{
+ "Menu Entry: ",
+ "Contents: ",
+ "Starting Page: "
+ };
}
public String[] getAttributeNames() {
- return new String[]{TITLE, DIR, STARTING_PAGE};
+ return new String[]{
+ TITLE, DIR,
+ STARTING_PAGE
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, ContentsConfig.class, String.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ ContentsConfig.class,
+ String.class
+ };
}
public String getAttributeValueString(String key) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/HelpFile.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/HelpFile.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/HelpFile.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -214,11 +214,17 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Menu Entry: ", "Text File: "};
+ return new String[]{
+ "Menu Entry: ",
+ "Text File: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, File.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ File.class
+ };
}
public Class[] getAllowableConfigureComponents() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/Tutorial.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/Tutorial.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/documentation/Tutorial.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -104,12 +104,24 @@
return new String[]{"Menu Text", "Logfile", "Launch automatically on first startup", "Auto-launch confirm message", "Welcome message"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, File.class, Boolean.class, String.class, String.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ File.class,
+ Boolean.class,
+ String.class,
+ String.class
+ };
}
public String[] getAttributeNames() {
- return new String[]{NAME, FILE_NAME, LAUNCH_ON_STARTUP, PROMPT_MESSAGE, WELCOME_MESSAGE};
+ return new String[]{
+ NAME,
+ FILE_NAME,
+ LAUNCH_ON_STARTUP,
+ PROMPT_MESSAGE,
+ WELCOME_MESSAGE
+ };
}
public VisibilityCondition getAttributeVisibility(String name) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorManager.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorManager.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorManager.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -154,8 +154,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorSwatch.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorSwatch.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ColorSwatch.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -69,15 +69,24 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Color Name: ", "Color: "};
+ return new String[] {
+ "Color Name: ",
+ "Color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { String.class, Color.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ Color.class
+ };
}
public String[] getAttributeNames() {
- return new String[] { NAME, COLOR };
+ return new String[] {
+ NAME,
+ COLOR
+ };
}
public void setAttribute(String key, Object o) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontManager.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontManager.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontManager.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -85,8 +85,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontStyle.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontStyle.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/FontStyle.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -60,15 +60,16 @@
public String[] getAttributeDescriptions() {
return new String[] {
- "Style Name: ",
- "Font Style: "};
-
+ "Style Name: ",
+ "Font Style: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] {
- String.class,
- FontStyleConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ FontStyleConfig.class
+ };
}
public static class FontStyleConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImage.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImage.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImage.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -120,8 +120,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[] {
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
String.class,
BgColorSwatchConfig.class,
BorderColorSwatchConfig.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImageDefinitions.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImageDefinitions.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceImageDefinitions.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -73,8 +73,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayout.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayout.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayout.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -132,11 +132,23 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Name: ", "Counter Width: ", "Counter Height: ", "Border Style: ", ""}; //$NON-NLS-5$
+ return new String[]{
+ "Name: ",
+ "Counter Width: ",
+ "Counter Height: ",
+ "Border Style: ",
+ "" //$NON-NLS-1$
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, Integer.class, Integer.class, BorderConfig.class, LayoutConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ Integer.class,
+ Integer.class,
+ BorderConfig.class,
+ LayoutConfig.class
+ };
}
public static class LayoutConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayoutsContainer.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayoutsContainer.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/GamePieceLayoutsContainer.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -47,8 +47,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItem.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItem.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItem.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -83,10 +83,10 @@
return c;
}
- public Class[] getAttributeTypes() {
- final Class a[] = new Class[] { Image.class, TextSource.class };
- final Class b[] = super.getAttributeTypes();
- final Class c[] = new Class[a.length + b.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?> a[] = new Class<?>[] { Image.class, TextSource.class };
+ final Class<?> b[] = super.getAttributeTypes();
+ final Class<?> c[] = new Class<?>[a.length + b.length];
System.arraycopy(b, 0, c, 0, 2);
System.arraycopy(a, 0, c, 2, a.length);
System.arraycopy(b, 2, c, a.length+2, b.length-2);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ImageItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -74,8 +74,8 @@
return new String[] { "Image: " };
}
- public Class[] getAttributeTypes() {
- return new Class[] { Image.class, };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] { Image.class, };
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/Item.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/Item.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/Item.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -71,14 +71,27 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Name: ", "Location: ", "Advanced Options",
- "X Offset: ", "Y Offset: ", "Rotation (Degrees): ", "Anti-alias?"};
-
+ return new String[] {
+ "Name: ",
+ "Location: ",
+ "Advanced Options",
+ "X Offset: ",
+ "Y Offset: ",
+ "Rotation (Degrees): ",
+ "Anti-alias?"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { String.class, LocationConfig.class, Boolean.class,
- Integer.class, Integer.class, Integer.class, Boolean.class };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ LocationConfig.class,
+ Boolean.class,
+ Integer.class,
+ Integer.class,
+ Integer.class,
+ Boolean.class
+ };
}
public static class IconConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -148,8 +148,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItem.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItem.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItem.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -73,10 +73,15 @@
return c;
}
- public Class[] getAttributeTypes() {
- Class a[] = new Class[] { Integer.class, Integer.class, ShapeConfig.class, Integer.class };
- Class b[] = super.getAttributeTypes();
- Class c[] = new Class[a.length + b.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?> a[] = new Class<?>[] {
+ Integer.class,
+ Integer.class,
+ ShapeConfig.class,
+ Integer.class
+ };
+ final Class<?> b[] = super.getAttributeTypes();
+ final Class<?> c[] = new Class<?>[a.length + b.length];
System.arraycopy(b, 0, c, 0, 2);
System.arraycopy(a, 0, c, 2, a.length);
System.arraycopy(b, 2, c, a.length+2, b.length-2);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/ShapeItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -74,15 +74,24 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Foreground Color: ", "Border Color: " };
+ return new String[] {
+ "Foreground Color: ",
+ "Border Color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { FgColorSwatchConfig.class, BorderColorSwatchConfig.class, };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ FgColorSwatchConfig.class,
+ BorderColorSwatchConfig.class
+ };
}
public String[] getAttributeNames() {
- return new String[] { FG_COLOR, BORDER_COLOR };
+ return new String[] {
+ FG_COLOR,
+ BORDER_COLOR
+ };
}
public void setAttribute(String key, Object o) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItem.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItem.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItem.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -69,10 +69,15 @@
return c;
}
- public Class[] getAttributeTypes() {
- Class a[] = new Class[] { SetConfig.class, Integer.class, Integer.class, Double.class };
- Class b[] = super.getAttributeTypes();
- Class c[] = new Class[a.length + b.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?> a[] = new Class<?>[] {
+ SetConfig.class,
+ Integer.class,
+ Integer.class,
+ Double.class
+ };
+ final Class<?> b[] = super.getAttributeTypes();
+ final Class<?> c[] = new Class<?>[a.length + b.length];
System.arraycopy(b, 0, c, 0, 2);
System.arraycopy(a, 0, c, 2, a.length);
System.arraycopy(b, 2, c, a.length+2, b.length-2);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/SymbolItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -112,15 +112,36 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Unit Size: ", "1st Symbol: ", "2nd Symbol: ", "Symbol Color: ", "Background Color: ", "Size Color: " };
+ return new String[] {
+ "Unit Size: ",
+ "1st Symbol: ",
+ "2nd Symbol: ",
+ "Symbol Color: ",
+ "Background Color: ",
+ "Size Color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { SizeConfig.class, Symbol1Config.class, Symbol2Config.class, FgColorSwatchConfig.class, BgColorSwatchConfig.class, SizeColorSwatchConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ SizeConfig.class,
+ Symbol1Config.class,
+ Symbol2Config.class,
+ FgColorSwatchConfig.class,
+ BgColorSwatchConfig.class,
+ SizeColorSwatchConfig.class
+ };
}
public String[] getAttributeNames() {
- return new String[] { SIZE, SYMBOL1, SYMBOL2, FG_COLOR, BG_COLOR, SIZE_COLOR };
+ return new String[] {
+ SIZE,
+ SYMBOL1,
+ SYMBOL2,
+ FG_COLOR,
+ BG_COLOR,
+ SIZE_COLOR
+ };
}
public void setAttribute(String key, Object value) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItem.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItem.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItem.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -68,10 +68,14 @@
return c;
}
- public Class[] getAttributeTypes() {
- Class a[] = new Class[] { Integer.class, Integer.class, Boolean.class };
- Class b[] = super.getAttributeTypes();
- Class c[] = new Class[a.length + b.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?> a[] = new Class<?>[] {
+ Integer.class,
+ Integer.class,
+ Boolean.class
+ };
+ final Class<?> b[] = super.getAttributeTypes();
+ final Class<?> c[] = new Class<?>[a.length + b.length];
System.arraycopy(b, 0, c, 0, 2);
System.arraycopy(a, 0, c, 2, a.length);
System.arraycopy(b, 2, c, a.length+2, b.length-2);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextBoxItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -81,11 +81,19 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Value: ","Text Color: ", "Background Color: "};
+ return new String[] {
+ "Value: ",
+ "Text Color: ",
+ "Background Color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { WrappingTextConfigurer.class, FgColorSwatchConfig.class, BgColorSwatchConfig.class, };
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ WrappingTextConfigurer.class,
+ FgColorSwatchConfig.class,
+ BgColorSwatchConfig.class
+ };
}
public static class WrappingTextConfigurer implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItem.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItem.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItem.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -96,10 +96,14 @@
return c;
}
- public Class[] getAttributeTypes() {
- Class a[] = new Class[] { FontStyleConfig.class, TextSource.class, String.class };
- Class b[] = super.getAttributeTypes();
- Class c[] = new Class[a.length + b.length];
+ public Class<?>[] getAttributeTypes() {
+ final Class<?> a[] = new Class<?>[] {
+ FontStyleConfig.class,
+ TextSource.class,
+ String.class
+ };
+ final Class<?> b[] = super.getAttributeTypes();
+ final Class<?> c[] = new Class<?>[a.length + b.length];
System.arraycopy(b, 0, c, 0, 2);
System.arraycopy(a, 0, c, 2, a.length);
System.arraycopy(b, 2, c, a.length + 2, b.length - 2);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItemInstance.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItemInstance.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/gamepieceimage/TextItemInstance.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -109,15 +109,30 @@
}
public String[] getAttributeDescriptions() {
- return new String[] { "Value: ", "Foreground Color: ", "Background Color: ", "Outline Color: " };
+ return new String[] {
+ "Value: ",
+ "Foreground Color: ",
+ "Background Color: ",
+ "Outline Color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] { String.class, FgColorSwatchConfig.class, BgColorSwatchConfig.class, OutlineColorSwatchConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ FgColorSwatchConfig.class,
+ BgColorSwatchConfig.class,
+ OutlineColorSwatchConfig.class
+ };
}
public String[] getAttributeNames() {
- return new String[] { VALUE, FG_COLOR, BG_COLOR, OUTLINE_COLOR };
+ return new String[] {
+ VALUE,
+ FG_COLOR,
+ BG_COLOR,
+ OUTLINE_COLOR
+ };
}
public void setAttribute(String key, Object o) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/CounterDetailViewer.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/CounterDetailViewer.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/CounterDetailViewer.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -723,45 +723,92 @@
}
public String[] getAttributeNames() {
- return new String[] {VERSION, DELAY, HOTKEY,
-
- BG_COLOR, FG_COLOR,
-
- MINIMUM_DISPLAYABLE, ZOOM_LEVEL, DRAW_PIECES, DRAW_PIECES_AT_ZOOM, GRAPH_SINGLE_DEPRECATED, BORDER_WIDTH,
-
- SHOW_TEXT, SHOW_TEXT_SINGLE_DEPRECATED, FONT_SIZE, SUMMARY_REPORT_FORMAT, COUNTER_REPORT_FORMAT, EMPTY_HEX_REPORT_FORMAT,
-
- DISPLAY, LAYER_LIST, PROPERTY_FILTER,SHOW_NOSTACK, SHOW_MOVE_SELECTED, SHOW_NON_MOVABLE, UNROTATE_PIECES, SHOW_DECK};
+ return new String[] {
+ VERSION,
+ DELAY,
+ HOTKEY,
+ BG_COLOR,
+ FG_COLOR,
+ MINIMUM_DISPLAYABLE,
+ ZOOM_LEVEL,
+ DRAW_PIECES,
+ DRAW_PIECES_AT_ZOOM,
+ GRAPH_SINGLE_DEPRECATED,
+ BORDER_WIDTH,
+ SHOW_TEXT,
+ SHOW_TEXT_SINGLE_DEPRECATED,
+ FONT_SIZE,
+ SUMMARY_REPORT_FORMAT,
+ COUNTER_REPORT_FORMAT,
+ EMPTY_HEX_REPORT_FORMAT,
+ DISPLAY,
+ LAYER_LIST,
+ PROPERTY_FILTER,SHOW_NOSTACK,
+ SHOW_MOVE_SELECTED,
+ SHOW_NON_MOVABLE,
+ UNROTATE_PIECES,
+ SHOW_DECK
+ };
}
public String[] getAttributeDescriptions() {
- return new String[] {"Version", // Not displayed
- "Recommended Delay before display (ms): ", "Keyboard shortcut to display: ",
-
- "Background color: ","Border/text color: ",
-
- "Display when at least this many pieces will be included: ", "Always display when zoom level less than: ","Draw pieces?", "Draw pieces using zoom factor: ","Display unit graphics for single counter?", // Obsolete
- "Width of gap between pieces: ",
-
- "Display text?", "Display text report for single counter?",// Obsolete
- "Font size: ", "Summary text above pieces: ", "Text below each piece: ","Text for empty location: ",
-
- "Include individual pieces: ", "Listed layers",
- "Piece selection property filter: ","Include non-stacking pieces?", "Include move-when-selected pieces?", "Include non-movable pieces?",
- "Show pieces in un-rotated state?", "Include top piece in Deck?"};
-
+ return new String[] {
+ "Version", // Not displayed
+ "Recommended Delay before display (ms): ",
+ "Keyboard shortcut to display: ",
+ "Background color: ",
+ "Border/text color: ",
+ "Display when at least this many pieces will be included: ",
+ "Always display when zoom level less than: ",
+ "Draw pieces?",
+ "Draw pieces using zoom factor: ",
+ "Display unit graphics for single counter?", // Obsolete
+ "Width of gap between pieces: ",
+ "Display text?",
+ "Display text report for single counter?",// Obsolete
+ "Font size: ",
+ "Summary text above pieces: ",
+ "Text below each piece: ",
+ "Text for empty location: ",
+ "Include individual pieces: ",
+ "Listed layers",
+ "Piece selection property filter: ",
+ "Include non-stacking pieces?",
+ "Include move-when-selected pieces?",
+ "Include non-movable pieces?",
+ "Show pieces in un-rotated state?",
+ "Include top piece in Deck?"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] {String.class, Integer.class, KeyStroke.class,
-
- Color.class, Color.class,
-
- MinConfig.class, Double.class, Boolean.class, Double.class, Boolean.class, Integer.class,
-
- Boolean.class, Boolean.class, Integer.class, ReportFormatConfig.class, CounterFormatConfig.class,EmptyFormatConfig.class,
-
- DisplayConfig.class, String[].class, PropertyExpression.class,Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ Integer.class,
+ KeyStroke.class,
+ Color.class,
+ Color.class,
+ MinConfig.class,
+ Double.class,
+ Boolean.class,
+ Double.class,
+ Boolean.class,
+ Integer.class,
+ Boolean.class,
+ Boolean.class,
+ Integer.class,
+ ReportFormatConfig.class,
+ CounterFormatConfig.class,
+ EmptyFormatConfig.class,
+ DisplayConfig.class,
+ String[].class,
+ PropertyExpression.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class
+ };
}
public static class DisplayConfig extends StringEnum {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DeckGlobalKeyCommand.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DeckGlobalKeyCommand.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DeckGlobalKeyCommand.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -121,18 +121,34 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Menu Command: ", "Global Command: ", "Matching properties: ", "Affects: ",
- "Report Format: "};
+ return new String[]{
+ "Menu Command: ",
+ "Global Command: ",
+ "Matching properties: ",
+ "Affects: ",
+ "Report Format: "
+ };
}
public String[] getAttributeNames() {
- return new String[]{NAME, KEY_COMMAND, PROPERTIES_FILTER, DECK_COUNT, REPORT_FORMAT };
+ return new String[]{
+ NAME,
+ KEY_COMMAND,
+ PROPERTIES_FILTER,
+ DECK_COUNT,
+ REPORT_FORMAT
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, KeyStroke.class, PropertyExpression.class, DeckPolicyConfig2.class,
- ReportFormatConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ KeyStroke.class,
+ PropertyExpression.class,
+ DeckPolicyConfig2.class,
+ ReportFormatConfig.class
+ };
}
public static class DeckPolicyConfig2 extends DeckPolicyConfig {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DrawPile.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DrawPile.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/DrawPile.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -204,79 +204,111 @@
}
public String[] getAttributeNames() {
- return new String[]{NAME, OWNING_BOARD, X_POSITION, Y_POSITION, WIDTH, HEIGHT, ALLOW_MULTIPLE,
- ALLOW_SELECT, SELECT_DISPLAY_PROPERTY, SELECT_SORT_PROPERTY, FACE_DOWN, DRAW_FACE_UP, FACE_DOWN_REPORT_FORMAT, SHUFFLE, SHUFFLE_REPORT_FORMAT,
- SHUFFLE_HOTKEY, REVERSIBLE, REVERSE_REPORT_FORMAT, DRAW, COLOR, HOTKEY_ON_EMPTY, EMPTY_HOTKEY,
- RESHUFFLABLE, RESHUFFLE_COMMAND, RESHUFFLE_MESSAGE, RESHUFFLE_HOTKEY, RESHUFFLE_TARGET,CAN_SAVE,
- MAXSTACK,EXPRESSIONCOUNTING,COUNTEXPRESSIONS};
+ return new String[]{
+ NAME,
+ OWNING_BOARD,
+ X_POSITION,
+ Y_POSITION,
+ WIDTH,
+ HEIGHT,
+ ALLOW_MULTIPLE,
+ ALLOW_SELECT,
+ SELECT_DISPLAY_PROPERTY,
+ SELECT_SORT_PROPERTY,
+ FACE_DOWN,
+ DRAW_FACE_UP,
+ FACE_DOWN_REPORT_FORMAT,
+ SHUFFLE,
+ SHUFFLE_REPORT_FORMAT,
+ SHUFFLE_HOTKEY,
+ REVERSIBLE,
+ REVERSE_REPORT_FORMAT,
+ DRAW,
+ COLOR,
+ HOTKEY_ON_EMPTY,
+ EMPTY_HOTKEY,
+ RESHUFFLABLE,
+ RESHUFFLE_COMMAND,
+ RESHUFFLE_MESSAGE,
+ RESHUFFLE_HOTKEY,
+ RESHUFFLE_TARGET,
+ CAN_SAVE,
+ MAXSTACK,
+ EXPRESSIONCOUNTING,
+ COUNTEXPRESSIONS
+ };
}
public String[] getAttributeDescriptions() {
- return new String[]{"Name: ",
- "Belongs to board: ",
- "X position: ",
- "Y position: ",
- "Width: ",
- "Height: ",
- "Allow Multiple Cards to be Drawn?",
- "Allow Specific Cards to be Drawn?",
- "When selecting, list cards using",
- "When selecting, sort cards by",
- "Contents are Face-down: ",
- "Draw new cards face up?",
- "Face-down Report Format: ",
- "Re-shuffle: ",
- "Re-shuffle Report Format: ",
- "Re-shuffle Hot Key: ",
- "Reversible?",
- "Reverse Report Format: ",
- "Draw Outline when empty?",
- "Color: ",
- "Send Hotkey when empty?",
- "Hot Key to send when Deck empties: ",
- "Include command to send entire deck to another deck?",
- "Send Menu text: ",
- "Send Report Format: ",
- "Send Hot Key: ",
- "Name of deck to send to: ",
- "Can be saved-to/loaded-from a file?",
- "Maximum Cards to display in Stack:",
- "Perform counting of property expressions?",
- "Expressions to count:"};
+ return new String[]{
+ "Name: ",
+ "Belongs to board: ",
+ "X position: ",
+ "Y position: ",
+ "Width: ",
+ "Height: ",
+ "Allow Multiple Cards to be Drawn?",
+ "Allow Specific Cards to be Drawn?",
+ "When selecting, list cards using",
+ "When selecting, sort cards by",
+ "Contents are Face-down: ",
+ "Draw new cards face up?",
+ "Face-down Report Format: ",
+ "Re-shuffle: ",
+ "Re-shuffle Report Format: ",
+ "Re-shuffle Hot Key: ",
+ "Reversible?",
+ "Reverse Report Format: ",
+ "Draw Outline when empty?",
+ "Color: ",
+ "Send Hotkey when empty?",
+ "Hot Key to send when Deck empties: ",
+ "Include command to send entire deck to another deck?",
+ "Send Menu text: ",
+ "Send Report Format: ",
+ "Send Hot Key: ",
+ "Name of deck to send to: ",
+ "Can be saved-to/loaded-from a file?",
+ "Maximum Cards to display in Stack:",
+ "Perform counting of property expressions?",
+ "Expressions to count:"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,
- OwningBoardPrompt.class,
- Integer.class,
- Integer.class,
- Integer.class,
- Integer.class,
- Boolean.class,
- Boolean.class,
- PiecePropertyConfig.class,
- String.class,
- Prompt.class,
- Boolean.class,
- FormattedStringConfig.class,
- Prompt.class,
- FormattedStringConfig.class,
- KeyStroke.class,
- Boolean.class,
- FormattedStringConfig.class,
- Boolean.class,
- Color.class,
- Boolean.class,
- KeyStroke.class,
- Boolean.class,
- String.class,
- FormattedStringConfig.class,
- KeyStroke.class,
- AssignedDeckPrompt.class,
- Boolean.class,
- Integer.class,
- Boolean.class,
- String[].class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ OwningBoardPrompt.class,
+ Integer.class,
+ Integer.class,
+ Integer.class,
+ Integer.class,
+ Boolean.class,
+ Boolean.class,
+ PiecePropertyConfig.class,
+ String.class,
+ Prompt.class,
+ Boolean.class,
+ FormattedStringConfig.class,
+ Prompt.class,
+ FormattedStringConfig.class,
+ KeyStroke.class,
+ Boolean.class,
+ FormattedStringConfig.class,
+ Boolean.class,
+ Color.class,
+ Boolean.class,
+ KeyStroke.class,
+ Boolean.class,
+ String.class,
+ FormattedStringConfig.class,
+ KeyStroke.class,
+ AssignedDeckPrompt.class,
+ Boolean.class,
+ Integer.class,
+ Boolean.class,
+ String[].class
+ };
}
public static class FormattedStringConfig implements TranslatableConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/GlobalMap.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/GlobalMap.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/GlobalMap.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -214,8 +214,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[] {
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
String.class,
String.class,
IconConfig.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HidePiecesButton.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HidePiecesButton.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HidePiecesButton.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -155,11 +155,23 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Button Text: ", "Tooltip text: ", "Hotkey: ", "Icon when pieces are showing: ", "Icon when pieces are hidden: "};
+ return new String[]{
+ "Button Text: ",
+ "Tooltip text: ",
+ "Hotkey: ",
+ "Icon when pieces are showing: ",
+ "Icon when pieces are hidden: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, String.class, KeyStroke.class, ShowingIconConfig.class, HiddenIconConfig.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String.class,
+ KeyStroke.class,
+ ShowingIconConfig.class,
+ HiddenIconConfig.class
+ };
}
public static class ShowingIconConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HighlightLastMoved.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HighlightLastMoved.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/HighlightLastMoved.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -55,15 +55,27 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Enabled?", "Color: ", "Thickness: "};
+ return new String[]{
+ "Enabled?",
+ "Color: ",
+ "Thickness: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{Boolean.class, Color.class, Integer.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ Boolean.class,
+ Color.class,
+ Integer.class
+ };
}
public String[] getAttributeNames() {
- return new String[]{ENABLED, COLOR, THICKNESS};
+ return new String[]{
+ ENABLED,
+ COLOR,
+ THICKNESS
+ };
}
public void setAttribute(String key, Object value) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/ImageSaver.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/ImageSaver.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/ImageSaver.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -118,8 +118,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[] {
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
String.class,
String.class,
IconConfig.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LOS_Thread.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LOS_Thread.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LOS_Thread.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -724,41 +724,45 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Button text: ",
- "Tooltip text: ",
- "Button Icon: ",
- "Hotkey: ",
- "Report Format: ",
- "Persistence: ",
- "Button Icon when LOS persisting: ",
- "Visible to Opponent: ",
- "Force start of thread to snap to grid?",
- "Force end of thread to snap to grid?",
- "Draw Range?",
- "Pixels per range unit (0 to use Grid calculation): ",
- "Round fractions: ",
- "Hide Pieces while drawing?",
- "Opacity of hidden pieces (0-100%): ",
- "Thread color: "};
+ return new String[]{
+ "Button text: ",
+ "Tooltip text: ",
+ "Button Icon: ",
+ "Hotkey: ",
+ "Report Format: ",
+ "Persistence: ",
+ "Button Icon when LOS persisting: ",
+ "Visible to Opponent: ",
+ "Force start of thread to snap to grid?",
+ "Force end of thread to snap to grid?",
+ "Draw Range?",
+ "Pixels per range unit (0 to use Grid calculation): ",
+ "Round fractions: ",
+ "Hide Pieces while drawing?",
+ "Opacity of hidden pieces (0-100%): ",
+ "Thread color: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,
- String.class,
- IconConfig.class,
- KeyStroke.class,
- ReportFormatConfig.class,
- PersistenceOptions.class,
- IconConfig.class,
- GlobalOptions.class,
- Boolean.class,
- Boolean.class,
- Boolean.class,
- Integer.class,
- RoundingOptions.class,
- Boolean.class,
- Integer.class,
- Color.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ ReportFormatConfig.class,
+ PersistenceOptions.class,
+ IconConfig.class,
+ GlobalOptions.class,
+ Boolean.class,
+ Boolean.class,
+ Boolean.class,
+ Integer.class,
+ RoundingOptions.class,
+ Boolean.class,
+ Integer.class,
+ Color.class
+ };
}
public static class IconConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayerControl.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayerControl.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayerControl.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -108,11 +108,27 @@
}
public String[] getAttributeDescriptions() {
- return new String[] {"Button text: ", "Tooltip text: ", "Button Icon: ", "Hotkey: ", "Action: ", "Skip layers with no counters?", "Affect which layers? (Use layer names or numbers)"};
+ return new String[] {
+ "Button text: ",
+ "Tooltip text: ",
+ "Button Icon: ",
+ "Hotkey: ",
+ "Action: ",
+ "Skip layers with no counters?",
+ "Affect which layers? (Use layer names or numbers)"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[] {String.class, String.class, Icon.class, KeyStroke.class, CommandConfig.class, Boolean.class, String[].class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
+ String.class,
+ String.class,
+ Icon.class,
+ KeyStroke.class,
+ CommandConfig.class,
+ Boolean.class,
+ String[].class
+ };
}
public static class CommandConfig extends StringEnum {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayeredPieceCollection.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayeredPieceCollection.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/LayeredPieceCollection.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -48,15 +48,24 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Property name for layer: ","Layer Order"};
+ return new String[]{
+ "Property name for layer: ",
+ "Layer Order"
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,String[].class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String[].class
+ };
}
public String[] getAttributeNames() {
- return new String[]{PROPERTY_NAME,LAYER_ORDER};
+ return new String[]{
+ PROPERTY_NAME,
+ LAYER_ORDER
+ };
}
public String getAttributeValueString(String key) {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MapShader.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MapShader.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MapShader.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -491,8 +491,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[]{
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
String.class,
Boolean.class,
Boolean.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MassKeyCommand.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MassKeyCommand.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/MassKeyCommand.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -136,37 +136,95 @@
public String[] getAttributeDescriptions() {
if (condition == null) {
- return new String[]{"Description: ", "Key Command: ", "Matching properties: ", "Apply to contents of Decks: ", "Button text: ", "Tooltip text: ", "Button Icon: ",
- "Hotkey: ", "Suppress individual reports?", "Report Format: "};
+ return new String[]{
+ "Description: ",
+ "Key Command: ",
+ "Matching properties: ",
+ "Apply to contents of Decks: ",
+ "Button text: ",
+ "Tooltip text: ",
+ "Button Icon: ",
+ "Hotkey: ",
+ "Suppress individual reports?",
+ "Report Format: "
+ };
}
else {
// Backward compatibility
- return new String[]{"Description: ", "Key Command: ", "Matching properties: ", "Apply to contents of Decks: ", "Button text: ", "Tooltip text: ", "Button Icon: ",
- "Hotkey: ", "Suppress individual reports?", "Report Format: ", "Apply Command: "};
+ return new String[]{
+ "Description: ",
+ "Key Command: ",
+ "Matching properties: ",
+ "Apply to contents of Decks: ",
+ "Button text: ",
+ "Tooltip text: ",
+ "Button Icon: ",
+ "Hotkey: ",
+ "Suppress individual reports?",
+ "Report Format: ",
+ "Apply Command: "
+ };
}
}
public String[] getAttributeNames() {
- return new String[]{NAME, KEY_COMMAND, PROPERTIES_FILTER, DECK_COUNT, BUTTON_TEXT, TOOLTIP, ICON, HOTKEY, REPORT_SINGLE, REPORT_FORMAT, CONDITION,
- CHECK_VALUE, CHECK_PROPERTY, AFFECTED_PIECE_NAMES};
+ return new String[]{
+ NAME,
+ KEY_COMMAND,
+ PROPERTIES_FILTER,
+ DECK_COUNT,
+ BUTTON_TEXT,
+ TOOLTIP,
+ ICON,
+ HOTKEY,
+ REPORT_SINGLE,
+ REPORT_FORMAT,
+ CONDITION,
+ CHECK_VALUE,
+ CHECK_PROPERTY,
+ AFFECTED_PIECE_NAMES
+ };
}
+
public static class Prompt extends StringEnum {
public String[] getValidValues(AutoConfigurable target) {
return new String[]{ALWAYS, IF_ACTIVE, IF_INACTIVE};
}
}
- public Class[] getAttributeTypes() {
+ public Class<?>[] getAttributeTypes() {
if (condition == null) {
- return new Class[]{String.class, KeyStroke.class, PropertyExpression.class, DeckPolicyConfig.class, String.class, String.class, IconConfig.class, KeyStroke.class,
- Boolean.class, ReportFormatConfig.class};
+ return new Class<?>[]{
+ String.class,
+ KeyStroke.class,
+ PropertyExpression.class,
+ DeckPolicyConfig.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ Boolean.class,
+ ReportFormatConfig.class
+ };
}
else {
// Backward compatibility
- return new Class[]{String.class, KeyStroke.class, String.class, DeckPolicyConfig.class, String.class, String.class, IconConfig.class, KeyStroke.class,
- Boolean.class, ReportFormatConfig.class, Prompt.class};
+ return new Class<?>[]{
+ String.class,
+ KeyStroke.class,
+ String.class,
+ DeckPolicyConfig.class,
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class,
+ Boolean.class,
+ ReportFormatConfig.class,
+ Prompt.class
+ };
}
}
+
public static class IconConfig implements ConfigurerFactory {
public Configurer getConfigurer(AutoConfigurable c, String key, String name) {
return new IconConfigurer(key, name, "/images/keyCommand.gif");
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/PieceRecenterer.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/PieceRecenterer.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/PieceRecenterer.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -124,15 +124,29 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Button text: ","Tooltip text: ","Button icon: ","Hotkey: "};
+ return new String[]{
+ "Button text: ",
+ "Tooltip text: ",
+ "Button icon: ",
+ "Hotkey: "
+ };
}
public String[] getAttributeNames() {
- return new String[]{BUTTON_TEXT,TOOLTIP,ICON,HOTKEY};
+ return new String[]{
+ BUTTON_TEXT,
+ TOOLTIP,
+ ICON,HOTKEY
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class,String.class,IconConfig.class,KeyStroke.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ String.class,
+ IconConfig.class,
+ KeyStroke.class
+ };
}
public static class IconConfig implements ConfigurerFactory {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighter.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighter.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighter.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -170,8 +170,8 @@
};
}
- public Class[] getAttributeTypes() {
- return new Class[] {
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[] {
String.class,
PropertyExpression.class,
Boolean.class,
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighters.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighters.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SelectionHighlighters.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -25,8 +25,8 @@
return new String[0];
}
- public Class[] getAttributeTypes() {
- return new Class[0];
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[0];
}
public String[] getAttributeNames() {
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SetupStack.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SetupStack.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/SetupStack.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -244,15 +244,36 @@
}
public String[] getAttributeDescriptions() {
- return new String[]{"Name: ", "Belongs to Board: ", "Use Grid Location: ", "Location: ", "X position: ", "Y position: "};
+ return new String[]{
+ "Name: ",
+ "Belongs to Board: ",
+ "Use Grid Location: ",
+ "Location: ",
+ "X position: ",
+ "Y position: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{String.class, OwningBoardPrompt.class, Boolean.class, String.class, Integer.class, Integer.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ String.class,
+ OwningBoardPrompt.class,
+ Boolean.class,
+ String.class,
+ Integer.class,
+ Integer.class
+ };
}
public String[] getAttributeNames() {
- return new String[]{NAME, OWNING_BOARD, USE_GRID_LOCATION, LOCATION , X_POSITION, Y_POSITION};
+ return new String[]{
+ NAME,
+ OWNING_BOARD,
+ USE_GRID_LOCATION,
+ LOCATION,
+ X_POSITION,
+ Y_POSITION
+ };
}
public String getAttributeValueString(String key) {
@@ -441,10 +462,9 @@
l.addAll(Arrays.asList(m.getBoardPicker().getAllowableBoardNames()));
}
else {
- for (Iterator it = Map.getAllMaps(); it.hasNext();) {
- m = (Map) it.next();
+ for (Map m2 : Map.getMapList()) {
l.addAll(
- Arrays.asList(m.getBoardPicker().getAllowableBoardNames()));
+ Arrays.asList(m2.getBoardPicker().getAllowableBoardNames()));
}
}
values = l.toArray(new String[l.size()]);
Modified: VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/StackMetrics.java
===================================================================
--- VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/StackMetrics.java 2008-02-01 20:10:21 UTC (rev 2958)
+++ VASSAL-src/branches/uckelman-working/src/VASSAL/build/module/map/StackMetrics.java 2008-02-01 20:13:57 UTC (rev 2959)
@@ -492,27 +492,40 @@
}
public String[] getAttributeNames() {
- String[] s = {DISABLED, EXSEP_X, EXSEP_Y, UNEXSEP_X, UNEXSEP_Y,
- COLOR, TOP_KEY, BOTTOM_KEY, UP_KEY, DOWN_KEY};
- return s;
+ return new String[] {
+ DISABLED,
+ EXSEP_X,
+ EXSEP_Y,
+ UNEXSEP_X,
+ UNEXSEP_Y,
+ COLOR,
+ TOP_KEY,
+ BOTTOM_KEY,
+ UP_KEY,
+ DOWN_KEY
+ };
}
public String[] getAttributeDescriptions() {
- return new String[]{"Disable stacking?",
- "Horizontal separation when expanded: ",
- "Vertical separation when expanded: ",
- "Horizontal separation when not expanded: ",
- "Vertical separation when not expanded: ",
- "Color of pieces when not expanded: "};
+ return new String[]{
+ "Disable stacking?",
+ "Horizontal separation when expanded: ",
+ "Vertical separation when expanded: ",
+ "Horizontal separation when not expanded: ",
+ "Vertical separation when not expanded: ",
+ "Color of pieces when not expanded: "
+ };
}
- public Class[] getAttributeTypes() {
- return new Class[]{Boolean.class,
- Integer.class,
- Integer.class,
- Integer.class,
- Integer.class,
- Color.class};
+ public Class<?>[] getAttributeTypes() {
+ return new Class<?>[]{
+ Boolean.class,
+ Integer.class,
+ Integer.class,
+ Integer.class,
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|