Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2008-08-22 07:43:40
|
Revision: 4982
http://gridarta.svn.sourceforge.net/gridarta/?rev=4982&view=rev
Author: akirschbaum
Date: 2008-08-22 07:43:48 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:42:16 UTC (rev 4981)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:43:48 UTC (rev 4982)
@@ -40,7 +40,6 @@
import cfeditor.script.parameter.PluginParameterFactory;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -48,7 +47,6 @@
import javax.swing.JMenu;
import javax.swing.SwingUtilities;
import net.sf.gridarta.AbstractMainControl;
-import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.EditTypes;
import net.sf.gridarta.FileControl;
import net.sf.gridarta.GlobalSettings;
@@ -70,7 +68,6 @@
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
-import net.sf.gridarta.io.IOUtils;
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.validation.DelegatingMapValidator;
@@ -137,13 +134,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
- try {
- final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
- archetypeTypeSetParser.loadTypesFromXML(filename);
- } catch (final FileNotFoundException ex) {
- log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
- }
-
AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter, globalSettings, mapManager);
// Initialize the main view
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:42:16 UTC (rev 4981)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:43:48 UTC (rev 4982)
@@ -42,7 +42,6 @@
import java.awt.Point;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -52,7 +51,6 @@
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import net.sf.gridarta.AbstractMainControl;
-import net.sf.gridarta.CommonConstants;
import net.sf.gridarta.EditTypes;
import net.sf.gridarta.FileControl;
import net.sf.gridarta.GlobalSettings;
@@ -78,7 +76,6 @@
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
import net.sf.gridarta.gui.utils.GUIUtils;
-import net.sf.gridarta.io.IOUtils;
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.MapModel;
@@ -199,13 +196,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
- try {
- final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
- archetypeTypeSetParser.loadTypesFromXML(filename);
- } catch (final FileNotFoundException ex) {
- log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
- }
-
AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter, globalSettings, mapManager);
// Initialize the main view
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:42:16 UTC (rev 4981)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:43:48 UTC (rev 4982)
@@ -436,6 +436,12 @@
archetypeAttributeParser = new ArchetypeAttributeParser<G, A, R>(typeNoEventConnector, includeFaceText, globalSettings, mapFileFilter, luaFileFilter, faceObjects, animationObjects, numberSpells, gameObjectSpells, undefinedSpellIndex, archetypeTypeSet, treasureListTree);
archetypeTypeParser = new ArchetypeTypeParser<G, A, R>(archetypeAttributeParser);
archetypeTypeSetParser = new ArchetypeTypeSetParser<G, A, R>(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath(), archetypeTypeSet, archetypeTypeParser);
+ try {
+ final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), CommonConstants.TYPEDEF_FILE);
+ archetypeTypeSetParser.loadTypesFromXML(filename);
+ } catch (final FileNotFoundException ex) {
+ log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
+ }
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 07:49:44
|
Revision: 4983
http://gridarta.svn.sourceforge.net/gridarta/?rev=4983&view=rev
Author: akirschbaum
Date: 2008-08-22 07:49:51 +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 07:43:48 UTC (rev 4982)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
@@ -44,6 +44,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
+import javax.swing.JComboBox;
import javax.swing.JMenu;
import javax.swing.SwingUtilities;
import net.sf.gridarta.AbstractMainControl;
@@ -53,7 +54,6 @@
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.gameobject.anim.AnimationObject;
-import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
@@ -133,9 +133,7 @@
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
- super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
- AbstractScriptArchEditor.initEventTypeBoxes(".py", "Python", ScriptArchUtils.createEventTypeBox(), pythonFileFilter, globalSettings, mapManager);
-
+ super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
// Initialize the main view
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
@@ -210,6 +208,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected JComboBox createEventTypeBox() {
+ return ScriptArchUtils.createEventTypeBox();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE)
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:43:48 UTC (rev 4982)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
@@ -47,6 +47,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.List;
+import javax.swing.JComboBox;
import javax.swing.JMenu;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -60,7 +61,6 @@
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
-import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
@@ -195,9 +195,7 @@
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
- super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
- AbstractScriptArchEditor.initEventTypeBoxes(".lua", "Lua", ScriptArchUtils.createEventTypeBox(), luaFileFilter, globalSettings, mapManager);
-
+ super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
// Initialize the main view
final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
@@ -289,6 +287,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected JComboBox createEventTypeBox() {
+ return ScriptArchUtils.createEventTypeBox();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected CFTreasureListTree<GameObject, MapArchObject, Archetype> createTreasureListTree() {
return new CFTreasureListTree<GameObject, MapArchObject, Archetype>(mainView, archetypeSet, specialTreasureLists,
new TreasureLocation(getCollectedDirectory(), IGUIConstants.TREASURES_FILE),
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:43:48 UTC (rev 4982)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
@@ -30,6 +30,7 @@
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
+import javax.swing.JComboBox;
import javax.swing.filechooser.FileFilter;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
@@ -45,6 +46,7 @@
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.GameObjectMatchers;
import net.sf.gridarta.gameobject.match.GameObjectMatchersInstance;
+import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
import net.sf.gridarta.gameobject.scripts.ScriptedEvent;
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.About;
@@ -327,6 +329,7 @@
* @param gridartaJarFilename the filename of the editor's .jar file
* @param scriptFileFilter the file filter for script files
* @param scriptExtension the file extension for script files
+ * @param scriptName the display name for script files
* @param spellType the object id for spell objects or <code>0</code> to
* not collect game objects spells
* @param spellFile the spell file name to load or <code>null</code> to not
@@ -335,7 +338,7 @@
* @param includeFaceText whether face names are included in the object
* @param undefinedSpellIndex the index for no spell
*/
- protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex) {
+ protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.globalSettings = globalSettings;
this.mapControlFactory = mapControlFactory;
@@ -442,9 +445,13 @@
} catch (final FileNotFoundException ex) {
log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
}
+ AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
}
@NotNull
+ protected abstract JComboBox createEventTypeBox();
+
+ @NotNull
protected abstract CFTreasureListTree<G, A, R> createTreasureListTree();
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:43:48 UTC (rev 4982)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:49:51 UTC (rev 4983)
@@ -33,6 +33,7 @@
import javax.swing.ImageIcon;
import javax.swing.JList;
import javax.swing.JPanel;
+import javax.swing.JComboBox;
import javax.swing.filechooser.FileFilter;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.AutojoinLists;
@@ -435,7 +436,7 @@
* @param mapControlFactory the map control factory instance to use
*/
protected TestMainControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<TestAnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapControlFactory) {
- super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar", new TestFileFilter(), ".script", 0, null, -1, false, 0);
+ super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0);
}
/** {@inheritDoc} */
@@ -497,6 +498,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected JComboBox createEventTypeBox() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected CFTreasureListTree<TestGameObject, TestMapArchObject, TestArchetype> createTreasureListTree() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 07:55:22
|
Revision: 4984
http://gridarta.svn.sourceforge.net/gridarta/?rev=4984&view=rev
Author: akirschbaum
Date: 2008-08-22 07:55:30 +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 07:49:51 UTC (rev 4983)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -58,7 +58,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -133,9 +132,7 @@
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
- super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0);
- // Initialize the main view
- final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);
+ super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -65,7 +65,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
@@ -195,9 +194,7 @@
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
- super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1);
- // Initialize the main view
- final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, mapViewManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
+ super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -28,9 +28,9 @@
import java.util.ResourceBundle;
import java.util.prefs.Preferences;
import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.JComboBox;
import javax.swing.filechooser.FileFilter;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.gridarta.archtype.ArchetypeAttributeParser;
@@ -62,6 +62,7 @@
import net.sf.gridarta.gui.SystemIcons;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -311,6 +312,9 @@
@NotNull
protected final ArchetypeTypeSetParser<G, A, R> archetypeTypeSetParser;
+
+ @NotNull
+ protected final LockedItemsControl<G, A, R, V> lockedItemsControl;
/**
* Creates a new instance.
@@ -337,8 +341,10 @@
* @param typeNoEventConnector the object type to event game objects
* @param includeFaceText whether face names are included in the object
* @param undefinedSpellIndex the index for no spell
+ * @param lockedItemsTypeNumbers the type numbers of game objects being
+ * locked items
*/
- protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex) {
+ protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<G, A, R, V> mapControlFactory, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers) {
this.gridartaObjectsFactory = gridartaObjectsFactory;
this.globalSettings = globalSettings;
this.mapControlFactory = mapControlFactory;
@@ -446,6 +452,7 @@
log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
}
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
+ lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
}
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:49:51 UTC (rev 4983)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:55:30 UTC (rev 4984)
@@ -436,7 +436,7 @@
* @param mapControlFactory the map control factory instance to use
*/
protected TestMainControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<TestAnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final MapControlFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapControlFactory) {
- super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0);
+ super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, mapControlFactory, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0, new int[] { 13, });
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 07:56:55
|
Revision: 4985
http://gridarta.svn.sourceforge.net/gridarta/?rev=4985&view=rev
Author: akirschbaum
Date: 2008-08-22 07:57:04 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
@@ -58,7 +58,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
@@ -133,7 +132,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
@@ -65,7 +65,6 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
@@ -195,7 +194,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:55:30 UTC (rev 4984)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
@@ -64,6 +64,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
import net.sf.gridarta.gui.map.MapView;
@@ -315,6 +316,9 @@
@NotNull
protected final LockedItemsControl<G, A, R, V> lockedItemsControl;
+
+ @NotNull
+ protected final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
/**
* Creates a new instance.
@@ -453,6 +457,7 @@
}
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
+ gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:05:54
|
Revision: 4986
http://gridarta.svn.sourceforge.net/gridarta/?rev=4986&view=rev
Author: akirschbaum
Date: 2008-08-22 08:05:59 +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 07:57:04 UTC (rev 4985)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -53,19 +53,28 @@
import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.MapControl;
import net.sf.gridarta.map.validation.DelegatingMapValidator;
@@ -116,9 +125,6 @@
/** Preferences default for auto validation. */
private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
- @NotNull
- private final GameObjectAttributesControl gameObjectAttributesControl;
-
/**
* The file control instance.
*/
@@ -132,7 +138,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
@@ -203,6 +208,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+ return new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
return ScriptArchUtils.createEventTypeBox();
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -57,19 +57,28 @@
import net.sf.gridarta.GlobalSettings;
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
@@ -178,9 +187,6 @@
/** The ViewGameObjectMatcherManager for alpha. */
private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
- @NotNull
- private final GameObjectAttributesControl gameObjectAttributesControl;
-
/**
* The file control instance.
*/
@@ -194,7 +200,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
@@ -282,6 +287,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory, final DefaultObjectChooser<GameObject, MapArchObject, Archetype> objectChooser, final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet, final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareControl, final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView) {
+ return new GameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
return ScriptArchUtils.createEventTypeBox();
}
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -64,6 +64,7 @@
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapCursorControl;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
@@ -320,6 +321,9 @@
@NotNull
protected final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel;
+ @NotNull
+ protected final GameObjectAttributesControl<G, A, R, V> gameObjectAttributesControl;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -458,9 +462,13 @@
AbstractScriptArchEditor.initEventTypeBoxes(scriptExtension, scriptName, createEventTypeBox(), scriptFileFilter, globalSettings, mapManager);
lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
+ gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
}
@NotNull
+ protected abstract GameObjectAttributesControl<G, A, R, V> newGameObjectAttributesControl(final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, final DefaultObjectChooser<G, A, R> objectChooser, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final MapManager<G, A, R, V> mapManager, final MapViewManager<G, A, R, V> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<G, A, R, V> selectedSquareControl, final SelectedSquareView<G, A, R, V> selectedSquareView, final MainView<G, A, R, V> mainView);
+
+ @NotNull
protected abstract JComboBox createEventTypeBox();
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 07:57:04 UTC (rev 4985)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:05:59 UTC (rev 4986)
@@ -47,6 +47,7 @@
import net.sf.gridarta.MapImageCache;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.Size2D;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.data.NamedTreeNode;
import net.sf.gridarta.gameobject.AbstractArchetypeParser;
@@ -65,8 +66,13 @@
import net.sf.gridarta.gameobject.face.FaceObjects;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
+import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
@@ -74,7 +80,9 @@
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.io.GameObjectParser;
import net.sf.gridarta.io.MapArchObjectParser;
import net.sf.gridarta.io.MapReader;
@@ -498,6 +506,13 @@
/** {@inheritDoc} */
@NotNull
@Override
+ protected GameObjectAttributesControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newGameObjectAttributesControl(final GameObjectAttributesModel<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeGameObjectAttributesModel, final GameObjectAttributesDialogFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicGameObjectAttributesDialogFactory, final DefaultObjectChooser<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeDefaultObjectChooser, final ArchetypeTypeSet<TestGameObject, TestMapArchObject, TestArchetype> testGameObjectTestMapArchObjectTestArchetypeArchetypeTypeSet, final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMapManager, final MapViewManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicLockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicSelectedSquareControl, final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicSelectedSquareView, final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> testGameObjectTestMapArchObjectTestArchetypeTestMapViewBasicMainView) {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
protected JComboBox createEventTypeBox() {
throw new AssertionError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:10:37
|
Revision: 4987
http://gridarta.svn.sourceforge.net/gridarta/?rev=4987&view=rev
Author: akirschbaum
Date: 2008-08-22 08:10:44 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Unify code.
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 08:05:59 UTC (rev 4986)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:10:44 UTC (rev 4987)
@@ -120,8 +120,10 @@
public static final boolean PREFS_SYSTEM_EXIT_DEFAULT = true;
/** The current script controller. */
- private final ScriptController scriptControl;
+ private ScriptController scriptControl;
+ private CFilterControl filterControl;
+
/** Preferences default for auto validation. */
private static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = true;
@@ -138,12 +140,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
- final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
- final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
- ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
- final ScriptParameters scriptParameters = new ScriptParameters(archetypeSet, globalSettings, mapManager, validators);
- scriptControl = new ScriptController(filterControl, scriptParameters, mainView);
final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
@@ -237,6 +233,17 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init2() {
+ PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
+ final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
+ filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
+ ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
+ final ScriptParameters scriptParameters = new ScriptParameters(archetypeSet, globalSettings, mapManager, validators);
+ scriptControl = new ScriptController(filterControl, scriptParameters, mainView);
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:10:44 UTC (rev 4987)
@@ -316,6 +316,11 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init2() {
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:10:44 UTC (rev 4987)
@@ -463,6 +463,7 @@
lockedItemsControl = new LockedItemsControl<G, A, R, V>(mapManager, mapViewManager, lockedItemsTypeNumbers);
gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+ init2();
}
@NotNull
@@ -477,6 +478,8 @@
@NotNull
protected abstract MapActions init1();
+ protected abstract void init2();
+
/**
* Initializes the map validators.
* @return A MapValidator that delegates to other map validators.
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:05:59 UTC (rev 4986)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:10:44 UTC (rev 4987)
@@ -525,6 +525,12 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init2() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected MapActions init1() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:18:55
|
Revision: 4989
http://gridarta.svn.sourceforge.net/gridarta/?rev=4989&view=rev
Author: akirschbaum
Date: 2008-08-22 08:19:04 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Order import statements.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:19:04 UTC (rev 4989)
@@ -60,16 +60,14 @@
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
-import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
+import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
-import net.sf.gridarta.gui.MapViewManager;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -77,11 +75,13 @@
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
import net.sf.gridarta.gui.prefs.MiscPrefs;
import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
import net.sf.gridarta.gui.utils.GUIUtils;
import net.sf.gridarta.map.AutoValidator;
import net.sf.gridarta.map.MapControl;
Modified: trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java 2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/src/app/net/sf/gridarta/spells/SpellsUtils.java 2008-08-22 08:19:04 UTC (rev 4989)
@@ -19,26 +19,26 @@
package net.sf.gridarta.spells;
-import org.apache.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import net.sf.japi.swing.ActionFactory;
-import net.sf.japi.util.filter.file.FilenameFileFilter;
-import net.sf.gridarta.io.IOUtils;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.JFileChooser;
import java.awt.Component;
+import java.io.BufferedReader;
+import java.io.EOFException;
import java.io.File;
-import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.EOFException;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
+import java.util.Date;
import java.util.Map;
import java.util.TreeMap;
-import java.util.Date;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.io.IOUtils;
+import net.sf.japi.swing.ActionFactory;
+import net.sf.japi.util.filter.file.FilenameFileFilter;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
/**
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:12:03 UTC (rev 4988)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 08:19:04 UTC (rev 4989)
@@ -31,9 +31,9 @@
import java.util.SortedSet;
import java.util.TreeSet;
import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
import javax.swing.JList;
import javax.swing.JPanel;
-import javax.swing.JComboBox;
import javax.swing.filechooser.FileFilter;
import net.sf.gridarta.AbstractMainControl;
import net.sf.gridarta.AutojoinLists;
@@ -48,7 +48,6 @@
import net.sf.gridarta.MapManager;
import net.sf.gridarta.Size2D;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.data.NamedTreeNode;
import net.sf.gridarta.gameobject.AbstractArchetypeParser;
import net.sf.gridarta.gameobject.AbstractArchetypeSet;
@@ -67,22 +66,22 @@
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapViewManager;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
-import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
import net.sf.gridarta.gui.map.LevelRenderer;
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.RendererFactory;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
+import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
-import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.io.GameObjectParser;
import net.sf.gridarta.io.MapArchObjectParser;
import net.sf.gridarta.io.MapReader;
@@ -99,6 +98,7 @@
import net.sf.gridarta.map.MapModelListener;
import net.sf.gridarta.map.MapSquare;
import net.sf.gridarta.map.validation.DelegatingMapValidator;
+import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.japi.swing.misc.Progress;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:21:27
|
Revision: 4990
http://gridarta.svn.sourceforge.net/gridarta/?rev=4990&view=rev
Author: akirschbaum
Date: 2008-08-22 08:21:30 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:19:04 UTC (rev 4989)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
@@ -67,7 +67,6 @@
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
@@ -140,7 +139,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:19:04 UTC (rev 4989)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
@@ -74,7 +74,6 @@
import net.sf.gridarta.gui.map.MapView;
import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
@@ -200,7 +199,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:19:04 UTC (rev 4989)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
@@ -73,6 +73,7 @@
import net.sf.gridarta.gui.map.RendererFactory;
import net.sf.gridarta.gui.map.tools.DeletionTool;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
@@ -324,6 +325,9 @@
@NotNull
protected final GameObjectAttributesControl<G, A, R, V> gameObjectAttributesControl;
+ @NotNull
+ protected final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -464,6 +468,7 @@
gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
init2();
+ objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:23:22
|
Revision: 4991
http://gridarta.svn.sourceforge.net/gridarta/?rev=4991&view=rev
Author: akirschbaum
Date: 2008-08-22 08:23:31 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
@@ -65,7 +65,6 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
@@ -139,7 +138,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
@@ -72,7 +72,6 @@
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.map.MapView;
-import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
@@ -199,7 +198,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:21:30 UTC (rev 4990)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
@@ -72,6 +72,7 @@
import net.sf.gridarta.gui.map.MapViewBasic;
import net.sf.gridarta.gui.map.RendererFactory;
import net.sf.gridarta.gui.map.tools.DeletionTool;
+import net.sf.gridarta.gui.map.tools.ToolPalette;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.objectchoicedisplay.ObjectChoiceDisplay;
import net.sf.gridarta.gui.objectchooser.DefaultObjectChooser;
@@ -328,6 +329,9 @@
@NotNull
protected final ObjectChoiceDisplay<G, A, R, V> objectChoiceDisplay;
+ @NotNull
+ protected final ToolPalette<G, A, R, V> toolPalette;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -469,6 +473,7 @@
gameObjectAttributesControl = newGameObjectAttributesControl(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, archetypeTypeSet, mapManager, mapViewManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
init2();
objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
+ toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 08:24:49
|
Revision: 4992
http://gridarta.svn.sourceforge.net/gridarta/?rev=4992&view=rev
Author: akirschbaum
Date: 2008-08-22 08:24:57 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
@@ -56,7 +56,6 @@
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
-import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
@@ -138,7 +137,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
@@ -63,7 +63,6 @@
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gameobject.match.MutableOrGameObjectMatcher;
import net.sf.gridarta.gameobject.match.ViewGameObjectMatcherManager;
-import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
@@ -198,7 +197,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
ACTION_FACTORY.createAction(true, "collectSpells", this);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:23:31 UTC (rev 4991)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
@@ -51,6 +51,7 @@
import net.sf.gridarta.gameobject.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.About;
import net.sf.gridarta.gui.HideFileFilterProxy;
+import net.sf.gridarta.gui.LeftPanel;
import net.sf.gridarta.gui.MainActions;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapFileFilter;
@@ -332,6 +333,9 @@
@NotNull
protected final ToolPalette<G, A, R, V> toolPalette;
+ @NotNull
+ protected final LeftPanel leftPanel;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -474,6 +478,7 @@
init2();
objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
+ leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:05:25
|
Revision: 4993
http://gridarta.svn.sourceforge.net/gridarta/?rev=4993&view=rev
Author: akirschbaum
Date: 2008-08-22 18:05:34 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
@@ -317,19 +317,6 @@
return mainView;
}
- /** Invoked when user wants to begin editing a new (empty) map. */
- public void createNew() {
- newLevelWanted(null);
- }
-
- /**
- * Invoked when user wants to begin editing a new (empty) map.
- * @param filename desired filename for the new map, null if not specified
- */
- public void newLevelWanted(final String filename) {
- newMapDialogFactory.showNewMapDialog(filename);
- }
-
/** Invoked when user wants to open a file. */
public void open() {
fileControl.openFileWanted(true);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
@@ -185,21 +185,15 @@
private final ViewGameObjectMatcherManager vaommAlpha = new ViewGameObjectMatcherManager(moaomAlpha);
/**
- * The file control instance.
- */
- @NotNull
- private final FileControl<GameObject, MapArchObject, Archetype, CMapViewBasic> fileControl;
-
- /**
* Constructs the main controller and its model and view.
* @param gridartaObjectsFactory the gridarta objects factory to use
* @throws RuntimeException If the controller cannot be initialized.
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "zoom", "gc", "onlineHelp", "tod");
+ ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
+ ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
- ACTION_FACTORY.createAction(true, "collectSpells", this);
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
@@ -492,25 +486,7 @@
return mainView;
}
- /** Invoked when user wants to begin editing a new (empty) map. */
- public void createNew() {
- newLevelWanted(null);
- }
-
/**
- * Invoked when user wants to begin editing a new (empty) map.
- * @param filename desired filename for the new map, null if not specified
- */
- public void newLevelWanted(final String filename) {
- newMapDialogFactory.showNewMapDialog(filename);
- }
-
- /** Invoked when user wants to open a file. */
- public void open() {
- fileControl.openFileWanted(true);
- }
-
- /**
* Load a list of map files.
* @param filenames collection of filenames to load
*/
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 08:24:57 UTC (rev 4992)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:05:34 UTC (rev 4993)
@@ -496,6 +496,12 @@
protected abstract void init2();
/**
+ * The file control instance.
+ */
+ @NotNull
+ protected FileControl<G, A, R, V> fileControl;
+
+ /**
* Initializes the map validators.
* @return A MapValidator that delegates to other map validators.
*/
@@ -641,4 +647,22 @@
new MapPreview(rendererFactory.newSimpleLevelRenderer(currentMap.getMapModel()).getFullImage());
}
+ /** Invoked when user wants to begin editing a new (empty) map. */
+ public void createNew() {
+ newLevelWanted(null);
+ }
+
+ /**
+ * Invoked when user wants to begin editing a new (empty) map.
+ * @param filename desired filename for the new map, null if not specified
+ */
+ public void newLevelWanted(final String filename) {
+ newMapDialogFactory.showNewMapDialog(filename);
+ }
+
+ /** Invoked when user wants to open a file. */
+ public void open() {
+ fileControl.openFileWanted(true);
+ }
+
} // class AbstractMainControl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <aki...@us...> - 2008-08-22 18:21:39
|
Revision: 4995
http://gridarta.svn.sourceforge.net/gridarta/?rev=4995&view=rev
Author: akirschbaum
Date: 2008-08-22 18:21:48 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
@@ -369,11 +369,10 @@
public void reloadFaces() {
}
- /** Invoked when user wants to exit from the program. */
- public void exit() {
- if (ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit() && scriptControl.canExit()) {
- doExit();
- }
+ /** {@inheritDoc} */
+ @Override
+ public boolean canExit() {
+ return super.canExit() && scriptControl.canExit();
}
/** {@inheritDoc} */
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
@@ -537,13 +537,6 @@
FaceObjectProviders.reloadAll();
}
- /** Invoked when user wants to exit from the program. */
- public void exit() {
- if (ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit()) {
- doExit();
- }
- }
-
/** {@inheritDoc} */
public void doExit() {
mainView.setEnabled(false);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:12:23 UTC (rev 4994)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
@@ -680,4 +680,20 @@
@NotNull
protected abstract PreferencesGroup createPreferencesGroup();
+ /** Invoked when user wants to exit from the program. */
+ public void exit() {
+ if (canExit()) {
+ doExit();
+ }
+ }
+
+ /**
+ * Prepares existing the application: save modified data (possibly ask the
+ * user if applicable).
+ * @return whether all modified data has been saved
+ */
+ protected boolean canExit() {
+ return ScriptEditControlInstance.getInstance().closeAllTabs() && mapManager.closeAll() && pickmapChooserControl.canExit();
+ }
+
} // class AbstractMainControl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:22:58
|
Revision: 4996
http://gridarta.svn.sourceforge.net/gridarta/?rev=4996&view=rev
Author: akirschbaum
Date: 2008-08-22 18:23:06 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
@@ -87,7 +87,6 @@
import net.sf.gridarta.treasurelist.CFTreasureListTree;
import net.sf.gridarta.treasurelist.TreasureLocation;
import net.sf.japi.swing.ActionFactory;
-import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.prefs.PreferencesGroup;
import net.sf.japi.util.ThrowableHandler;
import org.apache.log4j.Logger;
@@ -302,12 +301,6 @@
return mapValidators;
}
- /** Edit an existing script. */
- @ActionMethod
- public void editScript() {
- fileControl.openFileWanted(false);
- }
-
/**
* Returns the main view.
* @return the main view
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
@@ -438,12 +438,6 @@
new SpellsUtils(IGUIConstants.SPELL_FILE).importSpellsWanted(getConfigurationDirectory(), mainView);
}
- /** Edit an existing script. */
- @ActionMethod
- public void editScript() {
- fileControl.openFileWanted(false);
- }
-
/**
* Get whether the specified edit type is to be shown transparent.
* @param v edit type to check
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:21:48 UTC (rev 4995)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
@@ -629,6 +629,12 @@
ScriptEditControlInstance.getInstance().openScriptNew();
}
+ /** Edit an existing script. */
+ @ActionMethod
+ public void editScript() {
+ fileControl.openFileWanted(false);
+ }
+
/** Open the online help window. */
public void onlineHelp() {
new Help(getMainView(), null).setVisible(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:26:12
|
Revision: 4997
http://gridarta.svn.sourceforge.net/gridarta/?rev=4997&view=rev
Author: akirschbaum
Date: 2008-08-22 18:26:19 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:26:19 UTC (rev 4997)
@@ -135,7 +135,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:26:19 UTC (rev 4997)
@@ -190,7 +190,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:23:06 UTC (rev 4996)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:26:19 UTC (rev 4997)
@@ -484,6 +484,7 @@
objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
+ ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
}
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:29:20
|
Revision: 4998
http://gridarta.svn.sourceforge.net/gridarta/?rev=4998&view=rev
Author: akirschbaum
Date: 2008-08-22 18:29:26 +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:26:19 UTC (rev 4997)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
@@ -186,6 +186,10 @@
}
/** {@inheritDoc} */
+ protected void createActions() {
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
@@ -190,8 +190,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
- ACTION_FACTORY.createToggles(true, this, "drawDouble");
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
@@ -264,6 +262,12 @@
}
/** {@inheritDoc} */
+ protected void createActions() {
+ ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
+ ACTION_FACTORY.createToggles(true, this, "drawDouble");
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newNewMapDialogFactory(@NotNull final MapManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapManager, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
@@ -485,8 +485,11 @@
toolPalette = new ToolPalette<G, A, R, V>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl);
leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
+ createActions();
}
+ protected abstract void createActions();
+
@NotNull
protected abstract GameObjectAttributesControl<G, A, R, V> newGameObjectAttributesControl(final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel, final GameObjectAttributesDialogFactory<G, A, R, V> gameObjectAttributesDialogFactory, final DefaultObjectChooser<G, A, R> objectChooser, final ArchetypeTypeSet<G, A, R> archetypeTypeSet, final MapManager<G, A, R, V> mapManager, final MapViewManager<G, A, R, V> mapViewManager, final AnimationObjects<? extends AnimationObject> animationObjects, final LockedItemsControl<G, A, R, V> lockedItemsControl, final GameObjectMatcher monsterMatcher, final SelectedSquareControl<G, A, R, V> selectedSquareControl, final SelectedSquareView<G, A, R, V> selectedSquareView, final MainView<G, A, R, V> mainView);
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:26:19 UTC (rev 4997)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:29:26 UTC (rev 4998)
@@ -512,6 +512,10 @@
}
/** {@inheritDoc} */
+ protected void createActions() {
+ }
+
+ /** {@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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:30:43
|
Revision: 4999
http://gridarta.svn.sourceforge.net/gridarta/?rev=4999&view=rev
Author: akirschbaum
Date: 2008-08-22 18:30:52 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
@@ -135,7 +135,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
@@ -190,7 +190,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:29:26 UTC (rev 4998)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
@@ -486,6 +486,7 @@
leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
createActions();
+ mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
}
protected abstract void createActions();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:31:46
|
Revision: 5000
http://gridarta.svn.sourceforge.net/gridarta/?rev=5000&view=rev
Author: akirschbaum
Date: 2008-08-22 18:31:55 +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
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:31:55 UTC (rev 5000)
@@ -135,7 +135,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- mapActions.updateMenuState();
scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:31:55 UTC (rev 5000)
@@ -190,7 +190,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- mapActions.updateMenuState();
final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:30:52 UTC (rev 4999)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:31:55 UTC (rev 5000)
@@ -487,6 +487,7 @@
ACTION_FACTORY.createActions(true, this, "createNew", "open", "options", "exit", "newScript", "editScript", "zoom", "gc", "onlineHelp", "tod");
createActions();
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
+ mapActions.updateMenuState();
}
protected abstract void createActions();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:36:59
|
Revision: 5001
http://gridarta.svn.sourceforge.net/gridarta/?rev=5001&view=rev
Author: akirschbaum
Date: 2008-08-22 18:37:07 +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:31:55 UTC (rev 5000)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:37:07 UTC (rev 5001)
@@ -135,7 +135,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
@@ -237,6 +236,12 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init3() {
+ scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:31:55 UTC (rev 5000)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:37:07 UTC (rev 5001)
@@ -309,6 +309,11 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init3() {
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:31:55 UTC (rev 5000)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:37:07 UTC (rev 5001)
@@ -488,6 +488,7 @@
createActions();
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
+ init3();
}
protected abstract void createActions();
@@ -506,6 +507,8 @@
protected abstract void init2();
+ protected abstract void init3();
+
/**
* The file control instance.
*/
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:31:55 UTC (rev 5000)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:37:07 UTC (rev 5001)
@@ -543,6 +543,12 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void init3() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
@NotNull
@Override
protected MapActions init1() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 18:51:38
|
Revision: 5002
http://gridarta.svn.sourceforge.net/gridarta/?rev=5002&view=rev
Author: akirschbaum
Date: 2008-08-22 18:51:46 +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:37:07 UTC (rev 5001)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-08-22 18:51:46 UTC (rev 5002)
@@ -54,12 +54,14 @@
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -135,7 +137,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null, "DaimoninEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, });
- final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
archetypeSet.loadArchetypes(archetypeParser);
@@ -183,6 +184,12 @@
}
/** {@inheritDoc} */
+ @Override
+ protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+ return new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
+ }
+
+ /** {@inheritDoc} */
protected void createActions() {
}
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2008-08-22 18:51:46 UTC (rev 5002)
@@ -58,6 +58,7 @@
import net.sf.gridarta.GridartaObjectsFactory;
import net.sf.gridarta.MapManager;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.face.FaceObjectProviders;
import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -67,6 +68,7 @@
import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.RecentManager;
import net.sf.gridarta.gui.SystemIcons;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
@@ -190,7 +192,6 @@
*/
public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "CrossfireEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, });
- final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
((DefaultMapControlFactory) mapControlFactory).init(gridartaObjectsFactory, rendererFactory, mapActions, archetypeChooserModel, mapImageCache, autojoinLists, exitMatcher);
gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, mainView, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, toolPalette, autojoinLists, exitMatcher);
@@ -260,6 +261,12 @@
}
/** {@inheritDoc} */
+ @Override
+ protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype> newArchetypeParser(final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet) {
+ return new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
+ }
+
+ /** {@inheritDoc} */
protected void createActions() {
ACTION_FACTORY.createActions(true, this, "controlServer", "controlClient", "cleanCompletelyBlockedSquares", "collectSpells");
ACTION_FACTORY.createToggles(true, this, "drawDouble");
Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java 2008-08-22 18:51:46 UTC (rev 5002)
@@ -37,6 +37,7 @@
import net.sf.gridarta.archtype.ArchetypeTypeParser;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
+import net.sf.gridarta.gameobject.AbstractArchetypeParser;
import net.sf.gridarta.gameobject.Archetype;
import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.GameObject;
@@ -341,6 +342,9 @@
@Nullable
private PreferencesGroup prefsGroup = null;
+ @NotNull
+ protected final AbstractArchetypeParser<G, A, R> archetypeParser;
+
/**
* Creates a new instance.
* @param gridartaObjectsFactory the gridarta objects factory
@@ -489,8 +493,11 @@
mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, pickmapChooserControl, objectChooser, leftPanel);
mapActions.updateMenuState();
init3();
+ archetypeParser = newArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
}
+ protected abstract AbstractArchetypeParser<G, A, R> newArchetypeParser(final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, final net.sf.gridarta.gameobject.ArchetypeSet<G, A, R> archetypeSet);
+
protected abstract void createActions();
@NotNull
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:37:07 UTC (rev 5001)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-08-22 18:51:46 UTC (rev 5002)
@@ -67,6 +67,7 @@
import net.sf.gridarta.gui.MainView;
import net.sf.gridarta.gui.MapViewManager;
import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesControl;
@@ -512,6 +513,13 @@
}
/** {@inheritDoc} */
+ @Override
+ protected AbstractArchetypeParser<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeParser(final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserControl, final AnimationObjects<? extends AnimationObject> animationObjects, final ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override
protected void createActions() {
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 19:19:25
|
Revision: 5003
http://gridarta.svn.sourceforge.net/gridarta/?rev=5003&view=rev
Author: akirschbaum
Date: 2008-08-22 19:19:32 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Make file menu work again.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -128,38 +128,6 @@
#######
-# File
-
-file.text=File
-file.mnemonic=F
-
-createNew.text=New...
-createNew.shortdescription=Create new map
-createNew.longdescription=Creates a new map
-createNew.mnemonic=N
-createNew.accel=ctrl pressed N
-
-open.text=Open...
-open.shortdescription=Open a new map
-open.longdescription=Loads a new map from a map file
-open.mnemonic=O
-open.accel=ctrl pressed O
-open.error.text=Error while loading
-
-options.text=Options...
-options.shortdescription=Shows options
-options.longdescription=Shows an option dialog to change the editor settings
-options.mnemonic=P
-options.accel=ctrl alt pressed S
-
-exit.text=Exit
-exit.shortdescription=Exit program
-exit.longdescription=Exits the program
-exit.mnemonic=X
-exit.accel=ctrl pressed Q
-
-
-#######
# Map
map.text=Map
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -124,34 +124,6 @@
#######
-# File
-
-file.text=Datei
-file.mnemonic=D
-
-createNew.text=Neu...
-createNew.shortdescription=Erzeuge neue Karte
-createNew.longdescription=Erzeugt eine neue Karte
-createNew.mnemonic=N
-
-open.text=\xD6ffnen...
-open.shortdescription=\xD6ffne eine Karte
-open.longdescription=L\xE4dt eine Karte aus einer Datei
-open.mnemonic=F
-open.error.text=Fehler beim Laden
-
-options.text=Optionen...
-options.shortdescription=Optionen zeigen
-options.longdescription=Zeigt einen Dialog mit den Editoreinstellungen
-options.mnemonic=O
-
-exit.text=Beenden
-exit.shortdescription=Programm beenden
-exit.longdescription=Beendet das Programm
-exit.mnemonic=B
-
-
-#######
# Map
map.text=Karte
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -125,34 +125,6 @@
#######
-# File
-
-file.text=Fichier
-file.mnemonic=F
-
-createNew.text=Nouveau
-createNew.shortdescription=Cr\xE9er une nouvelle carte
-createNew.longdescription=Cr\xE9e une nouvelle carte
-createNew.mnemonic=N
-
-open.text=Ouvrir
-open.shortdescription=Ouvrir une carte
-open.longdescription=Ouvre une carte \xE0 partir d'un fichier
-open.mnemonic=O
-open.error.text=Erreur lors du chargement.
-
-options.text=Options...
-options.shortdescription=Affiche les options
-options.longdescription=Affiche une fen\xEAtre d'options pour modifier les r\xE9glages de l'\xE9diteur
-options.mnemonic=O
-
-exit.text=Quitter
-exit.shortdescription=Quitter le programme
-exit.longdescription=Quitte le programme
-exit.mnemonic=Q
-
-
-#######
# Map
map.text=Carte
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -123,34 +123,6 @@
#######
-# File
-
-file.text=Arkiv
-file.mnemonic=A
-
-createNew.text=Ny
-createNew.shortdescription=Ny karta
-createNew.longdescription=Skapar en ny karta
-createNew.mnemonic=N
-
-open.text=\xD6ppna...
-open.shortdescription=\xD6ppna karta
-open.longdescription=\xD6ppnar en karta fr\xE5n fil
-open.mnemonic=P
-#open.error.text=
-
-options.text=Inst\xE4llningar...
-options.shortdescription=Justera inst\xE4llningar
-options.longdescription=\xD6ppnar dialogen f\xF6r att justera editorinst\xE4llningarna
-options.mnemonic=I
-
-exit.text=Avsluta
-exit.shortdescription=Avsluta programmet
-exit.longdescription=Avslutar programmet
-exit.mnemonic=A
-
-
-#######
# Map
map.text=Karta
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -114,38 +114,6 @@
#######
-# File
-
-file.text=File
-file.mnemonic=F
-
-createNew.text=New...
-createNew.shortdescription=Create new map
-createNew.longdescription=Creates a new map
-createNew.mnemonic=N
-createNew.accel=ctrl pressed N
-
-open.text=Open...
-open.shortdescription=Open a new map
-open.longdescription=Loads a new map from a map file
-open.mnemonic=O
-open.accel=ctrl pressed O
-open.error.text=Error while loading
-
-options.text=Options...
-options.shortdescription=Shows options
-options.longdescription=Shows an option dialog to change the editor settings
-options.mnemonic=P
-options.accel=ctrl alt pressed S
-
-exit.text=Exit
-exit.shortdescription=Exit program
-exit.longdescription=Exits the program
-exit.mnemonic=X
-exit.accel=ctrl pressed Q
-
-
-#######
# Map
map.text=Map
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -114,34 +114,6 @@
#######
-# File
-
-file.text=Datei
-file.mnemonic=D
-
-createNew.text=Neu...
-createNew.shortdescription=Erzeuge neue Karte
-createNew.longdescription=Erzeugt eine neue Karte
-createNew.mnemonic=N
-
-open.text=\xD6ffnen...
-open.shortdescription=\xD6ffne eine Karte
-open.longdescription=L\xE4dt eine Karte aus einer Datei
-open.mnemonic=F
-open.error.text=Fehler beim Laden
-
-options.text=Optionen...
-options.shortdescription=Optionen zeigen
-options.longdescription=Zeigt einen Dialog mit den Editoreinstellungen
-options.mnemonic=O
-
-exit.text=Beenden
-exit.shortdescription=Programm beenden
-exit.longdescription=Beendet das Programm
-exit.mnemonic=B
-
-
-#######
# Map
map.text=Karte
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -115,34 +115,6 @@
#######
-# File
-
-file.text=Fichier
-file.mnemonic=F
-
-createNew.text=Nouveau
-createNew.shortdescription=Cr\xE9er une nouvelle carte
-createNew.longdescription=Cr\xE9e une nouvelle carte
-createNew.mnemonic=N
-
-open.text=Ouvrir
-open.shortdescription=Ouvrir une carte
-open.longdescription=Ouvre une carte \xE0 partir d'un fichier
-open.mnemonic=O
-open.error.text=Erreur lors du chargement.
-
-options.text=Options...
-options.shortdescription=Affiche les options
-options.longdescription=Affiche une fen\xEAtre d'options pour modifier les r\xE9glages de l'\xE9diteur
-options.mnemonic=O
-
-exit.text=Quitter
-exit.shortdescription=Quitter le programme
-exit.longdescription=Quitte le programme
-exit.mnemonic=Q
-
-
-#######
# Map
map.text=Carte
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -116,34 +116,6 @@
#######
-# File
-
-file.text=Arkiv
-file.mnemonic=A
-
-createNew.text=Ny
-createNew.shortdescription=Ny karta
-createNew.longdescription=Skapar en ny karta
-createNew.mnemonic=N
-
-open.text=\xD6ppna...
-open.shortdescription=\xD6ppna karta
-open.longdescription=\xD6ppnar en karta fr\xE5n fil
-open.mnemonic=P
-#open.error.text=
-
-options.text=Inst\xE4llningar...
-options.shortdescription=Justera inst\xE4llningar
-options.longdescription=\xD6ppnar dialogen f\xF6r att justera editorinst\xE4llningarna
-options.mnemonic=I
-
-exit.text=Avsluta
-exit.shortdescription=Avsluta programmet
-exit.longdescription=Avslutar programmet
-exit.mnemonic=A
-
-
-#######
# Map
map.text=Karta
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -452,6 +452,9 @@
###########
# File Menu
+file.text=File
+file.mnemonic=F
+
save.text=Save
save.shortdescription=Save map
save.longdescription=Saves the current map
@@ -490,7 +493,32 @@
recent.mnemonic=T
recentItem.shortdescriptionformat=Opens map {0} ({1})
+createNew.text=New...
+createNew.shortdescription=Create new map
+createNew.longdescription=Creates a new map
+createNew.mnemonic=N
+createNew.accel=ctrl pressed N
+open.text=Open...
+open.shortdescription=Open a new map
+open.longdescription=Loads a new map from a map file
+open.mnemonic=O
+open.accel=ctrl pressed O
+open.error.text=Error while loading
+
+options.text=Options...
+options.shortdescription=Shows options
+options.longdescription=Shows an option dialog to change the editor settings
+options.mnemonic=P
+options.accel=ctrl alt pressed S
+
+exit.text=Exit
+exit.shortdescription=Exit program
+exit.longdescription=Exits the program
+exit.mnemonic=X
+exit.accel=ctrl pressed Q
+
+
#######
# Edit
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -426,6 +426,9 @@
###########
# File Menu
+file.text=Datei
+file.mnemonic=D
+
save.text=Speichern
save.shortdescription=Karte speichern
save.longdescription=Speichert die aktuelle Karte
@@ -461,7 +464,28 @@
recent.mnemonic=Z
recentItem.shortdescriptionformat=\xD6ffne Karte {0} ({1})
+createNew.text=Neu...
+createNew.shortdescription=Erzeuge neue Karte
+createNew.longdescription=Erzeugt eine neue Karte
+createNew.mnemonic=N
+open.text=\xD6ffnen...
+open.shortdescription=\xD6ffne eine Karte
+open.longdescription=L\xE4dt eine Karte aus einer Datei
+open.mnemonic=F
+open.error.text=Fehler beim Laden
+
+options.text=Optionen...
+options.shortdescription=Optionen zeigen
+options.longdescription=Zeigt einen Dialog mit den Editoreinstellungen
+options.mnemonic=O
+
+exit.text=Beenden
+exit.shortdescription=Programm beenden
+exit.longdescription=Beendet das Programm
+exit.mnemonic=B
+
+
#######
# Edit
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -425,6 +425,9 @@
###########
# File Menu
+file.text=Fichier
+file.mnemonic=F
+
save.text=Enregistrer
save.shortdescription=Enregistrer la carte
save.longdescription=Enregistre la carte active
@@ -460,7 +463,28 @@
#recent.mnemonic=
#recentItem.shortdescriptionformat=
+createNew.text=Nouveau
+createNew.shortdescription=Cr\xE9er une nouvelle carte
+createNew.longdescription=Cr\xE9e une nouvelle carte
+createNew.mnemonic=N
+open.text=Ouvrir
+open.shortdescription=Ouvrir une carte
+open.longdescription=Ouvre une carte \xE0 partir d'un fichier
+open.mnemonic=O
+open.error.text=Erreur lors du chargement.
+
+options.text=Options...
+options.shortdescription=Affiche les options
+options.longdescription=Affiche une fen\xEAtre d'options pour modifier les r\xE9glages de l'\xE9diteur
+options.mnemonic=O
+
+exit.text=Quitter
+exit.shortdescription=Quitter le programme
+exit.longdescription=Quitte le programme
+exit.mnemonic=Q
+
+
#######
# Edit
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-22 18:51:46 UTC (rev 5002)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
@@ -429,6 +429,9 @@
###########
# File Menu
+file.text=Arkiv
+file.mnemonic=A
+
save.text=Spara
save.shortdescription=Spara karta
save.longdescription=Sparar den aktuella kartan
@@ -464,7 +467,28 @@
recent.mnemonic=Y
recentItem.shortdescriptionformat=\xD6ppnar karta {0} ({1})
+createNew.text=Ny
+createNew.shortdescription=Ny karta
+createNew.longdescription=Skapar en ny karta
+createNew.mnemonic=N
+open.text=\xD6ppna...
+open.shortdescription=\xD6ppna karta
+open.longdescription=\xD6ppnar en karta fr\xE5n fil
+open.mnemonic=P
+#open.error.text=
+
+options.text=Inst\xE4llningar...
+options.shortdescription=Justera inst\xE4llningar
+options.longdescription=\xD6ppnar dialogen f\xF6r att justera editorinst\xE4llningarna
+options.mnemonic=I
+
+exit.text=Avsluta
+exit.shortdescription=Avsluta programmet
+exit.longdescription=Avslutar programmet
+exit.mnemonic=A
+
+
#######
# Edit
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-22 19:38:55
|
Revision: 5004
http://gridarta.svn.sourceforge.net/gridarta/?rev=5004&view=rev
Author: akirschbaum
Date: 2008-08-22 19:38:57 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Make tools menu work again.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -207,29 +207,6 @@
reloadFaces.accel=ctrl pressed F5
-########
-# Tools
-
-tools.text=Tools
-tools.mnemonic=T
-
-newScript.text=New Script
-newScript.mnemonic=N
-
-editScript.text=Edit Script
-editScript.mnemonic=E
-
-validateMap.text=Check map
-validateMap.mnemonic=M
-validateMap.shortdescription=Run map checker
-
-zoom.text=Zoom
-zoom.mnemonic=Z
-
-gc.text=Run Garbage Collection
-gc.mnemonic=G
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -187,29 +187,6 @@
reloadFaces.mnemonic=F
-########
-# Tools
-
-tools.text=Werkzeuge
-tools.mnemonic=W
-
-newScript.text=Neues Script
-newScript.mnemonic=N
-
-editScript.text=Script \xE4ndern
-editScript.mnemonic=S
-
-validateMap.text=Karte pr\xFCfen
-validateMap.mnemonic=K
-validateMap.shortdescription=Karte auf Fehler pr\xFCfen
-
-zoom.text=Zoom
-zoom.mnemonic=Z
-
-gc.text=Starte Garbage Collection
-gc.mnemonic=G
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -188,29 +188,6 @@
#reloadFaces.mnemonic=
-########
-# Tools
-
-tools.text=Outils
-tools.mnemonic=O
-
-newScript.text=Nouveau script
-newScript.mnemonic=N
-
-editScript.text=Editer script
-editScript.mnemonic=E
-
-#validateMap.text=
-#validateMap.mnemonic=
-#validateMap.shortdescription=
-
-zoom.text=Zoom
-zoom.mnemonic=Z
-
-gc.text=Garbage Collection
-gc.mnemonic=G
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -186,29 +186,6 @@
reloadFaces.mnemonic=L
-########
-# Tools
-
-tools.text=Verktyg
-tools.mnemonic=T
-
-newScript.text=Nytt script
-newScript.mnemonic=P
-
-editScript.text=Redigera Script
-editScript.mnemonic=E
-
-validateMap.text=Validera karta
-validateMap.mnemonic=V
-validateMap.shortdescription=K\xF6r kartvalideraren
-
-zoom.text=Zoom
-zoom.mnemonic=Z
-
-gc.text=G\xF6r garbage collection
-gc.mnemonic=G
-
-
#########
# Analyze
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -207,15 +207,6 @@
########
# Tools
-tools.text=Tools
-tools.mnemonic=T
-
-newScript.text=New Script
-newScript.mnemonic=N
-
-editScript.text=Edit Script
-editScript.mnemonic=E
-
controlServer.text=Control Server
controlServer.mnemonic=S
controlServer.name=Server
@@ -233,21 +224,11 @@
controlServerWarning.message=<html><h3>Warning!</h3><p>Java cannot cope with processes that use signal handlers doing lots of work.<br>The Daimonin Server is such a process.<br>Terminating the server using the Stop button will extremely likely<br>result in a Zombie process only killable via operating system tools.</p><p><strong>You have been warned!</strong></p></html>
controlCloseOkay=You may safely close this window.
-validateMap.text=Check map
-validateMap.mnemonic=M
-validateMap.shortdescription=Run map checker
-
cleanCompletelyBlockedSquares.text=Clean blocked squares
cleanCompletelyBlockedSquares.mnemonic=B
cleanCompletelyBlockedSquares.shortdescription=Cleans squares which are blocking view and passage and are only surrounded by such squares.
-zoom.text=Zoom
-zoom.mnemonic=Z
-gc.text=Run Garbage Collection
-gc.mnemonic=G
-
-
#######
# View
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -187,15 +187,6 @@
########
# Tools
-tools.text=Werkzeuge
-tools.mnemonic=W
-
-newScript.text=Neues Script
-newScript.mnemonic=P
-
-editScript.text=Script \xE4ndern
-#editScript.mnemonic=
-
#controlServer.text=
#controlServer.mnemonic=
#controlServer.name=
@@ -212,21 +203,11 @@
#controlServerWarning.message=
#controlCloseOkay=
-validateMap.text=Karte pr\xFCfen
-validateMap.mnemonic=K
-validateMap.shortdescription=Karte auf Fehler pr\xFCfen
-
#cleanCompletelyBlockedSquares.text=
#cleanCompletelyBlockedSquares.mnemonic=
#cleanCompletelyBlockedSquares.shortdescription=
-zoom.text=Zoom
-zoom.mnemonic=Z
-gc.text=Starte Garbage Collection
-gc.mnemonic=G
-
-
#######
# View
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -188,15 +188,6 @@
########
# Tools
-tools.text=Outils
-tools.mnemonic=O
-
-newScript.text=Nouveau script
-newScript.mnemonic=N
-
-editScript.text=Editer script
-editScript.mnemonic=E
-
#controlServer.text=
#controlServer.mnemonic=
#controlServer.name=
@@ -213,21 +204,11 @@
#controlServerWarning.message=
#controlCloseOkay=
-#validateMap.text=
-#validateMap.mnemonic=
-#validateMap.shortdescription=
-
#cleanCompletelyBlockedSquares.text=
#cleanCompletelyBlockedSquares.mnemonic=
#cleanCompletelyBlockedSquares.shortdescription=
-zoom.text=Zoom
-zoom.mnemonic=Z
-gc.text=Garbage Collection
-gc.mnemonic=G
-
-
#######
# View
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -189,15 +189,6 @@
########
# Tools
-tools.text=Verktyg
-tools.mnemonic=T
-
-newScript.text=Nytt script
-newScript.mnemonic=P
-
-editScript.text=Redigera Script
-editScript.mnemonic=E
-
controlServer.text=Styr server
controlServer.mnemonic=S
controlServer.name=Server
@@ -214,21 +205,11 @@
controlServerWarning.message=<html><h3>Varning!</h3><p>Java kan inte hantera processer som anv\xE4nder signalhanterare f\xF6r mycket arbete.<br>Daimoninservern \xE4r en s\xE5dan process.<br>Stopp av servern med "stoppa"-knappen kommer med stor sannolikhet<br>att resultera i en zombie-process som bara g\xE5r att ta bort med operativsystemets verktyg.</p><p><strong>Du har blivit varnad!</strong></p></html>
controlCloseOkay=Du kan st\xE4nga f\xF6nstret nu.
-validateMap.text=Validera karta
-validateMap.mnemonic=V
-validateMap.shortdescription=K\xF6r kartvalideraren
-
#cleanCompletelyBlockedSquares.text=
#cleanCompletelyBlockedSquares.mnemonic=
#cleanCompletelyBlockedSquares.shortdescription=
-zoom.text=Zoom
-zoom.mnemonic=Z
-gc.text=G\xF6r garbage collection
-gc.mnemonic=G
-
-
#######
# View
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -589,6 +589,29 @@
selectAll.accel=ctrl pressed A
+########
+# Tools
+
+tools.text=Verktyg
+tools.mnemonic=T
+
+newScript.text=New Script
+newScript.mnemonic=N
+
+editScript.text=Edit Script
+editScript.mnemonic=E
+
+validateMap.text=Validera karta
+validateMap.mnemonic=V
+validateMap.shortdescription=K\xF6r kartvalideraren
+
+zoom.text=Zoom
+zoom.mnemonic=Z
+
+gc.text=G\xF6r garbage collection
+gc.mnemonic=G
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -546,6 +546,29 @@
selectAll.mnemonic=W
+########
+# Tools
+
+tools.text=Werkzeuge
+tools.mnemonic=W
+
+newScript.text=Neues Script
+newScript.mnemonic=P
+
+editScript.text=Script \xE4ndern
+#editScript.mnemonic=
+
+validateMap.text=Karte pr\xFCfen
+validateMap.mnemonic=K
+validateMap.shortdescription=Karte auf Fehler pr\xFCfen
+
+zoom.text=Zoom
+zoom.mnemonic=Z
+
+gc.text=Starte Garbage Collection
+gc.mnemonic=G
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -545,6 +545,29 @@
selectAll.mnemonic=T
+########
+# Tools
+
+tools.text=Outils
+tools.mnemonic=O
+
+newScript.text=Nouveau script
+newScript.mnemonic=N
+
+editScript.text=Editer script
+editScript.mnemonic=E
+
+#validateMap.text=
+#validateMap.mnemonic=
+#validateMap.shortdescription=
+
+zoom.text=Zoom
+zoom.mnemonic=Z
+
+gc.text=Garbage Collection
+gc.mnemonic=G
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-22 19:19:32 UTC (rev 5003)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-22 19:38:57 UTC (rev 5004)
@@ -549,6 +549,29 @@
selectAll.mnemonic=M
+########
+# Tools
+
+tools.text=Verktyg
+tools.mnemonic=T
+
+newScript.text=Nytt script
+newScript.mnemonic=P
+
+editScript.text=Redigera Script
+editScript.mnemonic=E
+
+validateMap.text=Validera karta
+validateMap.mnemonic=V
+validateMap.shortdescription=K\xF6r kartvalideraren
+
+zoom.text=Zoom
+zoom.mnemonic=Z
+
+gc.text=G\xF6r garbage collection
+gc.mnemonic=G
+
+
#################
# Map Arch Panel
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-24 21:08:39
|
Revision: 5006
http://gridarta.svn.sourceforge.net/gridarta/?rev=5006&view=rev
Author: akirschbaum
Date: 2008-08-24 21:08:45 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Make help menu work again.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -252,19 +252,6 @@
#######
# Help
-help.text=Help
-help.mnemonic=H
-
-onlineHelp.text=Help
-onlineHelp.mnemonic=H
-onlineHelp.accel=F1
-
-tod.text=Tip Of The Day...
-tod.mnemonic=T
-
-about.text=About...
-about.mnemonic=A
-
about.title=About Gridarta for Crossfire
about=<html><h1 align="center">Gridarta for Crossfire</h1><p>Editor for Crossfire MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
aboutTab.title=About
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -230,18 +230,6 @@
#######
# Help
-help.text=Hilfe
-help.mnemonic=H
-
-onlineHelp.text=Hilfe
-onlineHelp.mnemonic=H
-
-tod.text=Tipp des Tages...
-tod.mnemonic=T
-
-about.text=\xDCber...
-about.mnemonic=B
-
about.title=\xDCber Gridarta f\xFCr Crossfire
about=<html><h1 align="center">Gridarta f\xFCr Crossfire</h1><p>Editor f\xFCr Crossfire MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
aboutTab.title=\xDCber
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -231,18 +231,6 @@
#######
# Help
-help.text=Aide
-help.mnemonic=A
-
-onlineHelp.text=Aide en ligne
-onlineHelp.mnemonic=A
-
-#tod.text=
-#tod.mnemonic=
-
-about.text=\xC0 propos...
-about.mnemonic=P
-
#about.title=
#about=
#aboutTab.title=
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -229,18 +229,6 @@
#######
# Help
-help.text=Hj\xE4lp
-help.mnemonic=H
-
-onlineHelp.text=Inbyggd hj\xE4lp
-onlineHelp.mnemonic=H
-
-tod.text=Dagens tips...
-tod.mnemonic=T
-
-about.text=Om...
-about.mnemonic=O
-
about.title=Om Gridarta for Crossfire
about=<html><h1 align="center">Gridarta for Crossfire</h1><p>Editor for Crossfire MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
aboutTab.title=Om
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -299,19 +299,6 @@
#######
# Help
-help.text=Help
-help.mnemonic=H
-
-onlineHelp.text=Help
-onlineHelp.mnemonic=H
-onlineHelp.accel=F1
-
-tod.text=Tip Of The Day...
-tod.mnemonic=T
-
-about.text=About...
-about.mnemonic=A
-
about.title=About Gridarta for Daimonin
about=<html><h1 align="center">Gridarta for Daimonin</h1><p>Editor for Daimonin MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright � 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
aboutTab.title=About
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -274,18 +274,6 @@
#######
# Help
-help.text=Hilfe
-help.mnemonic=H
-
-onlineHelp.text=Hilfe
-onlineHelp.mnemonic=H
-
-tod.text=Tipp des Tages...
-tod.mnemonic=T
-
-about.text=\xDCber...
-about.mnemonic=B
-
about.title=\xDCber Gridarta f\xFCr Daimonin
about=<html><h1 align="center">Gridarta f\xFCr Daimonin</h1><p>Editor f\xFCr Daimonin MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
aboutTab.title=\xDCber
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -271,18 +271,6 @@
#######
# Help
-help.text=Aide
-help.mnemonic=A
-
-onlineHelp.text=Aide en ligne
-onlineHelp.mnemonic=A
-
-#tod.text=
-#tod.mnemonic=
-
-about.text=\xC0 propos...
-about.mnemonic=P
-
#about.title=
#about=
#aboutTab.title=
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -272,18 +272,6 @@
#######
# Help
-help.text=Hj\xE4lp
-help.mnemonic=H
-
-onlineHelp.text=Inbyggd hj\xE4lp
-onlineHelp.mnemonic=H
-
-tod.text=Dagens tips...
-tod.mnemonic=T
-
-about.text=Om...
-about.mnemonic=O
-
about.title=Om Gridarta for Daimonin
about=<html><h1 align="center">Gridarta for Daimoin</h1><p>Editor for Daimonin MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2007</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
aboutTab.title=Om
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -612,6 +612,23 @@
gc.mnemonic=G
+#######
+# Help
+
+help.text=Help
+help.mnemonic=H
+
+onlineHelp.text=Help
+onlineHelp.mnemonic=H
+onlineHelp.accel=F1
+
+tod.text=Tip Of The Day...
+tod.mnemonic=T
+
+about.text=About...
+about.mnemonic=A
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -569,6 +569,22 @@
gc.mnemonic=G
+#######
+# Help
+
+help.text=Hilfe
+help.mnemonic=H
+
+onlineHelp.text=Hilfe
+onlineHelp.mnemonic=H
+
+tod.text=Tipp des Tages...
+tod.mnemonic=T
+
+about.text=\xDCber...
+about.mnemonic=B
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -568,6 +568,22 @@
gc.mnemonic=G
+#######
+# Help
+
+help.text=Aide
+help.mnemonic=A
+
+onlineHelp.text=Aide en ligne
+onlineHelp.mnemonic=A
+
+#tod.text=
+#tod.mnemonic=
+
+about.text=\xC0 propos...
+about.mnemonic=P
+
+
#################
# Map Arch Panel
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-24 20:58:57 UTC (rev 5005)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
@@ -572,6 +572,22 @@
gc.mnemonic=G
+#######
+# Help
+
+help.text=Hj\xE4lp
+help.mnemonic=H
+
+onlineHelp.text=Inbyggd hj\xE4lp
+onlineHelp.mnemonic=H
+
+tod.text=Dagens tips...
+tod.mnemonic=T
+
+about.text=Om...
+about.mnemonic=O
+
+
#################
# Map Arch Panel
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-24 21:26:43
|
Revision: 5007
http://gridarta.svn.sourceforge.net/gridarta/?rev=5007&view=rev
Author: akirschbaum
Date: 2008-08-24 21:26:51 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
Make resources menu work again.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -193,20 +193,6 @@
archetypes.mnemonic=A
-############
-# Resources
-
-resources.text=Resources
-resources.mnemonic=R
-
-collectArches.text=Collect Arches
-collectArches.mnemonic=A
-
-reloadFaces.text=Reload Faces
-reloadFaces.mnemonic=F
-reloadFaces.accel=ctrl pressed F5
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -174,19 +174,6 @@
archetypes.mnemonic=T
-############
-# Resources
-
-resources.text=Ressourcen
-resources.mnemonic=R
-
-collectArches.text=Archetypen sammeln
-collectArches.mnemonic=A
-
-reloadFaces.text=Grafiken neu laden
-reloadFaces.mnemonic=F
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -175,19 +175,6 @@
archetypes.mnemonic=A
-############
-# Resources
-
-resources.text=Ressources
-resources.mnemonic=R
-
-collectArches.text=Rassembler Arches
-collectArches.mnemonic=A
-
-#reloadFaces.text=
-#reloadFaces.mnemonic=
-
-
#########
# Analyze
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -173,19 +173,6 @@
#archetypes.mnemonic=
-############
-# Resources
-
-resources.text=Resurser
-resources.mnemonic=R
-
-collectArches.text=Skapa archetypsamling
-collectArches.mnemonic=A
-
-reloadFaces.text=Ladda om bilder
-reloadFaces.mnemonic=L
-
-
#########
# Analyze
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -190,20 +190,10 @@
############
# Resources
-resources.text=Resources
-resources.mnemonic=R
-
-collectArches.text=Collect Arches
-collectArches.mnemonic=A
-
collectSpells.text=Collect Spells
collectSpells.mnemonic=S
-reloadFaces.text=Reload Faces
-reloadFaces.mnemonic=F
-reloadFaces.accel=ctrl pressed F5
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -171,19 +171,10 @@
############
# Resources
-resources.text=Ressourcen
-resources.mnemonic=R
-
-collectArches.text=Archetypen sammeln
-collectArches.mnemonic=A
-
collectSpells.text=Zauberspr\xFCche sammeln
collectSpells.mnemonic=Z
-reloadFaces.text=Grafiken neu laden
-reloadFaces.mnemonic=F
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -172,19 +172,10 @@
############
# Resources
-resources.text=Ressources
-resources.mnemonic=R
-
-collectArches.text=Rassembler Arches
-collectArches.mnemonic=A
-
collectSpells.text=Rassembler Sorts
collectSpells.mnemonic=S
-#reloadFaces.text=
-#reloadFaces.mnemonic=
-
########
# Tools
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -173,19 +173,10 @@
############
# Resources
-resources.text=Resurser
-resources.mnemonic=R
-
-collectArches.text=Skapa archetypsamling
-collectArches.mnemonic=A
-
collectSpells.text=Sammanst\xE4ll trollformler
collectSpells.mnemonic=S
-reloadFaces.text=Ladda om bilder
-reloadFaces.mnemonic=L
-
########
# Tools
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -589,6 +589,20 @@
selectAll.accel=ctrl pressed A
+############
+# Resources
+
+resources.text=Resources
+resources.mnemonic=R
+
+collectArches.text=Collect Arches
+collectArches.mnemonic=A
+
+reloadFaces.text=Reload Faces
+reloadFaces.mnemonic=F
+reloadFaces.accel=ctrl pressed F5
+
+
########
# Tools
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -546,6 +546,19 @@
selectAll.mnemonic=W
+############
+# Resources
+
+resources.text=Ressourcen
+resources.mnemonic=R
+
+collectArches.text=Archetypen sammeln
+collectArches.mnemonic=A
+
+reloadFaces.text=Grafiken neu laden
+reloadFaces.mnemonic=F
+
+
########
# Tools
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -545,6 +545,19 @@
selectAll.mnemonic=T
+############
+# Resources
+
+resources.text=Ressources
+resources.mnemonic=R
+
+collectArches.text=Rassembler Arches
+collectArches.mnemonic=A
+
+#reloadFaces.text=
+#reloadFaces.mnemonic=
+
+
########
# Tools
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-24 21:08:45 UTC (rev 5006)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-24 21:26:51 UTC (rev 5007)
@@ -549,6 +549,19 @@
selectAll.mnemonic=M
+############
+# Resources
+
+resources.text=Resurser
+resources.mnemonic=R
+
+collectArches.text=Skapa archetypsamling
+collectArches.mnemonic=A
+
+reloadFaces.text=Ladda om bilder
+reloadFaces.mnemonic=L
+
+
########
# Tools
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-08-26 19:00:55
|
Revision: 5009
http://gridarta.svn.sourceforge.net/gridarta/?rev=5009&view=rev
Author: akirschbaum
Date: 2008-08-26 19:01:00 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Fix buttons in selected square control.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/action.properties
trunk/crossfire/src/cfeditor/messages.properties
trunk/crossfire/src/cfeditor/messages_de.properties
trunk/crossfire/src/cfeditor/messages_fr.properties
trunk/crossfire/src/cfeditor/messages_sv.properties
trunk/daimonin/src/daieditor/action.properties
trunk/daimonin/src/daieditor/messages.properties
trunk/daimonin/src/daieditor/messages_de.properties
trunk/daimonin/src/daieditor/messages_fr.properties
trunk/daimonin/src/daieditor/messages_sv.properties
trunk/src/app/net/sf/gridarta/action.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Added Paths:
-----------
trunk/resource/toolbarButtonGraphics/navigation/Down16.gif
trunk/resource/toolbarButtonGraphics/navigation/Up16.gif
Removed Paths:
-------------
trunk/crossfire/resource/icons/navigation/Bottom16.gif
trunk/crossfire/resource/icons/navigation/Down16.gif
trunk/crossfire/resource/icons/navigation/Top16.gif
trunk/crossfire/resource/icons/navigation/Up16.gif
Modified: trunk/crossfire/src/cfeditor/action.properties
===================================================================
--- trunk/crossfire/src/cfeditor/action.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/crossfire/src/cfeditor/action.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -132,12 +132,7 @@
update.url=http://www.eracc.com/files/crossfire/update.properties
-moveTileTop.icon=navigation/Top16
-moveTileUp.icon=navigation/Up16
-moveTileDown.icon=navigation/Down16
-moveTileBottom.icon=navigation/Bottom16
-
prefsRes.icon=general/Save24
prefsGUI.icon=development/Host24
prefsMapValidator.icon=general/Search24
Modified: trunk/crossfire/src/cfeditor/messages.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/crossfire/src/cfeditor/messages.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -278,15 +278,6 @@
mapwindowCursor.mnemonic=C
-#################
-# Map Arch Panel
-
-moveTileTop.shortdescription=Move Object to top of Square
-moveTileUp.shortdescription=Move Object up in Square
-moveTileDown.shortdescription=Move Object down in Square
-moveTileBottom.shortdescription=Move Object to bottom of Square
-
-
##########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_de.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/crossfire/src/cfeditor/messages_de.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -245,15 +245,6 @@
mapwindowCursor.mnemonic=C
-#################
-# Map Arch Panel
-
-moveTileTop.shortdescription=Objekt an den Anfang verschieben
-moveTileUp.shortdescription=Objekt nach oben verschieben
-moveTileDown.shortdescription=Objekt nach unten verschieben
-moveTileBottom.shortdescription=Object ans Ende verschieben
-
-
##########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_fr.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/crossfire/src/cfeditor/messages_fr.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -246,15 +246,6 @@
#mapwindowCursor.mnemonic=
-#################
-# Map Arch Panel
-
-#moveTileTop.shortdescription=
-#moveTileUp.shortdescription=
-#moveTileDown.shortdescription=
-#moveTileBottom.shortdescription=
-
-
##########
# Plugins
Modified: trunk/crossfire/src/cfeditor/messages_sv.properties
===================================================================
--- trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/crossfire/src/cfeditor/messages_sv.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -244,15 +244,6 @@
mapwindowCursor.mnemonic=M
-#################
-# Map Arch Panel
-
-#moveTileTop.shortdescription=
-moveTileUp.shortdescription=Flytta upp objekt
-moveTileDown.shortdescription=Flytta ner objekt
-#moveTileBottom.shortdescription=
-
-
##########
# Plugins
Modified: trunk/daimonin/src/daieditor/action.properties
===================================================================
--- trunk/daimonin/src/daieditor/action.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/daimonin/src/daieditor/action.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -137,12 +137,7 @@
update.url=http://daimonin.sourceforge.net/editor/update.properties
-moveTileTop.icon=navigation/Top16
-moveTileUp.icon=navigation/Up16
-moveTileDown.icon=navigation/Down16
-moveTileBottom.icon=navigation/Bottom16
-
prefsApp.icon=development/Application24
prefsDev.icon=development/Server24
prefsRes.icon=general/Save24
Modified: trunk/daimonin/src/daieditor/messages.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/daimonin/src/daieditor/messages.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -326,15 +326,6 @@
mapwindowCursor.mnemonic=C
-#################
-# Map Arch Panel
-
-moveTileTop.shortdescription=Move Object to top of Square
-moveTileUp.shortdescription=Move Object up in Square
-moveTileDown.shortdescription=Move Object down in Square
-moveTileBottom.shortdescription=Move Object to bottom of Square
-
-
#####################
# Preference Modules
Modified: trunk/daimonin/src/daieditor/messages_de.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_de.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/daimonin/src/daieditor/messages_de.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -294,15 +294,6 @@
mapwindowCursor.mnemonic=C
-#################
-# Map Arch Panel
-
-moveTileTop.shortdescription=Objekt an den Anfang verschieben
-moveTileUp.shortdescription=Objekt nach oben verschieben
-moveTileDown.shortdescription=Objekt nach unten verschieben
-moveTileBottom.shortdescription=Object ans Ende verschieben
-
-
#####################
# Preference Modules
Modified: trunk/daimonin/src/daieditor/messages_fr.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/daimonin/src/daieditor/messages_fr.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -291,15 +291,6 @@
#mapwindowCursor.mnemonic=
-#################
-# Map Arch Panel
-
-#moveTileTop.shortdescription=
-#moveTileUp.shortdescription=
-#moveTileDown.shortdescription=
-#moveTileBottom.shortdescription=
-
-
#####################
# Preference Modules
Modified: trunk/daimonin/src/daieditor/messages_sv.properties
===================================================================
--- trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/daimonin/src/daieditor/messages_sv.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -292,15 +292,6 @@
mapwindowCursor.mnemonic=M
-#################
-# Map Arch Panel
-
-#moveTileTop.shortdescription=
-moveTileUp.shortdescription=Flytta upp objekt
-moveTileDown.shortdescription=Flytta ner objekt
-#moveTileBottom.shortdescription=
-
-
#####################
# Preference Modules
Property changes on: trunk/resource/toolbarButtonGraphics/navigation/Down16.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/resource/toolbarButtonGraphics/navigation/Up16.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/app/net/sf/gridarta/action.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/action.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/src/app/net/sf/gridarta/action.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -84,3 +84,8 @@
mapTileChoose.icon=general/Open16
update.icon=general/Search16
+
+moveTileTop.icon=navigation/Top16
+moveTileUp.icon=navigation/Up16
+moveTileDown.icon=navigation/Down16
+moveTileBottom.icon=navigation/Bottom16
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -1094,3 +1094,11 @@
fileDialog.filter.unignored=All supported file types
openFileWantedNoArches.title=Cannot open map
openFileWantedNoArches.message=There are currently no archetypes available!\nYou need to have archetypes loaded before opening a map.
+
+
+##################
+# Selected Square
+moveTileTop.shortdescription=Move Object to top of Square
+moveTileUp.shortdescription=Move Object up in Square
+moveTileDown.shortdescription=Move Object down in Square
+moveTileBottom.shortdescription=Move Object to bottom of Square
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -950,3 +950,12 @@
fileDialog.filter.unignored=Alle Dateien
openFileWantedNoArches.title=Kann Karte nicht \xF6ffnen
openFileWantedNoArches.message=Es sind keine Archetypen verf\xFCgbar.\nDiese werden ben\xF6tigt, um eine Karte zu \xF6ffnen.
+
+
+##################
+# Selected Square
+
+moveTileTop.shortdescription=Objekt an den Anfang verschieben
+moveTileUp.shortdescription=Objekt nach oben verschieben
+moveTileDown.shortdescription=Objekt nach unten verschieben
+moveTileBottom.shortdescription=Object ans Ende verschieben
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -946,3 +946,12 @@
#fileDialog.filter.unignored=
#openFileWantedNoArches.title=
#openFileWantedNoArches.message=
+
+
+##################
+# Selected Square
+
+#moveTileTop.shortdescription=
+#moveTileUp.shortdescription=
+#moveTileDown.shortdescription=
+#moveTileBottom.shortdescription=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-24 21:29:33 UTC (rev 5008)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2008-08-26 19:01:00 UTC (rev 5009)
@@ -950,3 +950,11 @@
#fileDialog.filter.unignored=
openFileWantedNoArches.title=Kan inte \xF6ppna karta
openFileWantedNoArches.message=Det finns inga arketyper (arches) tillg\xE4ngliga!\nDu m\xE5ste ha arketyperna innan du kan \xF6ppna en karta.\nL\xE4s i online-dokumentationen hur du kan skaffa arketypfiler..
+
+
+##################
+# Selected Square
+#moveTileTop.shortdescription=
+moveTileUp.shortdescription=Flytta upp objekt
+moveTileDown.shortdescription=Flytta ner objekt
+#moveTileBottom.shortdescription=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X