Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2007-04-04 18:17:31
|
Revision: 2138
http://svn.sourceforge.net/gridarta/?rev=2138&view=rev
Author: akirschbaum
Date: 2007-04-04 11:17:32 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Simplify expression.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-04 18:16:25 UTC (rev 2137)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-04 18:17:32 UTC (rev 2138)
@@ -405,7 +405,7 @@
getMainView().setMapTileListBottom(prefs.getBoolean(CMainView.MAP_TILE_LIST_BOTTOM_KEY, CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT));
// docu version
- if (IGUIConstants.DOCU_VERSION > new Integer(prefs.getInt(DOCU_VERSION_KEY, 0))) {
+ if (IGUIConstants.DOCU_VERSION > prefs.getInt(DOCU_VERSION_KEY, 0)) {
// remember to open docu
autoPopupDocu = true;
// update docu version right now, because we want the help popup only one time
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:44:45
|
Revision: 2143
http://svn.sourceforge.net/gridarta/?rev=2143&view=rev
Author: akirschbaum
Date: 2007-04-04 11:44:46 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-04 18:41:26 UTC (rev 2142)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-04 18:44:46 UTC (rev 2143)
@@ -275,8 +275,8 @@
mainView.about();
}
- /** Collect crossfire archetypes. */
- public void collectArches() {
+ /** Collect CF arches, animations and faces. */
+ @ActionMethod public void collectArches() {
getMainView().update(getMainView().getGraphics());
if (archetypeSet.getLoadStatus() != ArchetypeSet.LoadStatus.COMPLETE) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-04-21 00:33:43
|
Revision: 2224
http://svn.sourceforge.net/gridarta/?rev=2224&view=rev
Author: akirschbaum
Date: 2007-04-20 12:18:47 -0700 (Fri, 20 Apr 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-20 19:14:20 UTC (rev 2223)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-04-20 19:18:47 UTC (rev 2224)
@@ -206,6 +206,15 @@
return instance;
}
+
+ /**
+ * Get the Animation Objects.
+ * @return animationObjects
+ */
+ public AnimationObjects getAnimationObjects() {
+ return animationObjects;
+ }
+
/** {@inheritDoc} */
public FaceObjects getFaceObjects() {
return faceObjects;
@@ -999,10 +1008,6 @@
return archetypeParser;
}
- public AnimationObjects getAnimationObjects() {
- return animationObjects;
- }
-
public String getImageSet() {
return imageSet;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-05-17 12:02:07
|
Revision: 2527
http://svn.sourceforge.net/gridarta/?rev=2527&view=rev
Author: christianhujer
Date: 2007-05-17 05:02:08 -0700 (Thu, 17 May 2007)
Log Message:
-----------
Delayed initialization of RecentManager after archetypes have been loaded to fix NPE bug with uncached recent icons.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-05-17 12:01:02 UTC (rev 2526)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-05-17 12:02:08 UTC (rev 2527)
@@ -227,6 +227,7 @@
recentManager = new RecentManager(this);
init();
archetypeSet.loadArchetypes(archetypeParser);
+ recentManager.initRecent();
}
/**
@@ -291,8 +292,6 @@
mainActions.init();
mainView.updateFocus(false);
-
- recentManager.initRecent();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-05-19 09:17:24
|
Revision: 2597
http://svn.sourceforge.net/gridarta/?rev=2597&view=rev
Author: akirschbaum
Date: 2007-05-19 02:17:25 -0700 (Sat, 19 May 2007)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-05-19 09:07:29 UTC (rev 2596)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-05-19 09:17:25 UTC (rev 2597)
@@ -824,6 +824,7 @@
/** Exits from the program. */
void doExit() {
appExitNotify();
+ mainView.dispose();
if (prefs.getBoolean(PREFS_SYSTEM_EXIT, PREFS_SYSTEM_EXIT_DEFAULT)) {
if (log.isDebugEnabled()) {
log.debug(ACTION_FACTORY.getString("logExitWithExit"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-09-07 18:04:35
|
Revision: 2880
http://gridarta.svn.sourceforge.net/gridarta/?rev=2880&view=rev
Author: akirschbaum
Date: 2007-09-07 11:04:37 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Unify order of methods.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-06 19:29:32 UTC (rev 2879)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-07 18:04:37 UTC (rev 2880)
@@ -838,14 +838,14 @@
return emptyTileIcon;
}
+ public static ImageIcon getNofaceTileIcon() {
+ return nofaceTileIcon;
+ }
+
public static ImageIcon getNoarchTileIcon() {
return noarchTileIcon;
}
- public static ImageIcon getNofaceTileIcon() {
- return nofaceTileIcon;
- }
-
public static ImageIcon getMapSelIcon() {
return mapSelIcon;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-09-08 14:08:03
|
Revision: 2966
http://gridarta.svn.sourceforge.net/gridarta/?rev=2966&view=rev
Author: akirschbaum
Date: 2007-09-08 07:08:05 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Fix unchecked warning.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-08 13:49:47 UTC (rev 2965)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-08 14:08:05 UTC (rev 2966)
@@ -282,7 +282,7 @@
* @return A MapValidator that delegates to other map validators.
*/
private static DelegatingMapValidator<GameObject, MapArchObject, Archetype> createMapValidators() {
- final DelegatingMapValidator mapValidators = new DelegatingMapValidator();
+ final DelegatingMapValidator<GameObject, MapArchObject, Archetype> mapValidators = new DelegatingMapValidator<GameObject, MapArchObject, Archetype>();
mapValidators.add(
new ConnectedInsideContainerChecker(),
new ConnectedPickableChecker(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-09-09 14:25:22
|
Revision: 3035
http://gridarta.svn.sourceforge.net/gridarta/?rev=3035&view=rev
Author: akirschbaum
Date: 2007-09-09 07:25:25 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
Extract duplicated code into function.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-09 14:10:24 UTC (rev 3034)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-09 14:25:25 UTC (rev 3035)
@@ -419,10 +419,7 @@
super.setEditType(editType);
mapManager.addEditType(editType);
- final MapControl currentMap = getCurrentMap();
- if (currentMap != null) {
- currentMap.repaint();
- }
+ refreshCurrentMap();
}
/** {@inheritDoc} */
@@ -432,11 +429,7 @@
}
super.unsetEditType(editType);
-
- final MapControl currentMap = getCurrentMap();
- if (currentMap != null) {
- currentMap.repaint();
- }
+ refreshCurrentMap();
}
public void onlineHelp() {
@@ -520,6 +513,14 @@
return loadFromArchive;
}
+ /** Refresh the active map view, if there is one. */
+ public void refreshCurrentMap() {
+ final MapControl currentMap = getCurrentMap();
+ if (currentMap != null) {
+ currentMap.repaint(); // update map view (if there is one)
+ }
+ }
+
/**
* Returns the main view.
* @return the main view
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-09-14 18:07:57
|
Revision: 3118
http://gridarta.svn.sourceforge.net/gridarta/?rev=3118&view=rev
Author: akirschbaum
Date: 2007-09-14 10:59:17 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Reorder import statements.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-14 17:51:21 UTC (rev 3117)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-09-14 17:59:17 UTC (rev 3118)
@@ -80,8 +80,8 @@
import net.sf.gridarta.map.validation.checks.ConnectedPickableChecker;
import net.sf.gridarta.map.validation.checks.CustomTypeChecker;
import net.sf.gridarta.map.validation.checks.MapDifficultyChecker;
+import net.sf.gridarta.map.validation.checks.UnsetSlayingChecker;
import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
-import net.sf.gridarta.map.validation.checks.UnsetSlayingChecker;
import net.sf.japi.swing.ActionFactory;
import net.sf.japi.swing.ActionMethod;
import net.sf.japi.swing.misc.Progress;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2007-11-15 20:21:28
|
Revision: 3382
http://gridarta.svn.sourceforge.net/gridarta/?rev=3382&view=rev
Author: akirschbaum
Date: 2007-11-15 12:21:32 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Unify initialization code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-11-15 20:19:05 UTC (rev 3381)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-11-15 20:21:32 UTC (rev 3382)
@@ -281,6 +281,7 @@
} catch (final ParserConfigurationException ex) {
log.error("Cannot create XML parser: " + ex.getMessage());
}
+ new ArchetypeSetSpellLoader().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
try {
final String filename = IOUtils.getResourceURLAsString(getConfigurationDirectory(), "GameObjectMatchers.xml");
typeList.readGameObjectMatchers(filename);
@@ -293,6 +294,7 @@
} catch (final FileNotFoundException ex) {
log.error("Cannot read " + CommonConstants.TYPEDEF_FILE + ": " + ex.getMessage());
}
+ gameObjectSpells.sort();
if (autoPopupDocu) {
// do an automated help popup because the docu version has increased
@@ -320,8 +322,6 @@
// load object from a arch file you found
mainView.getObjectChooser().getArchetypeChooserControl().setTabPaneEnabled(false);
- new ArchetypeSetSpellLoader().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
- gameObjectSpells.sort();
defaultNamedFilterList = new NamedFilterList();
filterControl = new CFilterControl(null, this, defaultNamedFilterList);
final JMenu menuAnalyze = (JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "analyze");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-02-04 17:52:51
|
Revision: 3527
http://gridarta.svn.sourceforge.net/gridarta/?rev=3527&view=rev
Author: akirschbaum
Date: 2008-02-04 09:51:26 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
Remove superfluous cast.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-02-04 17:48:49 UTC (rev 3526)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-02-04 17:51:26 UTC (rev 3527)
@@ -443,7 +443,7 @@
*/
public void validateMap(final MapModel<GameObject, MapArchObject, Archetype> map) {
final ErrorCollector<GameObject, MapArchObject, Archetype> errorCollector = runMapValidation(map);
- for (final MapView<GameObject, MapArchObject, Archetype, ?, ?> mapView : ((MapControl) map.getMapControl()).getMapViewFrames()) {
+ for (final MapView<GameObject, MapArchObject, Archetype, ?, ?> mapView : map.getMapControl().getMapViewFrames()) {
mapView.getView().setErrors(errorCollector);
}
mainView.getGameObjectAttributesPanel().setErrors(map, errorCollector);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-02-23 14:12:23
|
Revision: 3617
http://gridarta.svn.sourceforge.net/gridarta/?rev=3617&view=rev
Author: akirschbaum
Date: 2008-02-23 06:12:16 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
Unify method ordering.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-02-23 14:07:14 UTC (rev 3616)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-02-23 14:12:16 UTC (rev 3617)
@@ -946,14 +946,14 @@
return emptyTileIcon;
}
+ public static ImageIcon getWarningSquareIcon() {
+ return warningSquareIcon;
+ }
+
public static ImageIcon getNofaceTileIcon() {
return nofaceTileIcon;
}
- public static ImageIcon getWarningSquareIcon() {
- return warningSquareIcon;
- }
-
public static ImageIcon getNoarchTileIcon() {
return noarchTileIcon;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-05-16 19:52:30
|
Revision: 3983
http://gridarta.svn.sourceforge.net/gridarta/?rev=3983&view=rev
Author: akirschbaum
Date: 2008-05-16 12:52:08 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Do not call static function through instance.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-05-16 19:50:23 UTC (rev 3982)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-05-16 19:52:08 UTC (rev 3983)
@@ -266,7 +266,7 @@
} catch (final FileNotFoundException ex) {
log.error("Cannot read GameObjectMatchers.xml: " + ex.getMessage());
}
- final GameObjectMatcher exitMatcher = gameObjectMatchers.getMatcher("exit");
+ final GameObjectMatcher exitMatcher = GameObjectMatchers.getMatcher("exit");
if (exitMatcher == null) {
log.fatal("GameObjectMatcher 'exit' does not exist");
throw new MissingResourceException("GameObjectMatcher 'exit' does not exist", null, null);
@@ -286,7 +286,7 @@
final boolean mapTileListBottom = prefs.getBoolean(MainView.MAP_TILE_LIST_BOTTOM_KEY, CMainView.MAP_TILE_LIST_BOTTOM_DEFAULT);
selectedSquareControl = new SelectedSquareControl<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic>(ACTION_FACTORY, this, mainView, mapTileListBottom, null);
// Initialize the main view
- final GameObjectMatcher monsterMatcher = gameObjectMatchers.getMatcher("monster");
+ final GameObjectMatcher monsterMatcher = GameObjectMatchers.getMatcher("monster");
if (monsterMatcher == null) {
log.fatal("GameObjectMatcher 'monster' does not exist");
throw new MissingResourceException("GameObjectMatcher 'monster' does not exist", null, null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-03 21:20:49
|
Revision: 4071
http://gridarta.svn.sourceforge.net/gridarta/?rev=4071&view=rev
Author: akirschbaum
Date: 2008-06-03 14:20:55 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Rename variable name.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-03 21:15:30 UTC (rev 4070)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-03 21:20:55 UTC (rev 4071)
@@ -699,12 +699,12 @@
globalSettings.setImageDir(globalSettings.getMapDir().getAbsolutePath());
}
- final String startFilename = globalSettings.getImageDir() + "/" + mapView.getMapControl().getMapFileName() + ".png";
+ final File file = new File(globalSettings.getImageDir() + "/" + mapView.getMapControl().getMapFileName() + ".png");
final JFileChooser fileChooser = new JFileChooser(globalSettings.getImageDir());
fileChooser.setDialogTitle("Save Image As");
fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
fileChooser.setMultiSelectionEnabled(false);
- fileChooser.setSelectedFile(new File(startFilename));
+ fileChooser.setSelectedFile(file);
// set a file filter for "*.png" files
fileChooser.setFileFilter(pngFileFilter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-03 21:31:36
|
Revision: 4074
http://gridarta.svn.sourceforge.net/gridarta/?rev=4074&view=rev
Author: akirschbaum
Date: 2008-06-03 14:31:01 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-03 21:28:02 UTC (rev 4073)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-03 21:31:01 UTC (rev 4074)
@@ -699,7 +699,7 @@
globalSettings.setImageDir(globalSettings.getMapDir().getAbsolutePath());
}
- final File file = new File(globalSettings.getImageDir() + "/" + mapView.getMapControl().getMapFileName() + ".png");
+ final File file = new File(globalSettings.getImageDir(), mapView.getMapControl().getMapFileName() + ".png");
final JFileChooser fileChooser = new JFileChooser(globalSettings.getImageDir());
fileChooser.setDialogTitle("Save Image As");
fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -712,9 +712,8 @@
if (returnVal == JFileChooser.APPROVE_OPTION) {
// got the filepath, now create image
File imageFile = fileChooser.getSelectedFile();
- final String filename = imageFile.getAbsolutePath();
- if (!filename.endsWith(".png")) {
- imageFile = new File(filename + ".png");
+ if (!imageFile.getName().endsWith(".png")) {
+ imageFile = new File(imageFile.getParentFile(), imageFile.getName() + ".png");
}
globalSettings.setImageDir(imageFile.getParentFile().getAbsolutePath());
if (!imageFile.exists() || ACTION_FACTORY.showConfirmDialog(mainView, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, "overwriteOtherFile", imageFile) == JOptionPane.YES_OPTION) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-15 12:18:02
|
Revision: 4188
http://gridarta.svn.sourceforge.net/gridarta/?rev=4188&view=rev
Author: akirschbaum
Date: 2008-06-15 05:18:01 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
Remove raw types.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-12 19:45:13 UTC (rev 4187)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-15 12:18:01 UTC (rev 4188)
@@ -816,7 +816,7 @@
}
/** {@inheritDoc} */
- public void revert(@NotNull final MapControl mapControl) {
+ public void revert(@NotNull final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mapControl) {
if (ACTION_FACTORY.showQuestionDialog(mainView, "confirmRevertMap", mapControl.getMapFileName())) {
final File mfile = mapControl.getMapFile();
final Point[] viewPositions = mapControl.getViewPositions();
@@ -824,7 +824,7 @@
final MapView<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapView = getMapManager().openMapFileWithView(mfile, viewPositions[0]);
if (newMapView != null) {
- final MapControl newMapControl = newMapView.getMapControl();
+ final MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl = newMapView.getMapControl();
for (int i = 1; i < viewPositions.length; i++) {
getMapManager().mapCreateView(newMapControl, viewPositions[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-15 18:56:13
|
Revision: 4200
http://gridarta.svn.sourceforge.net/gridarta/?rev=4200&view=rev
Author: akirschbaum
Date: 2008-06-15 11:54:55 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
Unify code.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-15 18:25:56 UTC (rev 4199)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-15 18:54:55 UTC (rev 4200)
@@ -552,13 +552,6 @@
createFileChooser();
}
- // default folder is the map-folder at first time, then the active folder
- if (!globalSettings.hasChangedDir() && globalSettings.getMapDir().exists()) {
- fileChooser.setCurrentDirectory(globalSettings.getMapDir());
- } else if (globalSettings.getCurrentDir().exists()) {
- fileChooser.setCurrentDirectory(globalSettings.getCurrentDir());
- }
-
if (mapFilter) {
fileChooser.setFileFilter(mapFileFilter);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2008-06-15 18:58:53
|
Revision: 4201
http://gridarta.svn.sourceforge.net/gridarta/?rev=4201&view=rev
Author: akirschbaum
Date: 2008-06-15 11:57:15 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
Whitespace change.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-15 18:54:55 UTC (rev 4200)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2008-06-15 18:57:15 UTC (rev 4201)
@@ -551,7 +551,6 @@
if (fileChooser == null) {
createFileChooser();
}
-
if (mapFilter) {
fileChooser.setFileFilter(mapFileFilter);
} else {
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