Menu
▾
▴
gridarta-commit
|
From: <der...@us...> - 2006-05-28 23:21:04
|
Revision: 66 Author: derdanny Date: 2006-05-28 16:20:56 -0700 (Sun, 28 May 2006) ViewCVS: http://svn.sourceforge.net/gridarta/?rev=66&view=rev Log Message: ----------- Fixed #1496473 (Map contents when closing unsaved maps are lost). Modified Paths: -------------- trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-05-28 22:05:07 UTC (rev 65) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-05-28 23:20:56 UTC (rev 66) @@ -25,9 +25,8 @@ package daieditor; -import static net.sf.japi.swing.ActionFactory.getFactory; +import static daieditor.CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT; import static daieditor.CMainView.MAP_TILE_LIST_BOTTOM_KEY; -import static daieditor.CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT; import static daieditor.IGUIConstants.TILE_EDIT_NONE; import daieditor.arch.ArchObject; import daieditor.arch.ArchObjectParser; @@ -112,6 +111,7 @@ import static javax.swing.KeyStroke.getKeyStroke; import javax.swing.filechooser.FileFilter; import net.sf.japi.swing.ActionFactory; +import static net.sf.japi.swing.ActionFactory.getFactory; import net.sf.japi.swing.TipOfTheDayManager; import net.sf.japi.swing.prefs.PreferencesGroup; import static net.sf.japi.swing.prefs.PreferencesPane.showPreferencesDialog; @@ -927,9 +927,10 @@ */ public void closeView(final CMapViewIFrame mapViewIFrame) { final MapControl mapControl = mapViewIFrame.getMapControl(); - mapControl.closeView(mapViewIFrame); - if (mapControl.nViews() == 0) { + if (mapControl.nViews() <= 1) { closeLevel(mapControl); + } else { + mapControl.closeView(mapViewIFrame); } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <chr...@us...> - 2006-09-24 16:16:58
|
Revision: 399
http://svn.sourceforge.net/gridarta/?rev=399&view=rev
Author: christianhujer
Date: 2006-09-24 09:16:50 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
Changed default creator name to be the system user name.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-09-24 16:13:39 UTC (rev 398)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-09-24 16:16:50 UTC (rev 399)
@@ -161,7 +161,7 @@
public static final String PREFS_USERNAME = "username";
/** Preferences default value for username. */
- public static final String PREFS_USERNAME_DEFAULT = "Unknown Combat Dummy";
+ public static final String PREFS_USERNAME_DEFAULT = System.getProperty("user.name");
/** Preferences key for language. */
public static final String PREFS_LANGUAGE = "language";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2006-10-06 19:54:53
|
Revision: 480
http://svn.sourceforge.net/gridarta/?rev=480&view=rev
Author: christianhujer
Date: 2006-10-06 12:54:47 -0700 (Fri, 06 Oct 2006)
Log Message:
-----------
Final fix for Mantis #0000475: Regression: Grid Visibility doesn't work
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-10-06 19:47:14 UTC (rev 479)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-10-06 19:54:47 UTC (rev 480)
@@ -850,6 +850,7 @@
*/
public void setGridVisible(final boolean gridVisible) {
this.gridVisible = gridVisible;
+ refreshCurrentMap();
}
/** Invoked when user wants to begin editing a new (empty) map. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-02 11:52:03
|
Revision: 791
http://svn.sourceforge.net/gridarta/?rev=791&view=rev
Author: akirschbaum
Date: 2006-12-02 03:52:03 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:47:48 UTC (rev 790)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:52:03 UTC (rev 791)
@@ -447,8 +447,7 @@
System.out.println(libFile);
}
}
- if (libFiles != null && libFiles.length > 0 && ACTION_FACTORY.showOnetimeConfirmDialog(mainView, YES_NO_OPTION, INFORMATION_MESSAGE, "oldLibsFound", libs.toString()) == YES_OPTION)
- {
+ if (libFiles != null && libFiles.length > 0 && ACTION_FACTORY.showOnetimeConfirmDialog(mainView, YES_NO_OPTION, INFORMATION_MESSAGE, "oldLibsFound", libs.toString()) == YES_OPTION) {
Arrays.sort(libFiles);
for (final File libFile : libFiles) {
libFile.delete();
@@ -954,15 +953,13 @@
ACTION_FACTORY.showMessageDialog(mainView, "closePickmapNoPickmaps");
} else {
// if pickmap was modified, ask for confirmation:
- if (!activePickmap.isLevelChanged() || ACTION_FACTORY.showQuestionDialog(mainView, "confirmClosePickmap", activePickmap.getMapFileName()))
- {
+ if (!activePickmap.isLevelChanged() || ACTION_FACTORY.showQuestionDialog(mainView, "confirmClosePickmap", activePickmap.getMapFileName())) {
final File pickmapFile = activePickmap.getMapFile();
// close pickmap
closeLevel(activePickmap, true);
// also delete pickmap file?
- if (ACTION_FACTORY.showQuestionDialog(mainView, "confirmDeletePickmap", activePickmap.getMapFileName(), activePickmap.getMapFileName()))
- {
+ if (ACTION_FACTORY.showQuestionDialog(mainView, "confirmDeletePickmap", activePickmap.getMapFileName(), activePickmap.getMapFileName())) {
pickmapFile.delete();
}
}
@@ -1372,8 +1369,7 @@
if (returnVal == JFileChooser.APPROVE_OPTION) {
hasChangedDir = true; // user has chosen an active dir
final File file = fileChooser.getSelectedFile();
- if (!file.exists() || ACTION_FACTORY.showConfirmDialog(mainView, WARNING_MESSAGE, OK_CANCEL_OPTION, "overwriteOtherFile", file.getName()) == OK_OPTION)
- {
+ if (!file.exists() || ACTION_FACTORY.showConfirmDialog(mainView, WARNING_MESSAGE, OK_CANCEL_OPTION, "overwriteOtherFile", file.getName()) == OK_OPTION) {
level.saveAs(file);
level.setMapFileName(file.getName()); // window title and file name
//level.setMapName(file.getName()); // map name (internal)
@@ -1423,8 +1419,7 @@
if (!filename.endsWith(".png")) {
filename += ".png";
}
- if (!new File(filename).exists() || ACTION_FACTORY.showConfirmDialog(mainView, YES_NO_OPTION, WARNING_MESSAGE, "overwriteOtherFile", filename) == YES_OPTION)
- {
+ if (!new File(filename).exists() || ACTION_FACTORY.showConfirmDialog(mainView, YES_NO_OPTION, WARNING_MESSAGE, "overwriteOtherFile", filename) == YES_OPTION) {
mc.getMapViewFrame().printFullImage(filename);
}
}
@@ -1728,8 +1723,7 @@
ACTION_FACTORY.showMessageDialog(mainView, "revertPickmapNoPickmaps");
} else {
// ask for confirmation
- if (!activePickmap.isLevelChanged() || ACTION_FACTORY.showQuestionDialog(mainView, "confirmRevertPickmap", activePickmap.getMapFileName()))
- {
+ if (!activePickmap.isLevelChanged() || ACTION_FACTORY.showQuestionDialog(mainView, "confirmRevertPickmap", activePickmap.getMapFileName())) {
final File mfile = activePickmap.getMapFile(); // store file
if (!mfile.exists()) {
ACTION_FACTORY.showMessageDialog(mainView, "pickmapRevertGone", activePickmap.getMapFileName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-03 13:33:26
|
Revision: 807
http://svn.sourceforge.net/gridarta/?rev=807&view=rev
Author: akirschbaum
Date: 2006-12-03 05:33:26 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
Use log4j.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-03 13:23:57 UTC (rev 806)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-03 13:33:26 UTC (rev 807)
@@ -88,8 +88,6 @@
import java.util.ListIterator;
import java.util.MissingResourceException;
import static java.util.ResourceBundle.getBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.prefs.Preferences;
import static java.util.prefs.Preferences.userNodeForPackage;
import javax.swing.AbstractAction;
@@ -128,6 +126,7 @@
import net.sf.japi.util.filter.file.EndingFileFilter;
import net.sf.japi.util.filter.file.Factory;
import net.sf.japi.util.filter.file.GlobFileFilter;
+import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -144,7 +143,7 @@
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
/** Logger. */
- private static final Logger log = Logger.getLogger("daieditor");
+ private static final Logger log = Logger.getLogger(CMainControl.class);
/** Preferences. */
private static final Preferences prefs = userNodeForPackage(CMainControl.class);
@@ -1192,7 +1191,7 @@
}
}
} catch (final IOException e) {
- log.log(Level.WARNING, "canonIOE", e);
+ log.warn(ACTION_FACTORY.format("canonIOE", e));
}
try {
@@ -1339,7 +1338,7 @@
*/
public boolean saveLevelAsWanted(final MapControl level) {
if (level == null) {
- log.log(Level.WARNING, "saveLevelAsWithNull");
+ log.warn(ACTION_FACTORY.getString("saveLevelAsWithNull"));
return false;
}
@@ -1447,7 +1446,9 @@
filename += ".png";
}
mapc.getMapViewFrame().printFullImage(filename);
- log.log(Level.INFO, "imageCreated", new Object[]{filename, mapc.getMapFileName()});
+ if (log.isInfoEnabled()) {
+ log.info(ACTION_FACTORY.format("imageCreated", filename, mapc.getMapFileName()));
+ }
} catch (final IOException e) {
ACTION_FACTORY.showMessageDialog(mainView, "createImgIOException", filename);
}
@@ -1527,10 +1528,12 @@
appExitNotify();
mainView.dispose();
if (prefs.getBoolean(PREFS_SYSTEM_EXIT, PREFS_SYSTEM_EXIT_DEFAULT)) {
- log.log(Level.FINE, "exitWithExit");
+ if (log.isDebugEnabled()) {
+ log.debug(ACTION_FACTORY.getString("exitWithExit"));
+ }
System.exit(0);
} else {
- log.log(Level.FINE, "exitWithoutExit");
+ log.debug(ACTION_FACTORY.getString("exitWithoutExit"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-03 15:50:34
|
Revision: 819
http://svn.sourceforge.net/gridarta/?rev=819&view=rev
Author: akirschbaum
Date: 2006-12-03 07:50:35 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
Make field private.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-03 15:44:52 UTC (rev 818)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-03 15:50:35 UTC (rev 819)
@@ -194,7 +194,7 @@
private final CMainView mainView;
/** Bit field of edit types to show only. */
- int tileEdit;
+ private int tileEdit;
/** Bit field of edit types to show transparent. */
private int alphaType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-04 21:59:42
|
Revision: 889
http://svn.sourceforge.net/gridarta/?rev=889&view=rev
Author: akirschbaum
Date: 2006-12-04 13:59:42 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
Make fields private.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-04 21:54:21 UTC (rev 888)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-04 21:59:42 UTC (rev 889)
@@ -151,11 +151,11 @@
/** Singleton instance reference. */
private static CMainControl instance;
- public static final String DOCU_VERSION_KEY = "docuVersion";
+ private static final String DOCU_VERSION_KEY = "docuVersion";
public static final String LOAD_ARCH_COLL = "loadArchFromCollection";
- public static final String PICKMAPS_LOCKED = "pickmapsLocked";
+ private static final String PICKMAPS_LOCKED = "pickmapsLocked";
/** Preferences key for username. */
public static final String PREFS_USERNAME = "username";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-04 22:12:58
|
Revision: 892
http://svn.sourceforge.net/gridarta/?rev=892&view=rev
Author: akirschbaum
Date: 2006-12-04 14:12:58 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
Unify comment.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-04 22:11:29 UTC (rev 891)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-04 22:12:58 UTC (rev 892)
@@ -207,7 +207,7 @@
/** The Face Objects. */
private FaceObjects faceObjects;
- // icons for the map and arch pictures . x= rectangle, normal = iso
+ // icons for the map and arch pictures .
public static ImageIcon mapSelIcon;
public static ImageIcon mapPreSelIcon;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-06 23:03:57
|
Revision: 931
http://svn.sourceforge.net/gridarta/?rev=931&view=rev
Author: akirschbaum
Date: 2006-12-06 15:03:49 -0800 (Wed, 06 Dec 2006)
Log Message:
-----------
Unify comment.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-06 23:01:45 UTC (rev 930)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-06 23:03:49 UTC (rev 931)
@@ -248,7 +248,8 @@
private String strMediaDir;
- private String strImageDir; // directory for saving map images
+ /** Directory for saving map images. */
+ private String strImageDir;
// this flag indicates weither the user has ever changed the
// active dir since the program started
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-12 03:37:38
|
Revision: 1020
http://svn.sourceforge.net/gridarta/?rev=1020&view=rev
Author: akirschbaum
Date: 2006-12-10 08:33:43 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
Rename variable name.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 16:23:38 UTC (rev 1019)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-10 16:33:43 UTC (rev 1020)
@@ -1426,16 +1426,16 @@
* @param file the png image file to create
*/
public void createImageWanted(final File file) {
- final MapControl mapc = currentMap; // control of current map
+ final MapControl mapControl = currentMap; // control of current map
- if (mapc == null) {
+ if (mapControl == null) {
// there is no map open (should not happen due to disabled menus)
ACTION_FACTORY.showMessageDialog(mainView, "createImgNoMap");
} else {
try {
- mapc.getMapViewFrame().printFullImage(file);
+ mapControl.getMapViewFrame().printFullImage(file);
if (log.isInfoEnabled()) {
- log.info(ACTION_FACTORY.format("imageCreated", file, mapc.getMapFileName()));
+ log.info(ACTION_FACTORY.format("imageCreated", file, mapControl.getMapFileName()));
}
} catch (final IOException e) {
ACTION_FACTORY.showMessageDialog(mainView, "createImgIOException", file);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-14 22:03:54
|
Revision: 1067
http://svn.sourceforge.net/gridarta/?rev=1067&view=rev
Author: akirschbaum
Date: 2006-12-14 14:03:54 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
Unify (remove) static import statement.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-14 22:00:37 UTC (rev 1066)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-14 22:03:54 UTC (rev 1067)
@@ -27,7 +27,6 @@
import static daieditor.CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT;
import static daieditor.CMainView.MAP_TILE_LIST_BOTTOM_KEY;
-import static daieditor.IGUIConstants.TILE_EDIT_NONE;
import daieditor.gameobject.ArchetypeParser;
import daieditor.gameobject.ArchetypeSet;
import daieditor.gameobject.GameObject;
@@ -615,7 +614,7 @@
* @return <code>true</code> if a tileEdit value is set, otherwise <code>false</code>.
*/
public boolean isTileEditSet() {
- return (tileEdit & TILE_EDIT_NONE) == 0 && tileEdit != 0;
+ return (tileEdit & IGUIConstants.TILE_EDIT_NONE) == 0 && tileEdit != 0;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2006-12-20 00:32:40
|
Revision: 1193
http://svn.sourceforge.net/gridarta/?rev=1193&view=rev
Author: christianhujer
Date: 2006-12-19 16:32:40 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
Added todo.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-20 00:24:40 UTC (rev 1192)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-20 00:32:40 UTC (rev 1193)
@@ -1643,6 +1643,7 @@
}
if (!newfile.exists() || newfile.isDirectory()) {
// The path is wrong
+ // TODO: Differ between non-existing paths, wrongly formatted paths and directories - give more info to the user.
ACTION_FACTORY.showMessageDialog(mainView, "enterExitInvalidPath", newfile.getAbsolutePath());
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2006-12-22 21:25:14
|
Revision: 1213
http://svn.sourceforge.net/gridarta/?rev=1213&view=rev
Author: akirschbaum
Date: 2006-12-22 13:25:11 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Remove commented code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-22 21:19:33 UTC (rev 1212)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-22 21:25:11 UTC (rev 1213)
@@ -430,9 +430,6 @@
animationObjects = new AnimationObjects();
faceObjects = new FaceObjects();
- // read in the type & type field definitions
- //loadTypeDef();
-
// load the list with archtype-data from "types.txt"
typeList = new CFArchTypeList();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2006-12-23 15:14:13
|
Revision: 1225
http://svn.sourceforge.net/gridarta/?rev=1225&view=rev
Author: christianhujer
Date: 2006-12-23 07:14:13 -0800 (Sat, 23 Dec 2006)
Log Message:
-----------
Added missing @Deprecated annotation.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-23 14:07:07 UTC (rev 1224)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-23 15:14:13 UTC (rev 1225)
@@ -811,7 +811,7 @@
*
* @deprecated this has nothing to do with MainControl and should be refactored
*/
- public void addArchPanelArchetype(@NotNull final String panelName, @NotNull final String folderName, @NotNull final GameObject arch) {
+ @Deprecated public void addArchPanelArchetype(@NotNull final String panelName, @NotNull final String folderName, @NotNull final GameObject arch) {
mainView.addArchPanelArchetype(panelName, folderName, arch);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-01-20 18:37:58
|
Revision: 1633
http://svn.sourceforge.net/gridarta/?rev=1633&view=rev
Author: akirschbaum
Date: 2007-01-20 10:37:59 -0800 (Sat, 20 Jan 2007)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-01-20 18:19:27 UTC (rev 1632)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-01-20 18:37:59 UTC (rev 1633)
@@ -1675,7 +1675,6 @@
return copybuffer.isEmpty();
}
-
/**
* Sets the given view to be the current level view.
* @param view The new current level view.
@@ -1716,7 +1715,6 @@
return currentMap != null && currentMap.isPlainSaveEnabled();
}
-
public static ImageIcon getUnknownTileIcon() {
return unknownTileIcon;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-01-25 21:40:12
|
Revision: 1711
http://svn.sourceforge.net/gridarta/?rev=1711&view=rev
Author: akirschbaum
Date: 2007-01-25 13:40:13 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
Remove duplicate code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-01-25 21:38:16 UTC (rev 1710)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-01-25 21:40:13 UTC (rev 1711)
@@ -1213,7 +1213,7 @@
gameObjectsWithoutArchetype.add(gameObject);
undefinedArchetypeNames.add(gameObject.getArchetypeName());
}
- gameObject.setArchetype(archetype);
+
// Ok, now is attached to default arch and loaded png
// NOW we post parse the object...
// (We calculate only edit types that are active, to save time)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-02-06 22:35:22
|
Revision: 1855
http://svn.sourceforge.net/gridarta/?rev=1855&view=rev
Author: christianhujer
Date: 2007-02-06 13:58:31 -0800 (Tue, 06 Feb 2007)
Log Message:
-----------
Fixed compile time bug - made too much final (sorry).
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-02-06 21:53:50 UTC (rev 1854)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-02-06 21:58:31 UTC (rev 1855)
@@ -139,7 +139,7 @@
private static final Preferences prefs = Preferences.userNodeForPackage(CMainControl.class);
/** Singleton instance reference. */
- private static final CMainControl instance;
+ private static CMainControl instance;
private static final String DOCU_VERSION_KEY = "docuVersion";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-03-31 16:38:13
|
Revision: 2039
http://svn.sourceforge.net/gridarta/?rev=2039&view=rev
Author: akirschbaum
Date: 2007-03-31 09:38:15 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-03-31 16:36:08 UTC (rev 2038)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-03-31 16:38:15 UTC (rev 2039)
@@ -835,8 +835,7 @@
fireMapCreatedEvent(mapControl);
levels.add(mapControl);
if (view) {
- final MapViewIFrame mapViewIFrame = mapControl.getMapViewFrame();
- fireMapViewCreatedEvent(mapViewIFrame);
+ fireMapViewCreatedEvent(mapControl.getMapViewFrame());
setCurrentLevel(mapControl);
refreshMenusAndToolbars();
}
@@ -1073,8 +1072,7 @@
if (levelFile != null && can.equals(levelFile.getCanonicalFile())) {
if (view) {
mapControl.createView(null);
- final MapViewIFrame mapViewIFrame = mapControl.getMapViewFrame();
- fireMapViewCreatedEvent(mapViewIFrame);
+ fireMapViewCreatedEvent(mapControl.getMapViewFrame());
setCurrentLevel(mapControl);
}
return mapControl;
@@ -1292,8 +1290,7 @@
/** Invoked when user wants to create a new view of the current level. */
public void mapCreateView(@NotNull final MapControl mapControl) {
mapControl.createView(null);
- final MapViewIFrame mapViewIFrame = mapControl.getMapViewFrame();
- fireMapViewCreatedEvent(mapViewIFrame);
+ fireMapViewCreatedEvent(mapControl.getMapViewFrame());
}
private PreferencesGroup prefsGroup;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-03-31 16:39:27
|
Revision: 2040
http://svn.sourceforge.net/gridarta/?rev=2040&view=rev
Author: akirschbaum
Date: 2007-03-31 09:39:28 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-03-31 16:38:15 UTC (rev 2039)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-03-31 16:39:28 UTC (rev 2040)
@@ -1071,8 +1071,7 @@
final File levelFile = mapControl.getMapFile();
if (levelFile != null && can.equals(levelFile.getCanonicalFile())) {
if (view) {
- mapControl.createView(null);
- fireMapViewCreatedEvent(mapControl.getMapViewFrame());
+ mapCreateView(mapControl);
setCurrentLevel(mapControl);
}
return mapControl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-01 00:20:28
|
Revision: 2065
http://svn.sourceforge.net/gridarta/?rev=2065&view=rev
Author: akirschbaum
Date: 2007-03-31 17:20:27 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-01 00:15:23 UTC (rev 2064)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-01 00:20:27 UTC (rev 2065)
@@ -832,7 +832,7 @@
public MapControl newLevel(final List<GameObject> objects, final MapArchObject maparch, final boolean view, final Point initial) {
// Create a new level control and set the level view from that
if (view) {
- setStatusText("Creating new map " + maparch.getMapName());
+ setStatusText("Creating new map " + maparch.getMapDisplayName());
}
final MapControl mapControl = new MapControl(this, objects, maparch, false, initial, view);
fireMapCreatedEvent(mapControl);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-01 16:18:57
|
Revision: 2074
http://svn.sourceforge.net/gridarta/?rev=2074&view=rev
Author: akirschbaum
Date: 2007-04-01 09:18:42 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Remove commented debugging statement.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-01 16:17:47 UTC (rev 2073)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-01 16:18:42 UTC (rev 2074)
@@ -1044,7 +1044,6 @@
*/
public void openFiles(final Iterable<String> filenames) {
for (final String filename : filenames) {
- //System.err.println("Opening: " + filename);
final File file = new File(filename);
final boolean isLua = filename.toLowerCase().endsWith(".lua");
if (file.isFile()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-02 20:44:43
|
Revision: 2087
http://svn.sourceforge.net/gridarta/?rev=2087&view=rev
Author: akirschbaum
Date: 2007-04-02 13:44:43 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-02 20:41:44 UTC (rev 2086)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-02 20:44:43 UTC (rev 2087)
@@ -836,10 +836,10 @@
setStatusText("Creating new map " + mapArchObject.getMapDisplayName());
final MapControl mapControl = newMap(objects, mapArchObject);
+ levels.add(mapControl);
final MapViewIFrame mapViewIFrame = mapControl.createView(viewPosition);
fireMapCreatedEvent(mapControl);
fireMapViewCreatedEvent(mapViewIFrame);
- levels.add(mapControl);
setCurrentLevel(mapControl);
refreshMenusAndToolbars();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-02 20:47:52
|
Revision: 2088
http://svn.sourceforge.net/gridarta/?rev=2088&view=rev
Author: akirschbaum
Date: 2007-04-02 13:47:52 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-02 20:44:43 UTC (rev 2087)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-02 20:47:52 UTC (rev 2088)
@@ -939,11 +939,12 @@
// special case: close a pickmap
mainView.getPickmapChooserControl().closePickmap(mapControl);
} else {
- while (mapControl.getMapViewFrame() != null) {
+ while (mapControl.nViews() > 0) {
final MapViewIFrame mapViewIFrame = mapControl.getMapViewFrame();
fireMapViewClosingEvent(mapViewIFrame);
mapControl.closeView(mapViewIFrame);
}
+
fireMapClosingEvent(mapControl);
levels.remove(mapControl);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-04 00:33:16
|
Revision: 2131
http://svn.sourceforge.net/gridarta/?rev=2131&view=rev
Author: akirschbaum
Date: 2007-04-03 14:48:12 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-03 21:47:11 UTC (rev 2130)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-03 21:48:12 UTC (rev 2131)
@@ -1588,7 +1588,7 @@
* <code>null</code> if no map is open
*/
@Nullable public MapView<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic> getCurrentMapView() {
- return currentMap == null ? null : currentMap.getMapViewFrame();
+ return mainView == null ? null : mainView.getCurrentMapView();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-04 18:51:43
|
Revision: 2144
http://svn.sourceforge.net/gridarta/?rev=2144&view=rev
Author: akirschbaum
Date: 2007-04-04 11:51:44 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Unify comment.
Modified Paths:
--------------
trunk/daimonin/src/daieditor/CMainControl.java
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-04-04 18:44:46 UTC (rev 2143)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-04-04 18:51:44 UTC (rev 2144)
@@ -948,7 +948,7 @@
mapPreviewAccessory.attachTo(fileChooser);
}
- /** The user wants to open a map file. */
+ /** Invoked when user wants to open a file. */
public void open() {
openFileWanted(true);
}
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