Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[6970] trunk/src
|
From: <aki...@us...> - 2009-09-28 11:57:47
|
Revision: 6970
http://gridarta.svn.sourceforge.net/gridarta/?rev=6970&view=rev
Author: akirschbaum
Date: 2009-09-28 11:57:37 +0000 (Mon, 28 Sep 2009)
Log Message:
-----------
Weaken types.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeParser.java
trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java
trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java
trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/exitconnector/ExitConnectorActions.java
trunk/src/app/net/sf/gridarta/filter/BtnPopup.java
trunk/src/app/net/sf/gridarta/filter/NamedFilterList.java
trunk/src/app/net/sf/gridarta/filter/SimpleFilterConfig.java
trunk/src/app/net/sf/gridarta/gameobject/AnimationValidator.java
trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcherParser.java
trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchUtils.java
trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
trunk/src/app/net/sf/gridarta/gui/MainView.java
trunk/src/app/net/sf/gridarta/gui/MapPreview.java
trunk/src/app/net/sf/gridarta/gui/RecentManager.java
trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/gui/SplashScreen.java
trunk/src/app/net/sf/gridarta/gui/SystemIcons.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ScrollToVisibleFocusListener.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/MonstersTab.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java
trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java
trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModel.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapSquareSelection.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareModel.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/undo/SwingUtils.java
trunk/src/app/net/sf/gridarta/io/AbstractGameObjectParser.java
trunk/src/app/net/sf/gridarta/map/mapmodel/DefaultMapModel.java
trunk/src/app/net/sf/gridarta/map/validation/checks/BlockedSquareChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionWithoutSinksError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/ConnectionWithoutSourcesError.java
trunk/src/app/net/sf/gridarta/map/validation/checks/MobOutsideSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SlayingChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/SquareWithoutFloorChecker.java
trunk/src/app/net/sf/gridarta/map/validation/checks/UnsetSlayingChecker.java
trunk/src/app/net/sf/gridarta/script/Script.java
trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java
trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxUtilities.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Replace.java
trunk/src/app/net/sf/gridarta/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureLoader.java
trunk/src/app/net/sf/gridarta/treasurelist/TreasureTree.java
trunk/src/app/net/sf/gridarta/utils/ProcessRunner.java
trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeParser.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeParser.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -153,7 +153,7 @@
}
@NotNull
- private List<ArchetypeAttribute<G, A, R>> importName(@Nullable final String importName, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final String typeName, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final Set<String> autoIgnoreTable) {
+ private List<ArchetypeAttribute<G, A, R>> importName(@Nullable final String importName, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final String typeName, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final Collection<String> autoIgnoreTable) {
if (importName == null) {
return Collections.emptyList();
}
@@ -363,7 +363,7 @@
}
@NotNull
- private List<ArchetypeAttribute<G, A, R>> parseAttrList(@NotNull final Element root, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final String typeName, final int typeNo, @NotNull final SectionNames sectionNames, @NotNull final Set<String> autoIgnoreTable, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet) {
+ private List<ArchetypeAttribute<G, A, R>> parseAttrList(@NotNull final Element root, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final String typeName, final int typeNo, @NotNull final SectionNames sectionNames, @NotNull final Collection<String> autoIgnoreTable, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet) {
final List<ArchetypeAttribute<G, A, R>> attrList = new ArrayList<ArchetypeAttribute<G, A, R>>();
// now get all children and process them in order:
Modified: trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -143,7 +143,7 @@
* the first (misc) type if no match is found.
*/
@NotNull
- public ArchetypeType<G, A, R> getTypeOfArch(final G object) {
+ public ArchetypeType<G, A, R> getTypeOfArch(final GameObject<?, ?, ?> object) {
// check if the type of the object is present in the definitions
for (final ArchetypeType<G, A, R> tmp : archetypeTypeList) {
if (tmp.matches(object)) {
@@ -224,7 +224,7 @@
* no match was found
*/
@NotNull
- public ArchetypeType<G, A, R> getArchetypeType(@NotNull final R archetype) {
+ public ArchetypeType<G, A, R> getArchetypeType(@NotNull final Archetype<?, ?, ?> archetype) {
for (final ArchetypeType<G, A, R> archetypeType : archetypeTypeList) {
if (archetypeType.matches(archetype)) {
return archetypeType;
Modified: trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/archtype/CAttribBitmask.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,8 +23,8 @@
import java.awt.Container;
import java.awt.GridLayout;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import javax.swing.JCheckBox;
@@ -246,12 +246,12 @@
* @return the string representation of the value
*/
@NotNull
- public List<String> encodeValueAsList(final int value, @NotNull final Map<Integer, String> strings) {
- final List<String> result = new ArrayList<String>();
+ public Iterable<String> encodeValueAsList(final int value, @NotNull final Map<Integer, String> strings) {
+ final Collection<String> result = new ArrayList<String>();
final int moveAll = getMaxValue();
- final List<String> negResult = new ArrayList<String>();
+ final Collection<String> negResult = new ArrayList<String>();
negResult.add("all");
/* Quick check, and probably fairly common */
Modified: trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/data/NamedTreeNode.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -21,9 +21,9 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
import javax.swing.tree.TreeNode;
@@ -173,7 +173,7 @@
* nodes
*/
@Nullable
- public E getNamedObject() {
+ public NamedObject getNamedObject() {
return namedObject;
}
@@ -271,7 +271,7 @@
*/
@NotNull
public TreePath getPathFor(@NotNull final String path) {
- final List<NamedTreeNode<E>> nodes = new ArrayList<NamedTreeNode<E>>();
+ final Collection<NamedTreeNode<E>> nodes = new ArrayList<NamedTreeNode<E>>();
String currentPath = path;
// XXX This is ugly but it works, no time to think about it now.
String dirPart;
Modified: trunk/src/app/net/sf/gridarta/exitconnector/ExitConnectorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/exitconnector/ExitConnectorActions.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/exitconnector/ExitConnectorActions.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -277,7 +277,7 @@
* @param sourceExitLocation the source's exit location @return whether the action was or can be performed
* @return whether the action was or can be performed
*/
- private boolean doExitConnect(final boolean performAction, @Nullable final G targetExit, @Nullable final R targetArchetype, @NotNull final MapModel<G, A, R> targetMapModel, @NotNull final Point targetLocation, @NotNull final File targetMapFile, @NotNull final MapModel<G, A, R> sourceMapModel, @NotNull final ExitLocation sourceExitLocation) {
+ private boolean doExitConnect(final boolean performAction, @Nullable final GameObject<?, ?, ?> targetExit, @Nullable final R targetArchetype, @NotNull final MapModel<G, A, R> targetMapModel, @NotNull final Point targetLocation, @NotNull final File targetMapFile, @NotNull final MapModel<G, A, R> sourceMapModel, @NotNull final ExitLocation sourceExitLocation) {
final File sourceMapFile = sourceMapModel.getMapFile();
if (sourceMapFile == null) {
// source map is unsaved ==> cannot connect
Modified: trunk/src/app/net/sf/gridarta/filter/BtnPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/filter/BtnPopup.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/filter/BtnPopup.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -22,6 +22,7 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JButton;
+import javax.swing.JComponent;
import javax.swing.JMenu;
import javax.swing.JPopupMenu;
@@ -42,7 +43,7 @@
});
}
- public JButton getButton() {
+ public JComponent getButton() {
return button;
}
Modified: trunk/src/app/net/sf/gridarta/filter/NamedFilterList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/filter/NamedFilterList.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/filter/NamedFilterList.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -55,7 +55,7 @@
* Create a new NameFilterList.
* @param matchers the matchers to use
*/
- public NamedFilterList(@NotNull final Collection<NamedGameObjectMatcher> matchers) {
+ public NamedFilterList(@NotNull final Iterable<NamedGameObjectMatcher> matchers) {
subFilters = new LinkedHashMap<String, Filter>();
for (final NamedGameObjectMatcher matcher : matchers) { // FIXME: use localized name; FIXME: sort by name
subFilters.put(matcher.getName(), new NamedGameObjectMatcherFilter(matcher));
@@ -237,7 +237,7 @@
return result;
}
- public boolean canShow(final GameObject<?, ?, ?> gameObject, final NamedFilterConfig filterOutConfig) {
+ public boolean canShow(final GameObject<?, ?, ?> gameObject, final FilterConfig filterOutConfig) {
reset(filterOutConfig);
if (hasGlobalMatch(filterOutConfig)) {
match(filterOutConfig, gameObject);
@@ -254,7 +254,7 @@
private final NamedFilterConfig config;
- private final List<FilterComponent> components = new ArrayList<FilterComponent>();
+ private final Collection<FilterComponent> components = new ArrayList<FilterComponent>();
FilterMenuEntry(final NamedFilterConfig config) {
super("");
@@ -274,13 +274,13 @@
}
public JComponent getMenuBarComponent() {
- final JMenu menu = new JMenu(getName());
+ final JComponent menu = new JMenu(getName());
populateComponent(menu);
return menu;
}
public JComponent getMenuItemComponent() {
- final JMenu menu = new JMenu(getName());
+ final JComponent menu = new JMenu(getName());
populateComponent(menu);
return menu;
}
Modified: trunk/src/app/net/sf/gridarta/filter/SimpleFilterConfig.java
===================================================================
--- trunk/src/app/net/sf/gridarta/filter/SimpleFilterConfig.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/filter/SimpleFilterConfig.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -22,7 +22,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
/**
* Simple filter configuration.
@@ -46,7 +45,7 @@
return properties.get(name);
}
- public Set<String> getProperties() {
+ public Iterable<String> getProperties() {
return Collections.unmodifiableSet(properties.keySet());
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/AnimationValidator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/AnimationValidator.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/AnimationValidator.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -65,7 +65,7 @@
* Validates an {@link AnimationObjects} instance.
* @param animationObjects the animation objects instance to validate
*/
- public void validate(@NotNull final AnimationObjects animationObjects) {
+ public void validate(@NotNull final Iterable<AnimationObject> animationObjects) {
for (final AnimationObject animationObject : animationObjects) {
validateAnimation(animationObject);
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcherParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcherParser.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/GameObjectMatcherParser.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -134,7 +134,7 @@
* @throws ParsingException if a parsing error occurs
*/
@NotNull
- private static AndGameObjectMatcher createAndMatcher(@NotNull final Node el) throws ParsingException {
+ private static GameObjectMatcher createAndMatcher(@NotNull final Node el) throws ParsingException {
return new AndGameObjectMatcher(getChildMatchers(el));
}
@@ -145,7 +145,7 @@
* @throws ParsingException if a parsing error occurs
*/
@NotNull
- private static OrGameObjectMatcher createOrMatcher(@NotNull final Node el) throws ParsingException {
+ private static GameObjectMatcher createOrMatcher(@NotNull final Node el) throws ParsingException {
return new OrGameObjectMatcher(getChildMatchers(el));
}
@@ -177,7 +177,7 @@
* @return the created matcher
*/
@NotNull
- private static AttribGameObjectMatcher createAttribArchObjectMatcher(@NotNull final Element el) {
+ private static GameObjectMatcher createAttribArchObjectMatcher(@NotNull final Element el) {
return new AttribGameObjectMatcher(
el.getAttribute("name"),
Enum.valueOf(AttribGameObjectMatcher.Op.class, el.getAttribute("op")),
@@ -193,7 +193,7 @@
* @throws ParsingException if a parsing error occurs
*/
@NotNull
- private static TypeNrsGameObjectMatcher createTypeNrsArchObjectMatcher(@NotNull final Element el) throws ParsingException {
+ private static GameObjectMatcher createTypeNrsArchObjectMatcher(@NotNull final Element el) throws ParsingException {
final String numbers = el.getAttribute("numbers");
final String[] typeNrs = StringUtils.PATTERN_WHITESPACE.split(numbers, 0);
final int[] types = new int[typeNrs.length];
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/MutableOrGameObjectMatcher.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -21,7 +21,7 @@
import java.awt.event.ActionEvent;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
import javax.swing.AbstractAction;
import net.sf.gridarta.gameobject.GameObject;
import org.jetbrains.annotations.NotNull;
@@ -41,7 +41,7 @@
/** The {@link GameObjectMatcher}s to OR. */
@NotNull
- private final List<GameObjectMatcher> gameObjectMatchers = new ArrayList<GameObjectMatcher>();
+ private final Collection<GameObjectMatcher> gameObjectMatchers = new ArrayList<GameObjectMatcher>();
/**
* Creates a <code>MutableOrGameObjectMatcher</code>.
Modified: trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/match/OrGameObjectMatcher.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import net.sf.gridarta.gameobject.GameObject;
import org.jetbrains.annotations.NotNull;
@@ -36,7 +35,7 @@
/** List of {@link GameObjectMatcher} to Or. */
@NotNull
- private final List<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
+ private final Collection<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
/**
* Create an <code>OrGameObjectMatcher</code>.
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchUtils.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/AbstractScriptArchUtils.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -24,7 +24,6 @@
import java.util.List;
import java.util.Map;
import javax.swing.JComboBox;
-import net.sf.gridarta.archtype.ArchetypeTypeList;
import net.sf.gridarta.utils.Pair;
import net.sf.japi.util.Arrays2;
import org.jetbrains.annotations.NotNull;
@@ -50,7 +49,7 @@
* Creates a new instance.
* @param eventTypes the event types
*/
- protected AbstractScriptArchUtils(@NotNull final ArchetypeTypeList eventTypes) {
+ protected AbstractScriptArchUtils(@NotNull final Iterable<Pair<Integer, String>> eventTypes) {
for (final Pair<Integer, String> pair : eventTypes) {
final int eventType = pair.getFirst();
final String eventName = pair.getSecond();
Modified: trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gameobject/scripts/ScriptedEventEditor.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,9 +20,11 @@
package net.sf.gridarta.gameobject.scripts;
import java.awt.Component;
+import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.Frame;
import java.io.File;
+import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout;
@@ -116,16 +118,16 @@
mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
// input line: script path
- final JPanel line1 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JLabel text1 = new JLabel("Script:");
+ final Container line1 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ final Component text1 = new JLabel("Script:");
line1.add(text1);
inputScriptPath = new JTextField(scriptedEvent.getScriptPath(), 20);
line1.add(inputScriptPath);
mainPanel.add(line1);
// input line: plugin options
- final JPanel line2 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JLabel text2 = new JLabel("Script options:");
+ final Container line2 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ final Component text2 = new JLabel("Script options:");
line2.add(text2);
inputOptions = new JTextField(scriptedEvent.getOptions(), 20);
line2.add(inputOptions);
@@ -133,8 +135,8 @@
mainPanel.add(Box.createVerticalStrut(5));
// input line: plugin name
- final JPanel line3 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JLabel text3 = new JLabel("Plugin name:");
+ final Container line3 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ final Component text3 = new JLabel("Plugin name:");
line3.add(text3);
inputPluginName = new JTextField(scriptedEvent.getPluginName(), 20);
line3.add(inputPluginName);
@@ -142,14 +144,14 @@
mainPanel.add(Box.createVerticalStrut(5));
// button panel:
- final JPanel line4 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- final JButton okButton = new JButton("OK");
+ final Container line4 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ final AbstractButton okButton = new JButton("OK");
okListener = new PathButtonListener(true, pathFrame, null, null);
okListener.setTargetEvent(scriptedEvent);
okButton.addActionListener(okListener);
line4.add(okButton);
- final JButton cancelButton = new JButton("Cancel");
+ final AbstractButton cancelButton = new JButton("Cancel");
cancelListener = new PathButtonListener(false, pathFrame, null, null);
cancelListener.setTargetEvent(scriptedEvent);
cancelButton.addActionListener(cancelListener);
Modified: trunk/src/app/net/sf/gridarta/gui/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MainView.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/MainView.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -215,7 +215,7 @@
* @param leftPanel the left panel
*/
private Component createCenterPanel(final boolean mapSquareListBottom, @NotNull final Component leftPanel) {
- final JPanel centerPanel = new JPanel(new BorderLayout());
+ final Container centerPanel = new JPanel(new BorderLayout());
recreatePanes(mapSquareListBottom);
splitPane = new GSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, splitDownPane, DIVIDER_LOCATION_KEY, (int) (getDefaultWidth() * 0.17));
Modified: trunk/src/app/net/sf/gridarta/gui/MapPreview.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/MapPreview.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/MapPreview.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Image;
@@ -93,7 +94,7 @@
// frame.setIconImage(icon.getImage());
//}
frame.setJMenuBar(ACTION_BUILDER.createMenuBar(false, "zoomBar", this));
- final JScrollPane scroll = new JScrollPane(this);
+ final Component scroll = new JScrollPane(this);
scroll.setFocusable(true);
frame.add(scroll);
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
Modified: trunk/src/app/net/sf/gridarta/gui/RecentManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/RecentManager.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/RecentManager.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.IOException;
import java.util.LinkedList;
-import java.util.List;
import java.util.ListIterator;
import java.util.prefs.Preferences;
import javax.swing.AbstractAction;
@@ -168,7 +167,7 @@
* Update the recent menu.
* @param recents current recents
*/
- private void updateRecent(final List<Recent<G, A, R>> recents) {
+ private void updateRecent(final Iterable<Recent<G, A, R>> recents) {
if (recentMenu == null) {
return;
}
Modified: trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/ShiftProcessor.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -21,6 +21,7 @@
import java.awt.Point;
import java.awt.Rectangle;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import net.sf.gridarta.gameobject.Archetype;
@@ -240,7 +241,7 @@
* @param len The length of the row in squares.
*/
private void shift(final Point pos, final int len) {
- final List<G> startGameObjects = new LinkedList<G>();
+ final Collection<G> startGameObjects = new LinkedList<G>();
final List<G> gameObjectsToDelete = new LinkedList<G>();
final Point prevPos = new Point(pos.x + dx, pos.y + dy);
final Point startPos = new Point();
Modified: trunk/src/app/net/sf/gridarta/gui/SplashScreen.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/SplashScreen.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/SplashScreen.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -22,6 +22,7 @@
import java.awt.BorderLayout;
import java.awt.Color;
import javax.swing.ImageIcon;
+import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.SwingConstants;
@@ -57,7 +58,7 @@
} catch (final NullPointerException e) {
/* Just ignore this because it's nothing serious that the image is unavailable. */
}
- final JLabel loading = new JLabel("Loading, hold on...", SwingConstants.CENTER);
+ final JComponent loading = new JLabel("Loading, hold on...", SwingConstants.CENTER);
loading.setOpaque(true);
loading.setBackground(Color.BLACK);
loading.setForeground(Color.WHITE);
Modified: trunk/src/app/net/sf/gridarta/gui/SystemIcons.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/SystemIcons.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/SystemIcons.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -94,7 +94,7 @@
final ImageIcon sysIcon = GUIUtils.getSysIcon(GUIConstants.SQUARE_WARNING);
final Image image = sysIcon.getImage();
final ImageProducer source = image.getSource();
- final FilteredImageSource producer = new FilteredImageSource(source, alphaFilter);
+ final ImageProducer producer = new FilteredImageSource(source, alphaFilter);
final Image image2 = Toolkit.getDefaultToolkit().createImage(producer);
return new ImageIcon(image2);
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,6 +23,7 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.List;
+import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import net.sf.gridarta.gameobject.Archetype;
@@ -72,7 +73,7 @@
* @return the view for this controller
*/
@NotNull
- public View<K, G, A, R> getView() {
+ public JPanel getView() {
return view;
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/View.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -158,7 +158,7 @@
* Scans the given map for the contained connections.
* @param mapModel the map model to process
*/
- private void scanMapForConnections(@NotNull final MapModel<G, A, R> mapModel) {
+ private void scanMapForConnections(@NotNull final Iterable<MapSquare<G, A, R>> mapModel) {
for (final MapSquare<G, A, R> mapSquare : mapModel) {
for (final G gameObject : mapSquare) {
scanGameObjectForConnections(gameObject);
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ScrollToVisibleFocusListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ScrollToVisibleFocusListener.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ScrollToVisibleFocusListener.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -19,19 +19,19 @@
package net.sf.gridarta.gui.gameobjectattributesdialog;
+import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import javax.swing.JComponent;
-import javax.swing.JPanel;
public class ScrollToVisibleFocusListener implements FocusListener {
/** {@inheritDoc} */
@Override
public void focusGained(final FocusEvent e) {
- final JComponent c = (JComponent) e.getComponent();
- final JPanel p = (JPanel) c.getParent();
+ final Component c = e.getComponent();
+ final JComponent p = (JComponent) c.getParent();
final Rectangle r = c.getBounds();
p.scrollRectToVisible(r);
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/MonstersTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/MonstersTab.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/MonstersTab.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,6 +23,7 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
+import net.sf.gridarta.gui.connectionview.Control;
import net.sf.gridarta.gui.connectionview.MonsterControl;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.map.maparchobject.MapArchObject;
@@ -82,7 +83,7 @@
@NotNull
@Override
public JPanel createPanel() {
- final MonsterControl<G, A, R> monsterControl = new MonsterControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, monsterMatcher);
+ final Control<?, ?, ?, ?> monsterControl = new MonsterControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, monsterMatcher);
return monsterControl.getView();
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -19,6 +19,7 @@
package net.sf.gridarta.gui.map.maptilepane;
+import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.io.File;
@@ -26,6 +27,7 @@
import java.util.regex.Matcher;
import javax.swing.BorderFactory;
import javax.swing.JButton;
+import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.border.CompoundBorder;
import javax.swing.filechooser.FileFilter;
@@ -188,8 +190,8 @@
* @return The newly built tile panel.
*/
@NotNull
- private JPanel buildTilePanels(@NotNull final TilePanel[] tilePaths) {
- final JPanel tilePanels = new JPanel(new DirectionLayout());
+ private Component buildTilePanels(@NotNull final TilePanel[] tilePaths) {
+ final JComponent tilePanels = new JPanel(new DirectionLayout());
tilePanels.setBorder(new CompoundBorder(BorderFactory.createTitledBorder(ACTION_BUILDER.getString("mapTiles")), GUIConstants.DIALOG_BORDER));
for (final TilePanel tilePath : tilePaths) {
tilePanels.add(tilePath, tilePath.getDirection());
@@ -203,8 +205,8 @@
* @return The newly built subPanel.
*/
@NotNull
- private JPanel buildSubPanel() {
- final JPanel subPanel = new JPanel(new GridBagLayout());
+ private Component buildSubPanel() {
+ final JComponent subPanel = new JPanel(new GridBagLayout());
subPanel.setBorder(new CompoundBorder(BorderFactory.createTitledBorder(ACTION_BUILDER.getString("mapControl")), GUIConstants.DIALOG_BORDER));
final GridBagConstraints gbc = new GridBagConstraints();
gbc.fill = GridBagConstraints.NONE;
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -19,6 +19,7 @@
package net.sf.gridarta.gui.map.maptilepane;
+import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -26,6 +27,7 @@
import java.awt.event.ActionListener;
import java.io.File;
import java.io.IOException;
+import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.JButton;
import javax.swing.JFileChooser;
@@ -140,8 +142,8 @@
* @param action the action for the button
* @return JButton for key
*/
- private static JButton iconButton(final Action action) {
- final JButton button = new JButton(action);
+ private static Component iconButton(final Action action) {
+ final AbstractButton button = new JButton(action);
button.setMargin(new Insets(0, 0, 0, 0));
return button;
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.map.mapview;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -52,7 +53,7 @@
* The registered listeners.
*/
@NotNull
- private final List<MapViewManagerListener<G, A, R>> listeners = new ArrayList<MapViewManagerListener<G, A, R>>();
+ private final Collection<MapViewManagerListener<G, A, R>> listeners = new ArrayList<MapViewManagerListener<G, A, R>>();
/**
* Sets the active map view. The map view will be moved to the front.
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.map.tools;
import java.awt.Component;
+import java.awt.Container;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Point;
@@ -188,7 +189,7 @@
@Nullable
@Override
public Component createOptionsView() {
- final JPanel panel = new JPanel();
+ final Container panel = new JPanel();
panel.setLayout(new GridBagLayout());
final GridBagConstraints gbcLabel = new GridBagConstraints();
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.map.tools;
import java.awt.BorderLayout;
+import java.awt.Container;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import javax.swing.JLabel;
@@ -28,6 +29,7 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.event.MouseOpEvent;
+import net.sf.gridarta.gui.map.event.MouseOpListener;
import net.sf.gridarta.gui.map.mapviewsettings.MapViewSettings;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
@@ -53,7 +55,7 @@
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta.gui.map.tools");
/** The JTabbedPane for the three tabs, one for each mousebutton. */
- private final JTabbedPane mouseTabs = new JTabbedPane();
+ private final Container mouseTabs = new JTabbedPane();
/** The ToolSelector for lmb. */
private final ToolSelector<G, A, R> lmbSelector;
@@ -92,7 +94,7 @@
* mouse button is not bound to a tool.
*/
@Nullable
- public Tool<G, A, R> getTool(final MouseOpEvent<G, A, R> event) {
+ public MouseOpListener<G, A, R> getTool(final MouseOpEvent<G, A, R> event) {
final int button = event.getButton();
final ToolSelector<G, A, R> toolSelector;
switch (button) {
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -22,12 +22,14 @@
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Component;
+import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.util.Map;
import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.ButtonGroup;
import javax.swing.JPanel;
@@ -60,7 +62,7 @@
/** The pane with the selections. */
@NotNull
- private final JPanel selectionPane = new JPanel(new FlowLayout());
+ private final Container selectionPane = new JPanel(new FlowLayout());
/** The CardLayout for the pane that shows a tool's options. */
@NotNull
@@ -72,7 +74,7 @@
/** The pane with the options of a tool. */
@NotNull
- private final JPanel optionsPane = new JPanel(optionCards);
+ private final Container optionsPane = new JPanel(optionCards);
/** The currently selected tool. */
@NotNull
@@ -125,12 +127,12 @@
*/
private void add(@NotNull final Tool<G, A, R> tool, final boolean selected) {
@NotNull final Action selectionAction = new SelectionAction(tool);
- @NotNull final JToggleButton toggleButton = new JToggleButton(selectionAction);
+ @NotNull final AbstractButton toggleButton = new JToggleButton(selectionAction);
toggleButton.setMargin(EMPTY_MARGIN);
@NotNull final Component optionsView = createOptionsView(tool);
selectionButtonGroup.add(toggleButton);
selectionPane.add(toggleButton);
- final JPanel panel = new JPanel(new BorderLayout());
+ final Container panel = new JPanel(new BorderLayout());
panel.add(optionsView, BorderLayout.NORTH);
optionsPane.add(panel, tool.getId());
toggleButton.setSelected(selected);
Modified: trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewAction.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -1,7 +1,9 @@
package net.sf.gridarta.gui.map.viewaction;
+import java.awt.Component;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
import javax.swing.JCheckBoxMenuItem;
import net.sf.gridarta.gameobject.match.NamedGameObjectMatcher;
import net.sf.gridarta.gui.map.mapviewsettings.MapViewSettings;
@@ -33,7 +35,7 @@
private final int editType;
/** The menu item for this action. */
- private final JCheckBoxMenuItem checkBoxMenuItem = new JCheckBoxMenuItem(this);
+ private final AbstractButton checkBoxMenuItem = new JCheckBoxMenuItem(this);
/**
* Creates a new instance.
@@ -75,7 +77,7 @@
* Returns the menu item for this action.
* @return the menu item
*/
- public JCheckBoxMenuItem getCheckBoxMenuItem() {
+ public Component getCheckBoxMenuItem() {
return checkBoxMenuItem;
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -19,12 +19,11 @@
package net.sf.gridarta.gui.map.viewaction;
+import java.awt.Container;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
-import javax.swing.JMenu;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.match.NamedGameObjectMatcher;
@@ -108,7 +107,7 @@
* Creates the view actions.
* @param gameObjectMatchers the game object matchers
*/
- public void init(@NotNull final Collection<NamedGameObjectMatcher> gameObjectMatchers) {
+ public void init(@NotNull final Iterable<NamedGameObjectMatcher> gameObjectMatchers) {
for (final NamedGameObjectMatcher matcher : gameObjectMatchers) {
viewActions.add(new ViewAction(mapViewSettings, matcher));
}
@@ -118,7 +117,7 @@
* Sets the menu to add the actions to.
* @param viewActionsMenu the menu
*/
- public void setMenu(@Nullable final JMenu viewActionsMenu) {
+ public void setMenu(@Nullable final Container viewActionsMenu) {
if (viewActionsMenu == null) {
return;
}
Modified: trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -145,7 +145,7 @@
MenuUtils.removeAll(folderMenu);
for (final MapFolder<G, A, R> mapFolder : mapFolderTree) {
final JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem();
- final MapFolderTreeAction<G, A, R> action = new MapFolderTreeAction<G, A, R>(mapFolderTree, mapFolder, menuItem);
+ final Action action = new MapFolderTreeAction<G, A, R>(mapFolderTree, mapFolder, menuItem);
menuItem.setAction(action);
menuItem.setSelected(mapFolder == activeMapFolder);
folderMenu.add(menuItem);
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.newmap;
import java.awt.GridBagConstraints;
+import javax.swing.AbstractButton;
import javax.swing.JCheckBox;
import javax.swing.JFormattedTextField;
import javax.swing.JLabel;
@@ -75,7 +76,7 @@
private final int defaultHeight;
/** Checkbox to set whether the default width / height should be overridden. */
- private final JCheckBox mapSizeDefaultCheckbox = new JCheckBox(ACTION_BUILDER.createToggle(false, "mapSizeDefault", this));
+ private final AbstractButton mapSizeDefaultCheckbox = new JCheckBox(ACTION_BUILDER.createToggle(false, "mapSizeDefault", this));
/** Textfield for the width of the new map. */
private final JFormattedTextField mapWidthField = new JFormattedTextField();
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -26,6 +26,7 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.mapview.MapViewFactory;
@@ -89,7 +90,7 @@
* Textfield for the name of the map. The filename of the new map is unset
* and will be specified when the user saves the map for the first time.
*/
- private final JTextField mapNameField = new JTextField(16);
+ private final JTextComponent mapNameField = new JTextField(16);
/** Textfield for the difficulty of the new map. */
private final JFormattedTextField mapDifficultyField = new JFormattedTextField();
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,7 +23,6 @@
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.mapview.MapViewFactory;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.map.maparchobject.MapArchObject;
@@ -125,7 +124,7 @@
}
@Deprecated
- public void setObjectChooser(@NotNull final DefaultObjectChooser<G, A, R> objectChooser) {
+ public void setObjectChooser(@NotNull final ObjectChooser<G, A, R> objectChooser) {
this.objectChooser = objectChooser;
}
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -26,6 +26,7 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
@@ -58,7 +59,7 @@
* Textfield for the name of the map. The filename of the new map is unset
* and will be specified when the user saves the map for the first time.
*/
- private final JTextField mapNameField = new JTextField(16);
+ private final JTextComponent mapNameField = new JTextField(16);
/**
* Creates a "new pickmap" dialog.
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -26,6 +26,7 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.map.mapview.MapViewFactory;
@@ -69,7 +70,7 @@
* Textfield for the name of the map. The filename of the new map is unset
* and will be specified when the user saves the map for the first time.
*/
- private final JTextField mapNameField = new JTextField(16);
+ private final JTextComponent mapNameField = new JTextField(16);
/**
* Creates a "new pickmap folder" dialog.
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModel.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModel.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -21,6 +21,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -52,7 +53,7 @@
/**
* The listeners to notify.
*/
- private final List<PickmapChooserModelListener<G, A, R>> listeners = new LinkedList<PickmapChooserModelListener<G, A, R>>();
+ private final Collection<PickmapChooserModelListener<G, A, R>> listeners = new LinkedList<PickmapChooserModelListener<G, A, R>>();
/**
* The map control listener which is attached to all pickmaps to detect
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -19,6 +19,7 @@
package net.sf.gridarta.gui.pickmapchooser;
+import java.awt.Component;
import java.io.IOException;
import javax.swing.BorderFactory;
import javax.swing.JPopupMenu;
@@ -254,7 +255,7 @@
* Returns the {@link JTabbedPane} with all pickmaps.
* @return the <code>JTabbedPane</code> with all pickmaps
*/
- public JTabbedPane getPickmapPanel() {
+ public Component getPickmapPanel() {
return pickmapPanel;
}
Modified: trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -23,6 +23,7 @@
import java.util.prefs.Preferences;
import javax.swing.Box;
import javax.swing.JCheckBox;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JTextField;
import javax.swing.border.Border;
@@ -190,7 +191,7 @@
autoCreateExit.setSelected(exitConnectorModel.isAutoCreateExit());
panel.add(autoCreateExit);
- final JLabel label = new JLabel(ACTION_BUILDER.getString("optionsExitConnectorExitArchetypeName.text"));
+ final JComponent label = new JLabel(ACTION_BUILDER.getString("optionsExitConnectorExitArchetypeName.text"));
label.setToolTipText(ACTION_BUILDER.getString("optionsExitConnectorExitArchetypeName.shortdescription"));
panel.add(label);
exitArchetypeName = new JTextField(exitConnectorModel.getExitArchetypeName());
Modified: trunk/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -34,6 +34,7 @@
import javax.swing.border.Border;
import javax.swing.border.CompoundBorder;
import javax.swing.border.TitledBorder;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.gui.GUIConstants;
import net.sf.japi.swing.action.ActionBuilder;
@@ -69,7 +70,7 @@
private final JComboBox proxyType = createProxyType();
/** TextField for server executable. */
- private final JTextField proxyHost = new JTextField(PREFS.get(NET_PREFS_KEY_HOST, ""));
+ private final JTextComponent proxyHost = new JTextField(PREFS.get(NET_PREFS_KEY_HOST, ""));
/** TextField for client executable. */
private final JSpinner proxyPort = new JSpinner(new SpinnerNumberModel(PREFS.getInt(NET_PREFS_KEY_PORT, 3128), 1, 65535, 1));
Modified: trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -138,7 +138,7 @@
* Create the JComboBox with the update choices.
* @return JComboBox with update choices
*/
- private JComboBox createComboBox() {
+ private Component createComboBox() {
final String[] items = {
ACTION_BUILDER.getString("prefsUpdateAuto0.text"),
ACTION_BUILDER.getString("prefsUpdateAuto1.text"),
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2009-09-28 11:01:08 UTC (rev 6969)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2009-09-28 11:57:37 UTC (rev 6970)
@@ -20,11 +20,13 @@
package net.sf.gridarta.gui.replacedialog;
import java.awt.Component;
+import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.Point;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import javax.swing.BorderFactory;
@@ -33,6 +35,7 @@
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComboBox;
+import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -230,8 +233,8 @@
mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 2, 5));
// first line: heading
- final JPanel line1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel labelon = new JLabel(ACTION_BUILDER.getString("replaceOn"));
+ final Container line1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JComponent labelon = new JLabel(ACTION_BUILDER.getString("replaceOn"));
labelon.setToolTipText(ACTION_BUILDER.getString("replaceOn.shortdescription"));
line1.add(labelon);
line1.add(Box.createVerticalStrut(3));
@@ -249,8 +252,8 @@
mainPanel.add(line1);
// second line: replace what?
- final JPanel line2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel label1 = new JLabel(ACTION_BUILDER.getString("replaceDelete"));
+ final Container line2 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ final JComponent label1 = new JLabel(ACTION_BUILDER.getString("replaceDelete"));
label1.setToolTipText(ACTION_BUILDER.getString("replaceDelete.shortdescription"));
line2.add(label1);
line2.add(Box.createVerticalStrut(5));
@@ -267,8 +270,8 @@
mainPanel.add(line2);
// third line: replace by?
- final JPanel line3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- final JLabel label2 = new JLabel(ACTION_BUILDER.getString("replaceBy"));
+ final Container line3 = new JP...
[truncated message content] |
