Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[4994] trunk
|
From: <aki...@us...> - 2008-08-22 18:12:19
|
Revision: 4994
http://gridarta.svn.sourceforge.net/gridarta/?rev=4994&view=rev
Author: akirschbaum
Date: 2008-08-22 18:12:23 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Move code to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/AbstractMainControl.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
@@ -89,7 +89,6 @@
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.prefs.PreferencesGroup;
-import net.sf.japi.swing.prefs.PreferencesPane;
import net.sf.japi.util.ThrowableHandler;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -352,20 +351,18 @@
return fileControl.saveLevelAsWanted(mapControl);
}
- private PreferencesGroup prefsGroup;
-
- public void options() {
- if (prefsGroup == null) {
- prefsGroup = new PreferencesGroup(
- "Gridarta for Crossfire",
- new ResPrefs((GlobalSettingsImpl) globalSettings),
- new GUIPrefs(),
- new MiscPrefs(),
- new UpdatePrefs(),
- new MapValidatorPrefs<GameObject, MapArchObject, Archetype>("cfeditor", validators, PREFS_VALIDATOR_AUTO_DEFAULT)
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
+ public PreferencesGroup createPreferencesGroup() {
+ return new PreferencesGroup(
+ "Gridarta for Crossfire",
+ new ResPrefs((GlobalSettingsImpl) globalSettings),
+ new GUIPrefs(),
+ new MiscPrefs(),
+ new UpdatePrefs(),
+ new MapValidatorPrefs<GameObject, MapArchObject, Archetype>("cfeditor", validators, PREFS_VALIDATOR_AUTO_DEFAULT)
); // prefsGroup
- }
- PreferencesPane.showPreferencesDialog(mainView, prefsGroup, false);
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
@@ -110,7 +110,6 @@
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.misc.ConsoleProgress;
import net.sf.japi.swing.prefs.PreferencesGroup;
-import net.sf.japi.swing.prefs.PreferencesPane;
import net.sf.japi.util.ThrowableHandler;
import net.sf.japi.util.filter.file.Factory;
import net.sf.japi.util.filter.file.GlobFileFilter;
@@ -516,23 +515,21 @@
return fileControl.saveLevelAsWanted(mapControl);
}
- private PreferencesGroup prefsGroup;
-
- public void options() {
- if (prefsGroup == null) {
- prefsGroup = new PreferencesGroup(
- "Gridarta for Daimonin",
- new ResPrefs((GlobalSettingsImpl) globalSettings),
- new AppPrefs(),
- new NetPrefs(),
- new GUIPrefs(),
- new MiscPrefs(),
- new DevPrefs(),
- new UpdatePrefs(),
- new MapValidatorPrefs<GameObject, MapArchObject, Archetype>("daieditor", validators, PREFS_VALIDATOR_AUTO_DEFAULT)
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
+ public PreferencesGroup createPreferencesGroup() {
+ return new PreferencesGroup(
+ "Gridarta for Daimonin",
+ new ResPrefs((GlobalSettingsImpl) globalSettings),
+ new AppPrefs(),
+ new NetPrefs(),
+ new GUIPrefs(),
+ new MiscPrefs(),
+ new DevPrefs(),
+ new UpdatePrefs(),
+ new MapValidatorPrefs<GameObject, MapArchObject, Archetype>("daieditor", validators, PREFS_VALIDATOR_AUTO_DEFAULT)
); // prefsGroup
- }
- PreferencesPane.showPreferencesDialog(mainView, prefsGroup, false);
}
/** {@inheritDoc} */
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
@@ -101,6 +101,8 @@
import net.sf.gridarta.updater.UpdaterManager;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
+import net.sf.japi.swing.prefs.PreferencesGroup;
+import net.sf.japi.swing.prefs.PreferencesPane;
import net.sf.japi.swing.tod.TipOfTheDayManager;
import net.sf.japi.util.filter.file.EndingFileFilter;
import org.apache.log4j.Logger;
@@ -335,7 +337,10 @@
@NotNull
protected final LeftPanel leftPanel;
-
+
+ @Nullable
+ private PreferencesGroup prefsGroup = null;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -665,4 +670,14 @@
fileControl.openFileWanted(true);
}
+ public void options() {
+ if (prefsGroup == null) {
+ prefsGroup = createPreferencesGroup();
+ }
+ PreferencesPane.showPreferencesDialog(mainView, prefsGroup, false);
+ }
+
+ @NotNull
+ protected abstract PreferencesGroup createPreferencesGroup();
+
} // class AbstractMainControl
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:05:34 UTC (rev 4993)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:12:23 UTC (rev 4994)
@@ -100,6 +100,7 @@
import net.sf.gridarta.map.validation.DelegatingMapValidator;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.japi.swing.misc.Progress;
+import net.sf.japi.swing.prefs.PreferencesGroup;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
@@ -506,6 +507,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected PreferencesGroup createPreferencesGroup() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected GameObjectAttributesControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<TestGameObject, TestMapArchObject, TestArchetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> objectChooser, final ArchetypeTypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeTypeSet, final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager, final MapViewManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareControl, final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView) {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
