You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
From: <aki...@us...> - 2006-12-03 13:47:36
|
Revision: 809 http://svn.sourceforge.net/gridarta/?rev=809&view=rev Author: akirschbaum Date: 2006-12-03 05:47:36 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Use log4j. Modified Paths: -------------- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java =================================================================== --- trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-03 13:42:24 UTC (rev 808) +++ trunk/daimonin/src/daieditor/gameobject/ArchetypeParser.java 2006-12-03 13:47:36 UTC (rev 809) @@ -33,10 +33,10 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; import net.sf.gridarta.gameobject.AbstractArchetypeParser; import net.sf.gridarta.gameobject.anim.DuplicateAnimationException; +import net.sf.japi.swing.ActionFactory; +import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; /** @@ -51,8 +51,11 @@ public final class ArchetypeParser extends AbstractArchetypeParser<GameObject> { /** Logger. */ - private static final Logger log = Logger.getLogger("daieditor"); + private static final Logger log = Logger.getLogger(ArchetypeParser.class); + /** Action Factory. */ + private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor"); + private final CMainControl mainControl; /** @@ -75,7 +78,7 @@ in.close(); } } catch (final FileNotFoundException e) { - log.log(Level.WARNING, "archfileNotFound", fname); + log.warn(ACTION_FACTORY.format("archfileNotFound", fname)); } catch (final IOException e) { // TODO } @@ -182,7 +185,7 @@ mainControl.getAnimationObjects().addAnimationObject(archetype.getArchetypeName(), animText.toString()); } catch (final DuplicateAnimationException e) { // TODO: Report to the user - log.log(Level.WARNING, "duplicateAnimation", e); + log.warn(ACTION_FACTORY.format("duplicateAnimation", e)); } archetype.addObjectText("animation " + archetype.getArchetypeName()); @@ -195,7 +198,7 @@ animText.append(thisLine).append("\n"); } } else if (thisLine.startsWith("Object")) { - log.log(Level.WARNING, "inventoryInDefArch", thisLine); + log.warn(ACTION_FACTORY.format("inventoryInDefArch", thisLine)); } else if (thisLine.startsWith("end")) { //if (arch.getArchTypNr() == 0) { //System.err.println("Arch "+ arch.getArchetypeName()+" has no type info!"); @@ -211,7 +214,7 @@ if (firstArch.getMultiRefCount() == 2) { firstArch.setMultiShapeID(multiShapeID); } else if (multiShapeID != firstArch.getMultiShapeID()) { - log.log(Level.WARNING, "defArchWithInvalidMpartNr", new Object[]{archetype.getArchetypeName(), firstArch.getArchetypeName(), Integer.toString(multiShapeID), Integer.toString(firstArch.getMultiShapeID())}); + log.warn(ACTION_FACTORY.format("defArchWithInvalidMpartNr", archetype.getArchetypeName(), firstArch.getArchetypeName(), Integer.toString(multiShapeID), Integer.toString(firstArch.getMultiShapeID()))); } } else { // add arch to the archpanel - only if it is not the map arch and not in the intern folder @@ -311,14 +314,14 @@ // System.err.println("Remove color_bg: "+arch.getArchetypeName()); } else if (thisLine.startsWith("x ")) { if (!archmore && !archetype.getArchetypeName().equals(STARTARCH_NAME)) { - log.log(Level.WARNING, "foundCoordInDefArchSingleTileOrHead", new Object[]{"x", archetype.getArchetypeName()}); + log.warn(ACTION_FACTORY.format("foundCoordInDefArchSingleTileOrHead", "x", archetype.getArchetypeName())); archetype.addObjectText(thisLine); } else { archetype.setMultiX(Integer.parseInt(thisLine.substring(2))); } } else if (thisLine.startsWith("y ")) { if (!archmore && !archetype.getArchetypeName().equals(STARTARCH_NAME)) { - log.log(Level.WARNING, "foundCoordInDefArchSingleTileOrHead", new Object[]{"y", archetype.getArchetypeName()}); + log.warn(ACTION_FACTORY.format("foundCoordInDefArchSingleTileOrHead", "y", archetype.getArchetypeName())); archetype.addObjectText(thisLine); } else { archetype.setMultiY(Integer.parseInt(thisLine.substring(2))); @@ -328,17 +331,17 @@ final int i = Integer.parseInt(thisLine.substring(5)); archetype.setArchTypNr(i); if (i == 0) { - log.log(Level.WARNING, "defArchWithZeroType", archetype.getArchetypeName()); + log.warn(ACTION_FACTORY.format("defArchWithZeroType", archetype.getArchetypeName())); } } catch (final NumberFormatException e) { - log.log(Level.WARNING, "defArchWithInvalidTypeNr", new Object[]{archetype.getArchetypeName(), thisLine.substring(5)}); + log.warn(ACTION_FACTORY.format("defArchWithInvalidTypeNr", archetype.getArchetypeName(), thisLine.substring(5))); archetype.addObjectText(thisLine); } } else if (thisLine.startsWith("direction ")) { try { archetype.setDirection(Integer.parseInt(thisLine.substring(10))); } catch (final NumberFormatException e) { - log.log(Level.WARNING, "defArchWithInvalidDirection", new Object[]{archetype.getArchetypeName(), thisLine.substring(10)}); + log.warn(ACTION_FACTORY.format("defArchWithInvalidDirection", archetype.getArchetypeName(), thisLine.substring(10))); } archetype.addObjectText(thisLine); } else if (thisLine.startsWith("face ")) { 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:42:24
|
Revision: 808 http://svn.sourceforge.net/gridarta/?rev=808&view=rev Author: akirschbaum Date: 2006-12-03 05:42:24 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Use log4j. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java Modified: trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java =================================================================== --- trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java 2006-12-03 13:33:26 UTC (rev 807) +++ trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java 2006-12-03 13:42:24 UTC (rev 808) @@ -29,9 +29,10 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; +import net.sf.japi.swing.ActionFactory; +import org.apache.log4j.Logger; /** * TreeNode implementation for Named Objects (like arches, faces, animations, artifacts etc.), used for displaying faces in a {@link javax.swing.JTree}. @@ -39,6 +40,12 @@ */ public final class NamedTreeNode<T extends NamedObject> implements TreeNode, Comparable<NamedTreeNode<T>> { + /** Action Factory. */ + private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta"); + + /** Logger. */ + private static final Logger log = Logger.getLogger(NamedTreeNode.class); + /** * The children. * They are mapped name as key to child node as value. @@ -122,7 +129,7 @@ private void append(final String path, final T namedObject) { childNodeArray = null; if (path == null) { - Logger.getLogger("net.sf.gridarta").log(Level.WARNING, "namedTreeNodeWithoutPath", new Object[]{namedObject.getPath(), namedObject.getName(), namedObject.getClass().getName()}); + log.warn(ACTION_FACTORY.format("namedTreeNodeWithoutPath", namedObject.getPath(), namedObject.getName(), namedObject.getClass().getName())); return; } assert dir : "append may only be invoked on directory nodes."; 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 13:23:56
|
Revision: 806 http://svn.sourceforge.net/gridarta/?rev=806&view=rev Author: akirschbaum Date: 2006-12-03 05:23:57 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Unify logging. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainView.java Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-03 13:21:46 UTC (rev 805) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-03 13:23:57 UTC (rev 806) @@ -47,6 +47,7 @@ import javax.swing.event.InternalFrameListener; import net.sf.gridarta.gui.GSplitPane; import net.sf.gridarta.help.Help; +import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; /** @@ -60,6 +61,9 @@ /** Serial Version UID. */ private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Logger log = Logger.getLogger(CMainView.class); + /** The key used to store the selected L'n'F to INI file. */ public static final String SELECTED_LNF_KEY = "MainWindow.lnfClass"; 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:21:46
|
Revision: 805 http://svn.sourceforge.net/gridarta/?rev=805&view=rev Author: akirschbaum Date: 2006-12-03 05:21:46 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Use log4j. Modified Paths: -------------- trunk/daimonin/src/daieditor/CMainView.java Modified: trunk/daimonin/src/daieditor/CMainView.java =================================================================== --- trunk/daimonin/src/daieditor/CMainView.java 2006-12-03 13:11:16 UTC (rev 804) +++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-03 13:21:46 UTC (rev 805) @@ -39,8 +39,6 @@ import java.util.ArrayList; import static java.util.Collections.synchronizedList; import java.util.List; -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.Action; @@ -62,6 +60,7 @@ import net.sf.gridarta.help.Help; import net.sf.japi.swing.ActionFactory; import net.sf.japi.util.ThrowableHandler; +import org.apache.log4j.Logger; import org.jetbrains.annotations.Nullable; /** @@ -81,7 +80,7 @@ private static final long serialVersionUID = 1L; /** Logger. */ - private static final Logger log = Logger.getLogger("daieditor"); + private static final Logger log = Logger.getLogger(CMainView.class); /** Preferences. */ private static final Preferences prefs = userNodeForPackage(CMainControl.class); @@ -523,7 +522,7 @@ view.requestFocus(); view.restoreSubcomponentFocus(); } catch (final PropertyVetoException e) { - log.log(Level.WARNING, "unexpectedException", e); + log.warn(ACTION_FACTORY.format("unexpectedException", e)); } } } else { @@ -537,7 +536,7 @@ view.restoreSubcomponentFocus(); return; } catch (final PropertyVetoException e) { - log.log(Level.WARNING, "unexpectedException", e); + log.warn(ACTION_FACTORY.format("unexpectedException", e)); } } } @@ -586,7 +585,7 @@ view.restoreSubcomponentFocus(); return; } catch (final PropertyVetoException e) { - log.log(Level.WARNING, "unexpectedException", e); + log.warn(ACTION_FACTORY.format("unexpectedException", e)); } } updateFocus(true); 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:11:16
|
Revision: 804 http://svn.sourceforge.net/gridarta/?rev=804&view=rev Author: akirschbaum Date: 2006-12-03 05:11:16 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Add missing message key. Modified Paths: -------------- trunk/daimonin/src/daieditor/messages.properties Modified: trunk/daimonin/src/daieditor/messages.properties =================================================================== --- trunk/daimonin/src/daieditor/messages.properties 2006-12-03 13:07:47 UTC (rev 803) +++ trunk/daimonin/src/daieditor/messages.properties 2006-12-03 13:11:16 UTC (rev 804) @@ -784,6 +784,7 @@ updateRestart.message=Update successful.\nI have stored a backup of the previous version under "DaimoninEditor.jar.bak".\n\nThe editor automatically exits after updating.\nYou have to restart it yourself in case you want to use it now. updateAborted.title=Update aborted updateAborted.message=Update aborted on your request. +updateProgress.title=Update updateProgress=Update in progress updateActiveVersionUnavailable.title=Update warning updateActiveVersionUnavailable.message=I was unable to determine my version.\nI will assume that the update is newer than your current version. 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:07:47
|
Revision: 803 http://svn.sourceforge.net/gridarta/?rev=803&view=rev Author: akirschbaum Date: 2006-12-03 05:07:47 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Use correct message key name. Modified Paths: -------------- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java Modified: trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java =================================================================== --- trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2006-12-03 12:14:00 UTC (rev 802) +++ trunk/daimonin/src/daieditor/gui/map/MapPropertiesDialog.java 2006-12-03 13:07:47 UTC (rev 803) @@ -418,7 +418,7 @@ return false; }*/ if (mapName.getText().length() == 0) { - ACTION_FACTORY.showMessageDialog(this, "missingMapName"); + ACTION_FACTORY.showMessageDialog(this, "mapErrorMissingMapName"); return false; } } catch (final IllegalArgumentException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-03 12:14:05
|
Revision: 802 http://svn.sourceforge.net/gridarta/?rev=802&view=rev Author: akirschbaum Date: 2006-12-03 04:14:00 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Remove unused messages. Modified Paths: -------------- 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 Modified: trunk/daimonin/src/daieditor/action.properties =================================================================== --- trunk/daimonin/src/daieditor/action.properties 2006-12-03 10:38:42 UTC (rev 801) +++ trunk/daimonin/src/daieditor/action.properties 2006-12-03 12:14:00 UTC (rev 802) @@ -20,8 +20,8 @@ #view.menu=changeFont - viewShow viewAlpha #view.menu=viewShow viewAlpha gridVisible drawDouble - prevWindow nextWindow view.menu=gridVisible drawDouble - prevWindow nextWindow -viewShow.menu = showMonsters showExits showBackground showDoorsKeys showWall showEquipment showTreasure showConnected resetShow -viewAlpha.menu = alphaMonsters alphaExits alphaBackground alphaDoorsKeys alphaWall alphaEquipment alphaTreasure alphaConnected resetAlpha +#viewShow.menu = showMonsters showExits showBackground showDoorsKeys showWall showEquipment showTreasure showConnected resetShow +#viewAlpha.menu = alphaMonsters alphaExits alphaBackground alphaDoorsKeys alphaWall alphaEquipment alphaTreasure alphaConnected resetAlpha #window.menu=newWindow - closeAll +windows window.menu= help.menu=onlineHelp tod about update @@ -125,15 +125,15 @@ controlClient.icon=development/Host16 controlStart.icon=media/Play16 controlStop.icon=media/Stop16 -control.toolbar=controlStart controlStop +#control.toolbar=controlStart controlStop zoom.icon=general/Zoom16 gc.icon=general/Delete16 -viewShow.icon=general/Find16 +#viewShow.icon=general/Find16 -viewAlpha.icon=general/Find16 +#viewAlpha.icon=general/Find16 nextWindow.icon=navigation/Forward16 Modified: trunk/daimonin/src/daieditor/messages.properties =================================================================== --- trunk/daimonin/src/daieditor/messages.properties 2006-12-03 10:38:42 UTC (rev 801) +++ trunk/daimonin/src/daieditor/messages.properties 2006-12-03 12:14:00 UTC (rev 802) @@ -643,67 +643,67 @@ view.text=View view.mnemonic=V -viewShow.text=Show Only -viewShow.shortdescription=Select some filters to be drawn exclusively -viewShow.mnemonic=S +#viewShow.text=Show Only +#viewShow.shortdescription=Select some filters to be drawn exclusively +#viewShow.mnemonic=S -viewAlpha.text=Show transparent -viewAlpha.shortdescription=Select some filters to be drawn transparent -viewAlpha.mnemonic=T +#viewAlpha.text=Show transparent +#viewAlpha.shortdescription=Select some filters to be drawn transparent +#viewAlpha.mnemonic=T -showMonsters.text=Monsters -showMonsters.mnemonic=M +#showMonsters.text=Monsters +#showMonsters.mnemonic=M -showExits.text=Exits -showExits.mnemonic=E +#showExits.text=Exits +#showExits.mnemonic=E -showBackground.text=Background -showBackground.mnemonic=B +#showBackground.text=Background +#showBackground.mnemonic=B -showDoorsKeys.text=Doors & Keys -showDoorsKeys.mnemonic=D +#showDoorsKeys.text=Doors & Keys +#showDoorsKeys.mnemonic=D -showWall.text=Walls -showWall.mnemonic=W +#showWall.text=Walls +#showWall.mnemonic=W -showEquipment.text=Equipment -showEquipment.mnemonic=Q +#showEquipment.text=Equipment +#showEquipment.mnemonic=Q -showTreasure.text=Treasure -showTreasure.mnemonic=T +#showTreasure.text=Treasure +#showTreasure.mnemonic=T -showConnected.text=Connected -showConnected.mnemonic=C +#showConnected.text=Connected +#showConnected.mnemonic=C -resetShow.text=Reset Show -resetShow.mnemonic=R +#resetShow.text=Reset Show +#resetShow.mnemonic=R -alphaMonsters.text=Monsters -alphaMonsters.mnemonic=M +#alphaMonsters.text=Monsters +#alphaMonsters.mnemonic=M -alphaExits.text=Exits -alphaExits.mnemonic=E +#alphaExits.text=Exits +#alphaExits.mnemonic=E -alphaBackground.text=Background -alphaBackground.mnemonic=B +#alphaBackground.text=Background +#alphaBackground.mnemonic=B -alphaDoorsKeys.text=Doors & Keys -alphaDoorsKeys.mnemonic=D +#alphaDoorsKeys.text=Doors & Keys +#alphaDoorsKeys.mnemonic=D -alphaWall.text=Wall -alphaWall.mnemonic=W +#alphaWall.text=Wall +#alphaWall.mnemonic=W -alphaEquipment.text=Equipment -alphaEquipment.mnemonic=Q +#alphaEquipment.text=Equipment +#alphaEquipment.mnemonic=Q -alphaTreasure.text=Treasure -alphaTreasure.mnemonic=T +#alphaTreasure.text=Treasure +#alphaTreasure.mnemonic=T -alphaConnected.text=Connected -alphaConnected.mnemonic=C +#alphaConnected.text=Connected +#alphaConnected.mnemonic=C -resetAlpha.text=Reset Transparency -resetAlpha.mnemonic=R +#resetAlpha.text=Reset Transparency +#resetAlpha.mnemonic=R gridVisible.text=Show Grid gridVisible.mnemonic=G Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-03 10:38:42 UTC (rev 801) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-03 12:14:00 UTC (rev 802) @@ -389,44 +389,44 @@ view.text=Ansicht view.mnemonic=A -viewShow.text=Zeige nur -viewAlpha.text=Durchsichtig +#viewShow.text=Zeige nur +#viewAlpha.text=Durchsichtig -showMonsters.text=Zeige Monster +#showMonsters.text=Zeige Monster -showExits.text=Zeige Ausg\xE4nge +#showExits.text=Zeige Ausg\xE4nge -showBackground.text=Zeige Hintergrund +#showBackground.text=Zeige Hintergrund -showDoorsKeys.text=Zeige T\xFCren und Schl\xFCssel +#showDoorsKeys.text=Zeige T\xFCren und Schl\xFCssel -showWall.text=Zeige W\xE4nde +#showWall.text=Zeige W\xE4nde -showEquipment.text=Zeige Ausr\xFCstung +#showEquipment.text=Zeige Ausr\xFCstung -showTreasure.text=Zeige Sch\xE4tze +#showTreasure.text=Zeige Sch\xE4tze -showConnected.text=Zeige Verbindungen +#showConnected.text=Zeige Verbindungen -resetShow.text=Ansicht zur\xFCcksetzen +#resetShow.text=Ansicht zur\xFCcksetzen -alphaMonsters.text=Durchsichtige Monster +#alphaMonsters.text=Durchsichtige Monster -alphaExits.text=Durchsichtige Ausg\xE4nge +#alphaExits.text=Durchsichtige Ausg\xE4nge -alphaBackground.text=Durchsichtiger Hintergrund +#alphaBackground.text=Durchsichtiger Hintergrund -alphaDoorsKeys.text=Durchsichtige T\xFCren und Schl\xFCssel +#alphaDoorsKeys.text=Durchsichtige T\xFCren und Schl\xFCssel -alphaWall.text=Durchsichtige W\xE4nde +#alphaWall.text=Durchsichtige W\xE4nde -alphaEquipment.text=Durchsichtige Ausr\xFCstung +#alphaEquipment.text=Durchsichtige Ausr\xFCstung -alphaTreasure.text=Durchsichtige Sch\xE4tze +#alphaTreasure.text=Durchsichtige Sch\xE4tze -alphaConnected.text=Durchsichtige Verbindungen +#alphaConnected.text=Durchsichtige Verbindungen -resetAlpha.text=Durchsichtigkeit zur\xFCcksetzen +#resetAlpha.text=Durchsichtigkeit zur\xFCcksetzen gridVisible.text=Gitter anzeigen gridVisible.mnemonic=G Modified: trunk/daimonin/src/daieditor/messages_fr.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-03 10:38:42 UTC (rev 801) +++ trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-03 12:14:00 UTC (rev 802) @@ -257,23 +257,23 @@ view.text=Affichage view.mnemonic=A -showMonsters.text=Afficher monstres +#showMonsters.text=Afficher monstres -showExits.text=Afficher sorties +#showExits.text=Afficher sorties -showBackground.text=Afficher fond +#showBackground.text=Afficher fond -showDoorsKeys.text=Afficher portes et cl\xE9s +#showDoorsKeys.text=Afficher portes et cl\xE9s -showWall.text=Afficher murs +#showWall.text=Afficher murs -showEquipment.text=Afficher \xE9quipement +#showEquipment.text=Afficher \xE9quipement -showTreasure.text=Afficher tr\xE9sors +#showTreasure.text=Afficher tr\xE9sors -showConnected.text=Afficher objets connect\xE9s +#showConnected.text=Afficher objets connect\xE9s -resetShow.text=Vue normale +#resetShow.text=Vue normale ######### Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-03 10:38:42 UTC (rev 801) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-03 12:14:00 UTC (rev 802) @@ -671,67 +671,67 @@ view.text=Visning view.mnemonic=V -viewShow.text=Visa endast -viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt -viewShow.mnemonic=S +#viewShow.text=Visa endast +#viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt +#viewShow.mnemonic=S -viewAlpha.text=Visa genomskinligt -viewAlpha.shortdescription=V\xE4lj kategorier att visa genomskinligt -viewAlpha.mnemonic=T +#viewAlpha.text=Visa genomskinligt +#viewAlpha.shortdescription=V\xE4lj kategorier att visa genomskinligt +#viewAlpha.mnemonic=T -showMonsters.text=Monster -showMonsters.mnemonic=M +#showMonsters.text=Monster +#showMonsters.mnemonic=M -showExits.text=Utg\xE5ngar -showExits.mnemonic=U +#showExits.text=Utg\xE5ngar +#showExits.mnemonic=U -showBackground.text=Bakgrund -showBackground.mnemonic=B +#showBackground.text=Bakgrund +#showBackground.mnemonic=B -showDoorsKeys.text=D\xF6rrar och nycklar -showDoorsKeys.mnemonic=D +#showDoorsKeys.text=D\xF6rrar och nycklar +#showDoorsKeys.mnemonic=D -showWall.text=V\xE4ggar -showWall.mnemonic=V +#showWall.text=V\xE4ggar +#showWall.mnemonic=V -showEquipment.text=Utrustning -showEquipment.mnemonic=R +#showEquipment.text=Utrustning +#showEquipment.mnemonic=R -showTreasure.text=Skatter -showTreasure.mnemonic=S +#showTreasure.text=Skatter +#showTreasure.mnemonic=S -showConnected.text=Anslutna -showConnected.mnemonic=A +#showConnected.text=Anslutna +#showConnected.mnemonic=A -resetShow.text=\xC5terst\xE4ll visning -resetShow.mnemonic=\xC5 +#resetShow.text=\xC5terst\xE4ll visning +#resetShow.mnemonic=\xC5 -alphaMonsters.text=Monster -alphaMonsters.mnemonic=M +#alphaMonsters.text=Monster +#alphaMonsters.mnemonic=M -alphaExits.text=Utg\xE5ngar -alphaExits.mnemonic=U +#alphaExits.text=Utg\xE5ngar +#alphaExits.mnemonic=U -alphaBackground.text=Backgrund -alphaBackground.mnemonic=B +#alphaBackground.text=Backgrund +#alphaBackground.mnemonic=B -alphaDoorsKeys.text=D\xF6rrar och nycklar -alphaDoorsKeys.mnemonic=D +#alphaDoorsKeys.text=D\xF6rrar och nycklar +#alphaDoorsKeys.mnemonic=D -alphaWall.text=V\xE4ggar -alphaWall.mnemonic=V +#alphaWall.text=V\xE4ggar +#alphaWall.mnemonic=V -alphaEquipment.text=Utrustning -alphaEquipment.mnemonic=R +#alphaEquipment.text=Utrustning +#alphaEquipment.mnemonic=R -alphaTreasure.text=Skatter -alphaTreasure.mnemonic=S +#alphaTreasure.text=Skatter +#alphaTreasure.mnemonic=S -alphaConnected.text=Anslutna -alphaConnected.mnemonic=A +#alphaConnected.text=Anslutna +#alphaConnected.mnemonic=A -resetAlpha.text=\xC5terst\xE4ll genomskinlighet -resetAlpha.mnemonic=R +#resetAlpha.text=\xC5terst\xE4ll genomskinlighet +#resetAlpha.mnemonic=R gridVisible.text=Visa rutn\xE4t gridVisible.mnemonic=G This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-03 10:38:43
|
Revision: 801 http://svn.sourceforge.net/gridarta/?rev=801&view=rev Author: akirschbaum Date: 2006-12-03 02:38:42 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Fix spelling of message key names. Modified Paths: -------------- trunk/daimonin/src/daieditor/map/MapControl.java 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 Modified: trunk/daimonin/src/daieditor/map/MapControl.java =================================================================== --- trunk/daimonin/src/daieditor/map/MapControl.java 2006-12-03 10:24:21 UTC (rev 800) +++ trunk/daimonin/src/daieditor/map/MapControl.java 2006-12-03 10:38:42 UTC (rev 801) @@ -566,7 +566,7 @@ iconImage = getBufferedImage(fullImage.getScaledInstance(48, 23, SCALE_SMOOTH)); previewImage = getBufferedImage(fullImage.getScaledInstance(fullImage.getWidth() >> 3, fullImage.getHeight() >> 3, SCALE_SMOOTH)); } catch (final OutOfMemoryError e) { - mainControl.setStatusText(ACTION_FACTORY.getString("mapIamgesOutOfMemory")); + mainControl.setStatusText(ACTION_FACTORY.getString("mapImagesOutOfMemory")); } } Modified: trunk/daimonin/src/daieditor/messages.properties =================================================================== --- trunk/daimonin/src/daieditor/messages.properties 2006-12-03 10:24:21 UTC (rev 800) +++ trunk/daimonin/src/daieditor/messages.properties 2006-12-03 10:38:42 UTC (rev 801) @@ -75,8 +75,8 @@ openPickmapMapNotLoaded.message=Pickmaps aren''t loaded.\nEither there are no pickmaps or the loading process is not complete. openPickmapMapHidden.title=Cannot open Pickmap openPickmapMapHidden.message=Pickmaps are currently hidden.\nPlease select a pickmap before activating this command. -openPickmapMapNoPickmaps.title=Cannot open Pickmap -openPickmapMapNoPickmaps.message=There are no pickmaps. +openPickmapNoPickmaps.title=Cannot open Pickmap +openPickmapNoPickmaps.message=There are no pickmaps. openFileWantedNoArches.title=Cannot open Map openFileWantedNoArches.message=There are currently no arches avaliable!\nYou need to have arches loaded before opening a map.\nLook into the online help on how to get Daimonin archfiles. openFileLoadMap.title=Couldn''t load Map @@ -628,7 +628,7 @@ 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. +cleanCompletelyBlockedSquares.shortdescription=Cleans squares which are blocking view and passage and are only surrounded by such squares. zoom.text=Zoom zoom.mnemonic=Z Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-03 10:24:21 UTC (rev 800) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-03 10:38:42 UTC (rev 801) @@ -137,7 +137,7 @@ optionsTitle=Optionen optionsLanguage=Sprache optionsLayout=Layout-Einstellungen -optionsSepMapTile.title=Map-Tile-Panel unten anzeigen +optionsSepMapTile.text=Map-Tile-Panel unten anzeigen optionsLoadArchColl.text=Vorbereitete Archetypen laden optionsGlobal=Global optionsResPaths=Pfade @@ -145,7 +145,7 @@ optionsResMaps=Karten optionsResScripts=Scripte optionsMisc=Verschiedene Einstellungen -optionsCheckMaps=Analysiere Kartendateien bei Dateiauswahl +optionsCheckMaps.text=Analysiere Kartendateien bei Dateiauswahl arcDoc.htmlText=<html><head><meta name="CFJavaEditor" content="tmp"><title>{0}</title></head><body><h1 style="text-align:center;colour:navy;">Type: {0}</h1><h3 style="colour:navy;">Funktionalit\xE4t von {0}</h3><p>{1}</p><h3 style="colour:navy;">Nutzungshinweise:</h3><p>{2}</p></body></html> @@ -408,7 +408,7 @@ showConnected.text=Zeige Verbindungen -resetView.text=Ansicht zur\xFCcksetzen +resetShow.text=Ansicht zur\xFCcksetzen alphaMonsters.text=Durchsichtige Monster Modified: trunk/daimonin/src/daieditor/messages_fr.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-03 10:24:21 UTC (rev 800) +++ trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-03 10:38:42 UTC (rev 801) @@ -273,7 +273,7 @@ showConnected.text=Afficher objets connect\xE9s -resetView.text=Vue normale +resetShow.text=Vue normale ######### @@ -306,12 +306,9 @@ about.mnemonic=A about.title=\xC0 propos de DaimoninEditor BETA3 v0.966 -about.message=Version BETA3 v0.966\n(c) 2001-2005 Michael Toennies\nAndreas Vogl\nPeter Plischewsky\nGecko\nChristian Hujer +about=Version BETA3 v0.966\n(c) 2001-2005 Michael Toennies\nAndreas Vogl\nPeter Plischewsky\nGecko\nChristian Hujer ############# # Status Bar -memory.use=M\xE9moire -memory.used=utilis\xE9e -memory.free=libre -memory.total=total +memory=({0}/{1}) M\xE9moire: {2} utilis\xE9e, {3} libre, {4} total Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-03 10:24:21 UTC (rev 800) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-03 10:38:42 UTC (rev 801) @@ -74,8 +74,8 @@ openPickmapMapNotLoaded.message=Plockkartor \xE4r inte inladdade.\nAntingen finns det inga, eller ocks\xE5 \xE4r de inte f\xE4rdigladdade \xE4n. openPickmapMapHidden.title=Kan inte \xF6ppna plockkarta openPickmapMapHidden.message=Plockkartor \xE4r dolda f\xF6r tillf\xE4llet.\nVar v\xE4nlig och v\xE4lj en plockkarta innan du aktiverar detta kommando. -openPickmapMapNoPickmaps.title=Kan inte \xF6ppna plockkarta -openPickmapMapNoPickmaps.message=Det finns inga plockkartor. +openPickmapNoPickmaps.title=Kan inte \xF6ppna plockkarta +openPickmapNoPickmaps.message=Det finns inga plockkartor. 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 Daimonins arketypfiler.. openFileLoadMap.title=Kunde inte \xF6ppna kartan @@ -656,7 +656,7 @@ checkMap.text=Validera karta checkMap.mnemonic=M -checkMapshortdescription=K\xF6r kartvalideraren +checkMap.shortdescription=K\xF6r kartvalideraren zoom.text=Zoom zoom.mnemonic=Z @@ -703,7 +703,7 @@ showConnected.text=Anslutna showConnected.mnemonic=A -resetView.text=\xC5terst\xE4ll visning +resetShow.text=\xC5terst\xE4ll visning resetShow.mnemonic=\xC5 alphaMonsters.text=Monster This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-03 10:24:22
|
Revision: 800 http://svn.sourceforge.net/gridarta/?rev=800&view=rev Author: akirschbaum Date: 2006-12-03 02:24:21 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Remove unused messages. Modified Paths: -------------- 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 Modified: trunk/daimonin/src/daieditor/messages.properties =================================================================== --- trunk/daimonin/src/daieditor/messages.properties 2006-12-02 23:40:33 UTC (rev 799) +++ trunk/daimonin/src/daieditor/messages.properties 2006-12-03 10:24:21 UTC (rev 800) @@ -284,12 +284,11 @@ archCollectArches=Collecting Arches... archCollectAnimations=Collecting Animations... -archCollectAnimationTree=Collecting Animation Tree... archCollectImages=Collecting Images... archCollectDone=Collect Arches: done -archCollectWarningMultipartTailInPanel.title=Collect Warning -archCollectWarningMultipartTailInPanel.message=Collect Warning: Found Multipart tail in Panel! +#archCollectWarningMultipartTailInPanel.title=Collect Warning +#archCollectWarningMultipartTailInPanel.message=Collect Warning: Found Multipart tail in Panel! archCollectWarningMultipartTooShort.title=Collect Warning archCollectWarningMultipartTooShort.message=Collect Warning: Multipart object too short! archCollectWarningMissed.title=Collect Warning @@ -773,8 +772,6 @@ update.message=Check for updates? updateError.title=Error while updating updateError.message=Error while updating:\n{0}\n\nPlease update manually. -updateErrorUnknownHost.title=Error while updating -updateErrorUnknownHost.message=Error while updating:\nThe update host could not be resolved ("{0}").\n\nPlease update manually. updateUnavailable.title=No update available updateUnavailable.message=<html><style type="text/css">.cell'{border-width:1px;border-style:solid;border-color:#000000;background-color:#FFFFFF;color:#000000;}'</style><table><tr><td></td><th class="cell">Installed</th><th class="cell">Available</th></tr><tr><th class="cell">Version</th><td class="cell">{0}</td><td class="cell">{1}</td></tr><tr><th class="cell">Developer</th><td class="cell">{2}</td><td class="cell">{3}</td></tr><tr><th class="cell">Timestamp</th><td class="cell">{4}</td><td class="cell">{5}</td></tr></table><p align="center">No newer version available.</p><p>Source: {6}<br>Download: {7}</p></html> updateAvailable.title=Update available! @@ -904,7 +901,6 @@ ####################### # Various Log Messages -setGridVisibilityWithoutCurrentMap=setGridVisibility() called without current map. canonIOE=IOException while canonizing path: {0} saveLevelAsWithNull=DEBUG: CMainControl.saveLevelAsWanted(CMapControl level) invoked with null argument. imageCreated=Created image "{0}" of map "{1}". Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 23:40:33 UTC (rev 799) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-03 10:24:21 UTC (rev 800) @@ -165,7 +165,6 @@ statusMouseOff=Maus au\xDFerhalb der Karte statusSelect=Maus x:{0,number,integer} y:{1,number,integer} Karte x:{2,number,integer} y:{3,number,integer} Auswahl x:{4,number,integer} y:{5,number,integer} statusNormal=Maus x:{0,number,integer} y:{1,number,integer} Karte x:{2,number,integer} y:{3,number,integer} -statusInsert=Maus x:{0,number,integer} y:{1,number,integer} Karte x:{2,number,integer} y:{3,number,integer} Einf\xFCgen: {4} ####### # File @@ -393,8 +392,6 @@ viewShow.text=Zeige nur viewAlpha.text=Durchsichtig -changeFont.text=Zeichensatz \xE4ndern - showMonsters.text=Zeige Monster showExits.text=Zeige Ausg\xE4nge Modified: trunk/daimonin/src/daieditor/messages_fr.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-02 23:40:33 UTC (rev 799) +++ trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-03 10:24:21 UTC (rev 800) @@ -36,7 +36,6 @@ statusMouseOff=Souris hors de la carte statusSelect=Souris x:{0,number,integer} y:{1,number,integer} Carte x:{2,number,integer} y:{3,number,integer} Selectionn\xE9 x:{4,number,integer} y:{5,number,integer} statusNormal=Souris x:{0,number,integer} y:{1,number,integer} Carte x:{2,number,integer} y:{3,number,integer} -statusInsert=Souris x:{0,number,integer} y:{1,number,integer} Carte x:{2,number,integer} y:{3,number,integer} Ins\xE9rer: {4} ####### # File @@ -168,10 +167,6 @@ map.text=Carte map.mnemonic=C -autoJoin.text=Jointure automatique -autoJoin.mnemonic=J -autoJoin.accel=ctrl pressed J - gridVisible.text=Montrer la grille gridVisible.mnemonic=G gridVisible.accel=ctrl pressed G @@ -262,8 +257,6 @@ view.text=Affichage view.mnemonic=A -changeFont.text=Police - showMonsters.text=Afficher monstres showExits.text=Afficher sorties @@ -289,10 +282,6 @@ window.text=Fen\xEAtres window.mnemonic=F -newWindow.text=Nouvelle fen\xEAtre -newWindow.mnemonic=N -newWindow.accel=shift pressed W - closeAll.text=Tout fermer closeAll.mnemonic=T Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 23:40:33 UTC (rev 799) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-03 10:24:21 UTC (rev 800) @@ -53,7 +53,6 @@ mapOutOfMemory.title=Slut p\xE5 minne mapOutOfMemory.message=<html>Det finns inte tillr\xE4ckligt med minne f\xF6r att \xF6ppna kartan!<br>Du kan h\xF6ja minnesgr\xE4nsen med <code>-Xmx</code> -flaggan.<br>Till exempel: <code>java -Xmx128m -jar DaimoninEditor.jar</code></html> -mapImagesOutOfMemory=Inte tillr\xE4ckligt minne f\xF6r f\xF6rhandsbisning och ikon. mapUnsaved.title=Kartan har inte sparats. mapUnsaved.message=Var v\xE4nlig och spara den h\xE4r kartan f\xF6rst. @@ -321,12 +320,11 @@ archCollectArches=Sammanst\xE4ller arketyper... archCollectAnimations=Sammanst\xE4ller animationer... -archCollectAnimationTree=Sammanst\xE4ller animationstr\xE4d... archCollectImages=Sammanst\xE4ller bilder... archCollectDone=Sammanst\xE4ll arketyper: klart! -archCollectWarningMultipartTailInPanel.title=Varning under sammanst\xE4llning -archCollectWarningMultipartTailInPanel.message=Varning under sammanst\xE4llning: hittade svans till multidelsobjekt i panelen! +#archCollectWarningMultipartTailInPanel.title=Varning under sammanst\xE4llning +#archCollectWarningMultipartTailInPanel.message=Varning under sammanst\xE4llning: hittade svans till multidelsobjekt i panelen! archCollectWarningMultipartTooShort.title=Varning under sammanst\xE4llning archCollectWarningMultipartTooShort.message=Varning under sammanst\xE4llning: f\xF6r kort multidelsobject! archCollectWarningMissed.title=Varning under sammanst\xE4llning @@ -802,8 +800,6 @@ update.message=Leta efter uppdateringar? updateError.title=Fel under uppdatering updateError.message=Fel under uppdatering:\n{0}\n\nVar v\xE4nlig uppdatera manuellt. -updateErrorUnknownHost.title=Fel under uppdatering -updateErrorUnknownHost.message=Fel under uppdatering:\nUppdateringsservern kunde inte hittas ("{0}").\n\nVar v\xE4nlig uppdatera manuellt. updateUnavailable.title=Ingen ny uppdatering tillg\xE4nglig updateUnavailable.message=<html><style type="text/css">.cell'{border-width:1px;border-style:solid;border-color:#000000;background-color:#FFFFFF;color:#000000;}'</style><table><tr><td></td><th class="cell">Installerad</th><th class="cell">Tillg\xE4nglig</th></tr><tr><th class="cell">Version</th><td class="cell">{0}</td><td class="cell">{1}</td></tr><tr><th class="cell">Utvecklare</th><td class="cell">{2}</td><td class="cell">{3}</td></tr><tr><th class="cell">Datum</th><td class="cell">{4}</td><td class="cell">{5}</td></tr></table><p align="center">Ingen nyare version hittad.</p><p>K\xE4lla: {6}<br>Ladda ner: {7}</p></html> updateAvailable.title=Uppdatering tillg\xE4nglig! @@ -921,7 +917,6 @@ ####################### # Various Log Messages -setGridVisibilityWithoutCurrentMap=setGridVisibility() called without current map. canonIOE=IOException while canonizing path: {0} saveLevelAsWithNull=DEBUG: CMainControl.saveLevelAsWanted(CMapControl level) invoked with null argument. imageCreated=Created image "{0}" of map "{1}". Modified: trunk/src/app/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages.properties 2006-12-02 23:40:33 UTC (rev 799) +++ trunk/src/app/net/sf/gridarta/messages.properties 2006-12-03 10:24:21 UTC (rev 800) @@ -5,7 +5,6 @@ chooseNamedObject.title=Choose a {0} archCollectArches=Collecting Arches... archCollectAnimations=Collecting Animations... -archCollectAnimationTree=Collecting Animation Tree... archCollectImages=Collecting Images... archCollectDone=Collect Arches: done nameOfAnimationObject=Animation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-02 23:40:33
|
Revision: 799 http://svn.sourceforge.net/gridarta/?rev=799&view=rev Author: akirschbaum Date: 2006-12-02 15:40:33 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Rename '<key>=...' to '<key>.message=...'. Modified Paths: -------------- trunk/crossfire/src/cfeditor/messages_de.properties trunk/crossfire/src/cfeditor/messages_fr.properties trunk/daimonin/src/daieditor/messages_de.properties trunk/daimonin/src/daieditor/messages_fr.properties trunk/daimonin/src/daieditor/messages_sv.properties Modified: trunk/crossfire/src/cfeditor/messages_de.properties =================================================================== --- trunk/crossfire/src/cfeditor/messages_de.properties 2006-12-02 23:02:50 UTC (rev 798) +++ trunk/crossfire/src/cfeditor/messages_de.properties 2006-12-02 23:40:33 UTC (rev 799) @@ -31,8 +31,8 @@ replaceByObject=Objekt replaceByNothing=nichts (=l\xF6schen) -replaceMapGone=Karte {0} ist nicht mehr verf\xFCgbar.\n -replaceMapNoSelection=Ich kann ohne Selektion keine selektierten Felder\n auf der Karte "{0}" ersetzen. +replaceMapGone.message=Karte {0} ist nicht mehr verf\xFCgbar.\n +replaceMapNoSelection.message=Ich kann ohne Selektion keine selektierten Felder\n auf der Karte "{0}" ersetzen. replacedZero.title=Ersetzung fehlgeschlagen replacedZero.message=Keine passenden Objekte gefunden. replacedOne.title=Ersetzung erfolgreich Modified: trunk/crossfire/src/cfeditor/messages_fr.properties =================================================================== --- trunk/crossfire/src/cfeditor/messages_fr.properties 2006-12-02 23:02:50 UTC (rev 798) +++ trunk/crossfire/src/cfeditor/messages_fr.properties 2006-12-02 23:40:33 UTC (rev 799) @@ -12,8 +12,8 @@ replaceByObject=objet replaceByNothing=rien -replaceMapGone=La carte {0} n'est plus disponible.\n -replaceMapNoSelection=Vous avez choisi de remplacer les cases s\xE9lectionn\xE9es de la \ncarte \"{0}\", mais il n'y a pas de s\xE9lection. +replaceMapGone.message=La carte {0} n'est plus disponible.\n +replaceMapNoSelection.message=Vous avez choisi de remplacer les cases s\xE9lectionn\xE9es de la \ncarte \"{0}\", mais il n'y a pas de s\xE9lection. replacedZero.message=Aucun objet correspondant trouv\xE9. replacedOne.message=1 L'objet a \xE9t\xE9 remplac\xE9. replacedMany.message={0} Les objets ont \xE9t\xE9 remplac\xE9s. Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 23:02:50 UTC (rev 798) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 23:40:33 UTC (rev 799) @@ -123,8 +123,8 @@ replaceByPickmap=Pickmap replaceByNothing=nichts (=l\xF6schen) -replaceMapGone=Karte {0} ist nicht mehr verf\xFCgbar.\n -replaceMapNoSelection=Ich kann ohne Selektion keine selektierten Felder\n auf der Karte "{0}" ersetzen. +replaceMapGone.message=Karte {0} ist nicht mehr verf\xFCgbar.\n +replaceMapNoSelection.message=Ich kann ohne Selektion keine selektierten Felder\n auf der Karte "{0}" ersetzen. replacedZero.title=Ersetzung fehlgeschlagen replacedZero.message=Keine passenden Objekte gefunden. replacedOne.title=Ersetzung erfolgreich @@ -481,7 +481,7 @@ updateCloseMaps.title=Fehler beim Update updateCloseMaps.message=Alle Dateien m\xFCssen geschlossen werden, bevor ein Update durchgef\xFChrt werden kann. update.message=Nach Update suchen? -updateAvailable=Eine neuere Version des Editors ist verf\xFCgbar. Update installieren? +updateAvailable.message=Eine neuere Version des Editors ist verf\xFCgbar. Update installieren? ################# # Map Validation Modified: trunk/daimonin/src/daieditor/messages_fr.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-02 23:02:50 UTC (rev 798) +++ trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-02 23:40:33 UTC (rev 799) @@ -5,7 +5,7 @@ ########## # Dialogs warning=Attention! -overwriteOtherFile=Un fichier nomm\xE9 "{0}" existe d\xE9j\xE0.\n\nVoulez vous vraiment le remplacer? +overwriteOtherFile.message=Un fichier nomm\xE9 "{0}" existe d\xE9j\xE0.\n\nVoulez vous vraiment le remplacer? mapTitle={0} ({1}) - Propri\xE9t\xE9s de la carte mapShrink.title=Confirm shrinking map @@ -21,8 +21,8 @@ replaceByObject=objet replaceByNothing=rien -replaceMapGone=La carte {0} n'est plus disponible.\n -replaceMapNoSelection=Vous avez choisi de remplacer les cases s\xE9lectionn\xE9es de la \ncarte \"{0}\", mais il n'y a pas de s\xE9lection. +replaceMapGone.message=La carte {0} n'est plus disponible.\n +replaceMapNoSelection.message=Vous avez choisi de remplacer les cases s\xE9lectionn\xE9es de la \ncarte \"{0}\", mais il n'y a pas de s\xE9lection. replacedZero.message=Aucun objet correspondant trouv\xE9. replacedOne.message=1 L'objet a \xE9t\xE9 remplac\xE9. replacedMany.message={0} Les objets ont \xE9t\xE9 remplac\xE9s. Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 23:02:50 UTC (rev 798) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 23:40:33 UTC (rev 799) @@ -148,19 +148,19 @@ confirmClosePickmap.message=Om du st\xE4nger plockkartan ''{0}'' kommer alla nyliga\n\xE4ndringar att f\xF6rloras.\n Vill du verkligen st\xE4nga den? confirmDeletePickmap.title=Radera fil f\xF6r plockkarta? -confirmDeletePickmap=Plockkartan ''{0}'' \xE4r st\xE4ngd.\nVill du ocks\xE5 ta bort filen ''{1}''?\nBorttagning av filen kommer att permanent radera plockkartan. +confirmDeletePickmap.message=Plockkartan ''{0}'' \xE4r st\xE4ngd.\nVill du ocks\xE5 ta bort filen ''{1}''?\nBorttagning av filen kommer att permanent radera plockkartan. confirmSaveChanges.title=Spara \xE4ndringar? -confirmSaveChanges=Vill du spara \xE4ndringar p\xE5 kartan {0}? +confirmSaveChanges.message=Vill du spara \xE4ndringar p\xE5 kartan {0}? confirmCreatePickmap.title=Kan inte \xF6ppna plockkarta -confirmCreatePickmap=Det finns ingen kartfil f\xF6r ''{0}''.\nVill du skapa den filen genom att spara denna plockkarta? +confirmCreatePickmap.message=Det finns ingen kartfil f\xF6r ''{0}''.\nVill du skapa den filen genom att spara denna plockkarta? confirmRevertMap.title=\xC5terst\xE4ll karta? -confirmRevertMap=Om du \xE5terst\xE4ller kartan ''{0}''\ntill dess senaste sparade version kommer alla nyliga \xE4ndringar att f\xF6rloras.\nVill du verkligen \xE5terst\xE4lla kartan? +confirmRevertMap.message=Om du \xE5terst\xE4ller kartan ''{0}''\ntill dess senaste sparade version kommer alla nyliga \xE4ndringar att f\xF6rloras.\nVill du verkligen \xE5terst\xE4lla kartan? confirmRevertPickmap.title=\xC5terst\xE4ll plockkarta? -confirmRevertPickmap=Om du \xE5terst\xE4ller plockkartan ''{0}''\ntill dess senaste sparade version kommer alla nyliga \xE4ndringar att f\xF6rloras.\nVill du verkligen \xE5terst\xE4lla plockkartan? +confirmRevertPickmap.message=Om du \xE5terst\xE4ller plockkartan ''{0}''\ntill dess senaste sparade version kommer alla nyliga \xE4ndringar att f\xF6rloras.\nVill du verkligen \xE5terst\xE4lla plockkartan? loadDuplicateFace.title=Fel: duplicerad bild loadDuplicateFace.message=Varning!\n\nDuplicerad bild: ''{0}''\nFil: ''{1}''\nJag kommer att ignorera detta duplikat. @@ -218,11 +218,11 @@ mapErrorPath.title=Fel vid skapande av s\xF6kv\xE4g mapErrorPath.message=Var v\xE4nlig kontrollera att kartans s\xF6kv\xE4g existerar och \xE4r korrekt: "{0}". mapQueryLoaded.title=Kartan \xE4r inladdad -mapQueryLoaded=Kartan {0} \xE4r \xF6ppen i editorn.\nSka jag autospara och uppdatera den? +mapQueryLoaded.message=Kartan {0} \xE4r \xF6ppen i editorn.\nSka jag autospara och uppdatera den? mapErrorPath2.title=Kan inte hitta karta mapErrorPath2.message=Var v\xE4nlig kontrollera s\xF6kv\xE4gen: "{0}". mapErrorInvalid.title=Ogiltig anslutning till n\xE4rliggande karta -mapErrorInvalid=I {0}: {1}\nanslutningen till {2} \xE4r ogiltig.\nAnslutningen till {3} \xE4r {4}\ngenererad anslutning:{5}\nSka jag avbryta anslutningen? +mapErrorInvalid.message=I {0}: {1}\nanslutningen till {2} \xE4r ogiltig.\nAnslutningen till {3} \xE4r {4}\ngenererad anslutning:{5}\nSka jag avbryta anslutningen? mapErrorFatalPath.title=Kan inte h\xE4mta s\xF6kv\xE4g mapErrorFatalPath.message=Kan inte h\xE4mta s\xF6kv\xE4g\n\xD6desdigert fel:\n{0} mapErrorFatalWrite.title=Kan inte skriva karta @@ -240,7 +240,7 @@ mapMapTabTitle=Kartinst\xE4llningar mapTilesTabTitle=N\xE4rliggande kartor mapTilesNoMapFileNoMapTilePane.title=N\xE4rliggande kartor ej tillg\xE4ngligt -mapTilesNoMapFileNoMapTilePane=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan. +mapTilesNoMapFileNoMapTilePane.message=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan. mapTileRevert.shortdescription=\xC5terst\xE4ll till lagrad s\xF6kv\xE4g mapTileClear.shortdescription=Radera s\xF6kv\xE4g mapTileChoose.shortdescription=V\xE4lj s\xF6kv\xE4g till n\xE4rliggande karta @@ -302,13 +302,13 @@ optionsAppClient=Klient optionsAppEditor=Editor optionsRestart.title=Varning -optionsRestart=De flesta inst\xE4llningarna kr\xE4ver att editor startas om f\xF6r att g\xE4lla. +optionsRestart.message=De flesta inst\xE4llningarna kr\xE4ver att editor startas om f\xF6r att g\xE4lla. optionsValidation=Validering autoValidate.text=Validera automatiskt efter varje \xE4ndring optionsValidators=Validerare # Old Libraries -oldLibsFound=Hittade gamla bibliotek.\nS\xF6kv\xE4g: {0}\nDe anv\xE4nds inte l\xE4ngre. Skall jag ta bort dem? +oldLibsFound.message=Hittade gamla bibliotek.\nS\xF6kv\xE4g: {0}\nDe anv\xE4nds inte l\xE4ngre. Skall jag ta bort dem? oldLibsFound.title=Ta bort gamla bibliotek? #attribute dialog @@ -326,7 +326,7 @@ archCollectDone=Sammanst\xE4ll arketyper: klart! archCollectWarningMultipartTailInPanel.title=Varning under sammanst\xE4llning -archCollectWarningMultipartTailInPanel=Varning under sammanst\xE4llning: hittade svans till multidelsobjekt i panelen! +archCollectWarningMultipartTailInPanel.message=Varning under sammanst\xE4llning: hittade svans till multidelsobjekt i panelen! archCollectWarningMultipartTooShort.title=Varning under sammanst\xE4llning archCollectWarningMultipartTooShort.message=Varning under sammanst\xE4llning: f\xF6r kort multidelsobject! archCollectWarningMissed.title=Varning under sammanst\xE4llning @@ -653,7 +653,7 @@ controlStop.accel=ESCAPE controlOutput=Outdata controlServerWarning.title=Varning -controlServerWarning=<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> +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. checkMap.text=Validera karta @@ -803,11 +803,11 @@ updateError.title=Fel under uppdatering updateError.message=Fel under uppdatering:\n{0}\n\nVar v\xE4nlig uppdatera manuellt. updateErrorUnknownHost.title=Fel under uppdatering -updateErrorUnknownHost=Fel under uppdatering:\nUppdateringsservern kunde inte hittas ("{0}").\n\nVar v\xE4nlig uppdatera manuellt. +updateErrorUnknownHost.message=Fel under uppdatering:\nUppdateringsservern kunde inte hittas ("{0}").\n\nVar v\xE4nlig uppdatera manuellt. updateUnavailable.title=Ingen ny uppdatering tillg\xE4nglig updateUnavailable.message=<html><style type="text/css">.cell'{border-width:1px;border-style:solid;border-color:#000000;background-color:#FFFFFF;color:#000000;}'</style><table><tr><td></td><th class="cell">Installerad</th><th class="cell">Tillg\xE4nglig</th></tr><tr><th class="cell">Version</th><td class="cell">{0}</td><td class="cell">{1}</td></tr><tr><th class="cell">Utvecklare</th><td class="cell">{2}</td><td class="cell">{3}</td></tr><tr><th class="cell">Datum</th><td class="cell">{4}</td><td class="cell">{5}</td></tr></table><p align="center">Ingen nyare version hittad.</p><p>K\xE4lla: {6}<br>Ladda ner: {7}</p></html> updateAvailable.title=Uppdatering tillg\xE4nglig! -updateAvailable=<html><style type="text/css">.cell'{border-width:1px;border-style:solid;border-color:#000000;background-color:#FFFFFF;color:#000000;}'</style><table><tr><td></td><th class="cell">Installerad</th><th class="cell">Tillg\xE4nglig</th></tr><tr><th class="cell">Version</th><td class="cell">{0}</td><td class="cell">{1}</td></tr><tr><th class="cell">Utvecklare</th><td class="cell">{2}</td><td class="cell">{3}</td></tr><tr><th class="cell">Datum</th><td class="cell">{4}</td><td class="cell">{5}</td></tr></table><p align="center">En nyare version \xE4r tillg\xE4nglig. Installera uppdatering?</p><p>OBS: Detta uppdaterar enbart DaimoninEditor.jar. Dina arketypfiler kommer inte att uppdateras.</p><p>(Editorn kan inte anv\xE4ndas medan uppdatering p\xE5g\xE5r)</p><p>K\xE4lla: {6}<br>Nerladdning: {7}</p></html> +updateAvailable.message=<html><style type="text/css">.cell'{border-width:1px;border-style:solid;border-color:#000000;background-color:#FFFFFF;color:#000000;}'</style><table><tr><td></td><th class="cell">Installerad</th><th class="cell">Tillg\xE4nglig</th></tr><tr><th class="cell">Version</th><td class="cell">{0}</td><td class="cell">{1}</td></tr><tr><th class="cell">Utvecklare</th><td class="cell">{2}</td><td class="cell">{3}</td></tr><tr><th class="cell">Datum</th><td class="cell">{4}</td><td class="cell">{5}</td></tr></table><p align="center">En nyare version \xE4r tillg\xE4nglig. Installera uppdatering?</p><p>OBS: Detta uppdaterar enbart DaimoninEditor.jar. Dina arketypfiler kommer inte att uppdateras.</p><p>(Editorn kan inte anv\xE4ndas medan uppdatering p\xE5g\xE5r)</p><p>K\xE4lla: {6}<br>Nerladdning: {7}</p></html> updateFailedNoBackup.title=Uppdatering misslyckades updateFailedNoBackup.message=<html>Kunde inte skapa s\xE4kerhetskopia, updatering misslyckades.<br>Var v\xE4nlig utf\xF6r f\xF6ljande steg manuellt efter att avslutat editorn:<ol><li>d\xF6p om DaimoninEditor.jar till DaimoninEditor.jar.bak<li>d\xF6p om DaimoninEditor.jar.tmp till DaimoninEditor.jar</ol></html> updateFailedNoDownload.title=Uppdatering misslyckades This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-02 23:02:50
|
Revision: 798 http://svn.sourceforge.net/gridarta/?rev=798&view=rev Author: akirschbaum Date: 2006-12-02 15:02:50 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Use correct key name in new map dialog. Modified Paths: -------------- trunk/crossfire/src/cfeditor/messages_de.properties trunk/daimonin/src/daieditor/messages_de.properties trunk/src/app/net/sf/gridarta/messages.properties Modified: trunk/crossfire/src/cfeditor/messages_de.properties =================================================================== --- trunk/crossfire/src/cfeditor/messages_de.properties 2006-12-02 22:44:26 UTC (rev 797) +++ trunk/crossfire/src/cfeditor/messages_de.properties 2006-12-02 23:02:50 UTC (rev 798) @@ -5,7 +5,7 @@ newMap.title=Neue Karte erstellen newPickmap.title=Neue Pickmap erstellen newMapMapName=Name: -newMapParameter=Parameter +newMapParameters=Parameter newMapPickmapName=Name: newMapDimensionOutOfRange.title=Ung\xFCltiger Wert newMapDimensionOutOfRange.message=Die Kartengr\xF6\xDFe muss positiv sein Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 22:44:26 UTC (rev 797) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 23:02:50 UTC (rev 798) @@ -37,7 +37,7 @@ newMap.title=Neue Karte erstellen newPickmap.title=Neue Pickmap erstellen newMapMapName=Name: -newMapParameter=Parameter +newMapParameters=Parameter newMapPickmapName=Name: newMapDimensionOutOfRange.title=Ung\xFCltiger Wert newMapDimensionOutOfRange.message=Die Kartengr\xF6\xDFe muss positiv sein Modified: trunk/src/app/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages.properties 2006-12-02 22:44:26 UTC (rev 797) +++ trunk/src/app/net/sf/gridarta/messages.properties 2006-12-02 23:02:50 UTC (rev 798) @@ -20,7 +20,7 @@ newMap.title=Create New Map newPickmap.title=Create New Pickmap newMapMapName=Map name: -newMapParameter=Parameters +newMapParameters=Parameters newMapPickmapName=Pickmap name: newMapDimensionOutOfRange.title=Illegal Value newMapDimensionOutOfRange.message=Map dimensions must be greater or equal 1 and less or equal 2147483647 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-02 22:44:26
|
Revision: 797 http://svn.sourceforge.net/gridarta/?rev=797&view=rev Author: akirschbaum Date: 2006-12-02 14:44:26 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Use correct key names for 'mapShrink' dialog. Modified Paths: -------------- trunk/daimonin/src/daieditor/messages_de.properties trunk/daimonin/src/daieditor/messages_fr.properties trunk/daimonin/src/daieditor/messages_sv.properties Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 22:26:56 UTC (rev 796) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 22:44:26 UTC (rev 797) @@ -87,8 +87,8 @@ mapTilesAttach.shortdescription=Verbindet die Karte automatisch in allen Richtungen mit ihren benachbarten Karten. mapTilesClear.text=Pfade l\xF6schen mapTilesClear.shortdescription=L\xF6scht die Verbindungspfade zu den benachbarten Karten. -mapShrinkTitle=Karte verkleinern -mapShrinkText=Du hast eine neue Kartengr\xF6\xDFe von {0,number,integer} \xD7 {1,number,integer} gew\xE4hlt. Wenn die Karte\nso verkleinert wird, k\xF6nnten einige Objekte gel\xF6scht werden.\nBist Du sicher, dass Du das willst? +mapShrink.title=Karte verkleinern +mapShrink.message=Du hast eine neue Kartengr\xF6\xDFe von {0,number,integer} \xD7 {1,number,integer} gew\xE4hlt. Wenn die Karte\nso verkleinert wird, k\xF6nnten einige Objekte gel\xF6scht werden.\nBist Du sicher, dass Du das willst? mapHelp.text=Hilfe mapOkay.text=Ok mapRestore.text=Zur\xFCcksetzen Modified: trunk/daimonin/src/daieditor/messages_fr.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-02 22:26:56 UTC (rev 796) +++ trunk/daimonin/src/daieditor/messages_fr.properties 2006-12-02 22:44:26 UTC (rev 797) @@ -8,8 +8,8 @@ overwriteOtherFile=Un fichier nomm\xE9 "{0}" existe d\xE9j\xE0.\n\nVoulez vous vraiment le remplacer? mapTitle={0} ({1}) - Propri\xE9t\xE9s de la carte -mapShrinkTitle=Confirm shrinking map -mapShrinkText=Vous avez s\xE9lectionn\xE9 une carte de taille {0,number,integer} \xD7 {1,number,integer}. En modifiant la taille \nde la carte ainsi, certains objets seraient d\xE9truits.\\xCAtes-vous certain de le faire? +mapShrink.title=Confirm shrinking map +mapShrink.message=Vous avez s\xE9lectionn\xE9 une carte de taille {0,number,integer} \xD7 {1,number,integer}. En modifiant la taille \nde la carte ainsi, certains objets seraient d\xE9truits.\\xCAtes-vous certain de le faire? #replace replaceTitle=Remplacer Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 22:26:56 UTC (rev 796) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 22:44:26 UTC (rev 797) @@ -208,7 +208,7 @@ mapTilesClear.text=Rensa s\xF6kv\xE4gar mapTilesClear.shortdescription=T\xF6m alla s\xF6kv\xE4gar mapShrink.title=Bekr\xE4fta storleksminskning -mapShrink=Du valde en ny kartstorlek p\xE5 {0,number,integer} \xD7 {1,number,integer}. Om storleken \xE4ndras \ns\xE5, kan vissa objekt kapas bort och raderas.\n\xC4r du s\xE4ker att du vill forts\xE4tta? +mapShrink.message=Du valde en ny kartstorlek p\xE5 {0,number,integer} \xD7 {1,number,integer}. Om storleken \xE4ndras \ns\xE5, kan vissa objekt kapas bort och raderas.\n\xC4r du s\xE4ker att du vill forts\xE4tta? mapHelp.text=Hj\xE4lp mapOkay.text=Ok mapRestore.text=\xC5terst\xE4ll This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2006-12-02 22:26:56
|
Revision: 796 http://svn.sourceforge.net/gridarta/?rev=796&view=rev Author: akirschbaum Date: 2006-12-02 14:26:56 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Rename '<key>=...' to '<key>.message=...'. Modified Paths: -------------- trunk/daimonin/src/daieditor/messages_de.properties trunk/daimonin/src/daieditor/messages_sv.properties Modified: trunk/daimonin/src/daieditor/messages_de.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 18:42:43 UTC (rev 795) +++ trunk/daimonin/src/daieditor/messages_de.properties 2006-12-02 22:26:56 UTC (rev 796) @@ -23,15 +23,15 @@ zoomClose.mnemonic=C zoomClose.accel=ctrl pressed W -zoomOutOfMem=Nicht genug Speicher f\xFCr Vergr\xF6\xDFerungsstufe.\nVersuche, den Editor mit -Xmx128m oder -Xmx256m zu starten. +zoomOutOfMem.message=Nicht genug Speicher f\xFCr Vergr\xF6\xDFerungsstufe.\nVersuche, den Editor mit -Xmx128m oder -Xmx256m zu starten. zoomOutOfMem.title=Out of Memory -zoomSaveOutOfMem=Not enough memory to save preview, sorry.\nTry restarting with -Xmx128m or -Xmx256m. +zoomSaveOutOfMem.message=Not enough memory to save preview, sorry.\nTry restarting with -Xmx128m or -Xmx256m. zoomSaveOutOfMem.title=Out of Memory ########## # Dialogs warning=Warnung! overwriteOtherFile.title=Datei \xFCberschreiben? -overwriteOtherFile=Eine Datei mit Namen "{0}" existiert bereits.\n\nWirklich \xFCberschreiben? +overwriteOtherFile.message=Eine Datei mit Namen "{0}" existiert bereits.\n\nWirklich \xFCberschreiben? # New Map newMap.title=Neue Karte erstellen @@ -95,15 +95,15 @@ mapCancel.text=Abbrechen mapSizeDefault.text=Standardgr\xF6\xDFe (24 \xD7 24) mapErrorUnsaved.title=Fehlender Dateipfad -mapErrorUnsaved=Kann ungespeicherte Karte nicht verbinden.\nDie Karte muss zuerst im Kartenverzeichnis gespeichert werden! +mapErrorUnsaved.message=Kann ungespeicherte Karte nicht verbinden.\nDie Karte muss zuerst im Kartenverzeichnis gespeichert werden! mapErrorPath.title=Fehler beim Erzeugen des Pfades -mapErrorPath=Bitte \xFCberpr\xFCfe, ob der Dateipfad zur Karte richtig ist: "{0}". +mapErrorPath.message=Bitte \xFCberpr\xFCfe, ob der Dateipfad zur Karte richtig ist: "{0}". mapQueryLoaded.title=Karte ist ge\xF6ffnet -mapQueryLoaded=Die Karte {0} ist im Editor ge\xF6ffnet.\nSoll ich sie automatisch speichern und aktualisieren? +mapQueryLoaded.message=Die Karte {0} ist im Editor ge\xF6ffnet.\nSoll ich sie automatisch speichern und aktualisieren? mapErrorPath2.title=Karte nicht gefunden -mapErrorPath2=Bitte \xFCberpr\xFCfe den Dateipfad f\xFCr die Karte: "{0}}". +mapErrorPath2.message=Bitte \xFCberpr\xFCfe den Dateipfad f\xFCr die Karte: "{0}}". mapErrorInvalid.title=Ung\xFCltiger Kartenpfad -mapErrorInvalid=In {0}: {1}\nder Pfad zu {2} ist ung\xFCltig.\nDer Pfad nach {3} ist {4}\nErzeugter Pfad:{5}\nVerbinden abbrechen? +mapErrorInvalid.message=In {0}: {1}\nder Pfad zu {2} ist ung\xFCltig.\nDer Pfad nach {3} ist {4}\nErzeugter Pfad:{5}\nVerbinden abbrechen? mapTilePathMode.shortdescription=Zwischen relativem und absoluten Pfad wechseln mapMapTabTitle=Karteneigenschaften mapTilesTabTitle=Verbindungspfade @@ -479,7 +479,7 @@ update.accel=ctrl pressed U update.title=Update updateCloseMaps.title=Fehler beim Update -updateCloseMaps=Alle Dateien m\xFCssen geschlossen werden, bevor ein Update durchgef\xFChrt werden kann. +updateCloseMaps.message=Alle Dateien m\xFCssen geschlossen werden, bevor ein Update durchgef\xFChrt werden kann. update.message=Nach Update suchen? updateAvailable=Eine neuere Version des Editors ist verf\xFCgbar. Update installieren? Modified: trunk/daimonin/src/daieditor/messages_sv.properties =================================================================== --- trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 18:42:43 UTC (rev 795) +++ trunk/daimonin/src/daieditor/messages_sv.properties 2006-12-02 22:26:56 UTC (rev 796) @@ -46,7 +46,7 @@ # Dialogs warning=Varning! overwriteOtherFile.title=Skriv \xF6ver existerande fil? -overwriteOtherFile=En fil med namnet "{0}" existerar redan.\n\nVill du verkligen skriva \xF6ver den? +overwriteOtherFile.message=En fil med namnet "{0}" existerar redan.\n\nVill du verkligen skriva \xF6ver den? pickmapExists.title=Kan inte skapa plockkarta pickmapExists.message=En plockkarta med namnet {0} finns redan.\nTa antingen bort den tidigare plockkartan eller v\xE4lj ett annat namn. @@ -145,7 +145,7 @@ errCantLoadFaceTree.message=<html>Kan inte \xF6ppna bildtr\xE4det. <br>Du kommer inte att kunna anv\xE4nda det smidigare gr\xE4nssnittet f\xF6r att v\xE4lja bilder till objekt.<br>F\xF6r att l\xF6sa detta beh\xF6ver du antingen en version <code>arch/</code> som inneh\xE5ller <code>arch/dev/editor/conf/facetree</code>,<br>eller s\xE5 m\xE5ste du sammanst\xE4lla arketyper sj\xE4lv.</html> confirmClosePickmap.title=St\xE4nga plockkarta? -confirmClosePickmap=Om du st\xE4nger plockkartan ''{0}'' kommer alla nyliga\n\xE4ndringar att f\xF6rloras.\n Vill du verkligen st\xE4nga den? +confirmClosePickmap.message=Om du st\xE4nger plockkartan ''{0}'' kommer alla nyliga\n\xE4ndringar att f\xF6rloras.\n Vill du verkligen st\xE4nga den? confirmDeletePickmap.title=Radera fil f\xF6r plockkarta? confirmDeletePickmap=Plockkartan ''{0}'' \xE4r st\xE4ngd.\nVill du ocks\xE5 ta bort filen ''{1}''?\nBorttagning av filen kommer att permanent radera plockkartan. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-02 18:42:43
|
Revision: 795 http://svn.sourceforge.net/gridarta/?rev=795&view=rev Author: christianhujer Date: 2006-12-02 10:42:43 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Some unification of CFArchTypeList. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CFArchTypeList.java trunk/daimonin/src/daieditor/CFArchTypeList.java Modified: trunk/crossfire/src/cfeditor/CFArchTypeList.java =================================================================== --- trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-02 18:32:40 UTC (rev 794) +++ trunk/crossfire/src/cfeditor/CFArchTypeList.java 2006-12-02 18:42:43 UTC (rev 795) @@ -64,11 +64,22 @@ private int[] spellNum; // array of spell numbers - private final Map<String, CAttribBitmask> bitmaskTable; // table with CAttribBitmask objects (value) sorted by name (key) + /** + * Table with CAttribBitmask objects (value) accessible by name (key). + */ + private final Map<String, CAttribBitmask> bitmaskTable; - private final Map<String, List<?>> listTable; // table with List objects for lists (value) sorted by name (key) + /** + * Table with List objects for lists (value) accessible by name (key). + * The value type of the list is <code><?></code> because the lists elements are altering Integers and Strings. + * @todo Refactor the List to contain Pairs or something like that so it doesn't contain two types. + */ + private final Map<String, List<?>> listTable; - private Map<String, List<String>> ignoreListTable; // table with List objects for ignore_lists (value) sorted by name (key) + /** + * Table with List objects for ignore_lists (value) accessible by name (key). + */ + private Map<String, List<String>> ignoreListTable; private int length = 0; // Number of types in the list @@ -235,11 +246,6 @@ return list; } - /** @return true if this typelist contains no data */ - public boolean isEmpty() { - return head == null || head.getNext() == null; - } - /** * @return Number of CFArchTypes in the list. * (Not counting the default type.) @@ -268,10 +274,6 @@ return bitmaskTable; } - public Map<String, List<?>> getListTable() { - return listTable; - } - /** * Return the ignore list table which contains all definitions of ignore lists for arch attributes. * @return ignore list table @@ -281,6 +283,14 @@ } /** + * Returns the list table which contains all definitions of list types for arch attributes. + * @return list table + */ + public Map<String, List<?>> getListTable() { + return listTable; + } + + /** * Read the spells from "spells.xml" into the arrays 'spellName' * and 'spellNum'. This method is called at startup */ @@ -573,11 +583,21 @@ return type; } + /** + * Returns whether this typelist contains no data. + * @return <code>true</code> if this typelist contains no data, otherwise <code>false</code>. + */ + public boolean isEmpty() { + return head == null || head.getNext() == null; + } + + /** * Find and return the type-structure (<code>CFArchType</code>) that * matches the given 'typeName'. These type-names are "artificial" * names, defined in "types.txt". They appear in the type selection box * in the attribute-dialog. + * @param typeName Name of the type to get. * @return the <code>CFArchType</code> that matches, * or the first (misc) type if no match is found. */ Modified: trunk/daimonin/src/daieditor/CFArchTypeList.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-02 18:32:40 UTC (rev 794) +++ trunk/daimonin/src/daieditor/CFArchTypeList.java 2006-12-02 18:42:43 UTC (rev 795) @@ -73,7 +73,9 @@ /** The XPath for using XPath. */ private XPath xpath; - // table with type numbers as keys (Integer), and type names as values (String) + /** + * Table with type numbers as keys (Integer), and type names as values (String). + */ private final Map<Integer, String> archTypeNumbers = new HashMap<Integer, String>(); /** List with arch object matchers. */ @@ -87,12 +89,22 @@ private final List<CFArchType> archTypeList = new ArrayList<CFArchType>(); // All but the default ArchType // spell info: - private final Map<String, CAttribBitmask> bitmaskTable; // table with CAttribBitmask objects (value) sorted by name (key) + /** + * Table with CAttribBitmask objects (value) accessible by name (key). + */ + private final Map<String, CAttribBitmask> bitmaskTable; - // TODO: Find value type of List - private final Map<String, List<?>> listTable; // table with List objects for lists (value) sorted by name (key) + /** + * Table with List objects for lists (value) accessible by name (key). + * The value type of the list is <code><?></code> because the lists elements are altering Integers and Strings. + * @todo Refactor the List to contain Pairs or something like that so it doesn't contain two types. + */ + private final Map<String, List<?>> listTable; - private Map<String, List<String>> ignoreListTable; // table with List objects for ignore_lists (value) sorted by name (key) + /** + * Table with List objects for ignore_lists (value) accessible by name (key). + */ + private Map<String, List<String>> ignoreListTable; /** * Check whether the GameObject is an exit. @@ -347,20 +359,6 @@ /** * Find and return the type-structure (<code>CFArchType</code>) that - * matches the given 'typeName'. These type-names are "artificial" - * names, defined in "types.txt". They appear in the type selection box - * in the attribute-dialog. - * @return the <code>CFArchType</code> that matches, - * or the first (misc) type if no match is found. - */ - public CFArchType getTypeByName(final String typeName) { - // return: matching type or first type (misc) if no other found - final CFArchType type = archTypeNames.get(typeName.trim()); - return type == null ? archTypeList.get(0) : type; - } - - /** - * Find and return the type-structure (<code>CFArchType</code>) that * matches for the given arch. This is not only a comparison between * type numbers - special type-attributes must also be dealt with. * <p/> @@ -405,9 +403,27 @@ return archTypeList.get(0); } - /** @return true if this typelist contains no data */ + /** + * Returns whether this typelist contains no data. + * @return <code>true</code> if this typelist contains no data, otherwise <code>false</code>. + */ public boolean isEmpty() { return archTypeList.size() == 0; } + /** + * Find and return the type-structure (<code>CFArchType</code>) that + * matches the given 'typeName'. These type-names are "artificial" + * names, defined in "types.txt". They appear in the type selection box + * in the attribute-dialog. + * @param typeName Name of the type to get. + * @return the <code>CFArchType</code> that matches, + * or the first (misc) type if no match is found. + */ + public CFArchType getTypeByName(final String typeName) { + // return: matching type or first type (misc) if no other found + final CFArchType type = archTypeNames.get(typeName.trim()); + return type == null ? archTypeList.get(0) : type; + } + } // class CFArchTypeList This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-02 18:32:39
|
Revision: 794 http://svn.sourceforge.net/gridarta/?rev=794&view=rev Author: christianhujer Date: 2006-12-02 10:32:40 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Documented the reason for preventing instantiation. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CFJavaEditor.java trunk/daimonin/src/daieditor/CFJavaEditor.java Modified: trunk/crossfire/src/cfeditor/CFJavaEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/CFJavaEditor.java 2006-12-02 18:28:27 UTC (rev 793) +++ trunk/crossfire/src/cfeditor/CFJavaEditor.java 2006-12-02 18:32:40 UTC (rev 794) @@ -31,8 +31,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import net.sf.japi.swing.ActionFactory; import org.apache.log4j.Logger; -import net.sf.japi.swing.ActionFactory; /** * Main class, launches the level editor application. @@ -43,7 +43,7 @@ private static final Logger log = Logger.getLogger(CFJavaEditor.class); - /** Prevent instantiation. */ + /** Prevent instantiation (UtilityClass). */ private CFJavaEditor() { } Modified: trunk/daimonin/src/daieditor/CFJavaEditor.java =================================================================== --- trunk/daimonin/src/daieditor/CFJavaEditor.java 2006-12-02 18:28:27 UTC (rev 793) +++ trunk/daimonin/src/daieditor/CFJavaEditor.java 2006-12-02 18:32:40 UTC (rev 794) @@ -44,7 +44,7 @@ private static final Logger log = Logger.getLogger(CFJavaEditor.class); - /** Prevent instantiation. */ + /** Prevent instantiation (UtilityClass). */ private CFJavaEditor() { } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-02 18:28:28
|
Revision: 793 http://svn.sourceforge.net/gridarta/?rev=793&view=rev Author: christianhujer Date: 2006-12-02 10:28:27 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Cosmetic fix: There's nothing that extends String. Modified Paths: -------------- trunk/daimonin/src/daieditor/CFArchType.java Modified: trunk/daimonin/src/daieditor/CFArchType.java =================================================================== --- trunk/daimonin/src/daieditor/CFArchType.java 2006-12-02 18:27:47 UTC (rev 792) +++ trunk/daimonin/src/daieditor/CFArchType.java 2006-12-02 18:28:27 UTC (rev 793) @@ -186,7 +186,7 @@ throw new RuntimeException("In '" + XML_IGNORE + "' section of type " + typeName + ": ignore_list missing 'name'."); } else if (tlist.getIgnoreListTable().containsKey(a1.getValue().trim())) { // just copy everything from ignorelist to this ignore section - final List<? extends String> ignlist = tlist.getIgnoreListTable().get(a1.getValue().trim()); + final List<String> ignlist = tlist.getIgnoreListTable().get(a1.getValue().trim()); for (final String aIgnlist : ignlist) { ignoreTable.put(aIgnlist, ""); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2006-12-02 18:27:47
|
Revision: 792 http://svn.sourceforge.net/gridarta/?rev=792&view=rev Author: christianhujer Date: 2006-12-02 10:27:47 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Unified CMainControl, made Daimonin compilable again. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:52:03 UTC (rev 791) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 18:27:47 UTC (rev 792) @@ -919,13 +919,13 @@ /** * Open an attribute dialog window for the specified arch - * @param arch attr. window is opened for this arch + * @param gameObject GameObject to open attribute dialog window for. */ public void openAttrDialog(final GameObject gameObject) { if (typeList.isEmpty()) { // types.txt is missing! showMessage("File Missing", "The definitions-file \"types.txt\" is missing! The\nattribute interface doesn't work without that file."); - } else if (gameObject != null && gameObject.getArchetypeName() != null) { + } else if (gameObject != null && gameObject.hasArchetype()) { CAttribDialog.showAttribDialog(typeList, gameObject, this); } } Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:52:03 UTC (rev 791) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 18:27:47 UTC (rev 792) @@ -1229,13 +1229,13 @@ /** * Open an attribute dialog window for the specified arch - * @param arch attr. window is opened for this arch + * @param gameObject GameObject to open attribute dialog window for. */ public void openAttrDialog(final GameObject gameObject) { if (typeList.isEmpty()) { // types.txt is missing! ACTION_FACTORY.showMessageDialog(mainView, "openAttrDialogNoTypes"); - } else if (arch != null && arch.hasArchetype()) { + } else if (gameObject != null && gameObject.hasArchetype()) { CAttribDialog.showAttribDialog(typeList, gameObject, this); } else { ACTION_FACTORY.showMessageDialog(mainView, "openAttrDialogNoDefaultArch"); @@ -1247,7 +1247,7 @@ * @param file File to save to * @param mapModel MapModel to save */ - public void encodeMapFile(final File file, final MapModel mapModel) { + public void encodeMapFile(@NotNull final File file, final MapModel mapModel) { try { final CMapWriter mapFileEncoder = new CMapWriter(file); try { 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-02 11:47:47
|
Revision: 790 http://svn.sourceforge.net/gridarta/?rev=790&view=rev Author: akirschbaum Date: 2006-12-02 03:47:48 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Remove bad comment. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:47:03 UTC (rev 789) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:47:48 UTC (rev 790) @@ -250,7 +250,7 @@ // now collect all arch you can find in the arch path!! System.gc(); - mainView.updateFocus(false); /*MTMT*/ + mainView.updateFocus(false); } /** 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:47:03
|
Revision: 789 http://svn.sourceforge.net/gridarta/?rev=789&view=rev Author: akirschbaum Date: 2006-12-02 03:47:03 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Make method private. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:44:12 UTC (rev 788) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:47:03 UTC (rev 789) @@ -385,7 +385,7 @@ * Set all global settings (mostly read from the * 'CFJavaEditor.ini'-file) */ - public void readGlobalSettings() { + private void readGlobalSettings() { // Get the directories strMapDir = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(MAP_DIR_KEY, DEFAULT_MAP_DIR); strArchDir = CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(ARCH_DIR_KEY, DEFAULT_ARCH_DIR); Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:44:12 UTC (rev 788) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:47:03 UTC (rev 789) @@ -681,7 +681,7 @@ } /** Set all global settings from the preferences. */ - void readGlobalSettings() { + private void readGlobalSettings() { initDirs(); loadFromArchive = prefs.getBoolean(LOAD_ARCH_COLL, true); 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:44:13
|
Revision: 788 http://svn.sourceforge.net/gridarta/?rev=788&view=rev Author: akirschbaum Date: 2006-12-02 03:44:12 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Rename variable names. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/daimonin/src/daieditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:42:16 UTC (rev 787) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:44:12 UTC (rev 788) @@ -265,15 +265,15 @@ } } - void moveTileUp(final GameObject arch, final boolean refresh) { - arch.moveUp(); + void moveTileUp(final GameObject gameObject, final boolean refresh) { + gameObject.moveUp(); if (refresh) { refreshCurrentMap(); } } - void moveTileDown(final GameObject arch, final boolean refresh) { - arch.moveDown(); + void moveTileDown(final GameObject gameObject, final boolean refresh) { + gameObject.moveDown(); if (refresh) { refreshCurrentMap(); } @@ -491,8 +491,8 @@ } // setup quick view window - public void showArchPanelQuickObject(final GameObject arch) { - mainView.showArchPanelQuickObject(arch); + public void showArchPanelQuickObject(final GameObject gameObject) { + mainView.showArchPanelQuickObject(gameObject); } /** {@inheritDoc} */ @@ -921,12 +921,12 @@ * Open an attribute dialog window for the specified arch * @param arch attr. window is opened for this arch */ - public void openAttrDialog(final GameObject arch) { + public void openAttrDialog(final GameObject gameObject) { if (typeList.isEmpty()) { // types.txt is missing! showMessage("File Missing", "The definitions-file \"types.txt\" is missing! The\nattribute interface doesn't work without that file."); - } else if (arch != null && arch.getArchetypeName() != null) { - CAttribDialog.showAttribDialog(typeList, arch, this); + } else if (gameObject != null && gameObject.getArchetypeName() != null) { + CAttribDialog.showAttribDialog(typeList, gameObject, this); } } Modified: trunk/daimonin/src/daieditor/CMainControl.java =================================================================== --- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:42:16 UTC (rev 787) +++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-02 11:44:12 UTC (rev 788) @@ -1234,12 +1234,12 @@ * Open an attribute dialog window for the specified arch * @param arch attr. window is opened for this arch */ - public void openAttrDialog(final GameObject arch) { + public void openAttrDialog(final GameObject gameObject) { if (typeList.isEmpty()) { // types.txt is missing! ACTION_FACTORY.showMessageDialog(mainView, "openAttrDialogNoTypes"); } else if (arch != null && arch.hasArchetype()) { - CAttribDialog.showAttribDialog(typeList, arch, this); + CAttribDialog.showAttribDialog(typeList, gameObject, this); } else { ACTION_FACTORY.showMessageDialog(mainView, "openAttrDialogNoDefaultArch"); } 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:42:16
|
Revision: 787 http://svn.sourceforge.net/gridarta/?rev=787&view=rev Author: akirschbaum Date: 2006-12-02 03:42:16 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Make functions to retrieve fixed icons static. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMapTileList.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:35:36 UTC (rev 786) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:42:16 UTC (rev 787) @@ -115,25 +115,25 @@ private AnimationObjects animationObjects; // icons for the map and arch pictures . X= rectangle, normal = iso - private ImageIcon mapSelIcon; + private static ImageIcon mapSelIcon; - private ImageIcon mapGridIcon; + private static ImageIcon mapGridIcon; - private ImageIcon unknownTileIcon; + private static ImageIcon unknownTileIcon; - private ImageIcon nofaceTileIcon; + private static ImageIcon nofaceTileIcon; - private ImageIcon mapSelIconX; + private static ImageIcon mapSelIconX; - private ImageIcon mapGridIconX; + private static ImageIcon mapGridIconX; - private ImageIcon unknownTileIconX; + private static ImageIcon unknownTileIconX; - private ImageIcon nofaceTileIconX; + private static ImageIcon nofaceTileIconX; - private ImageIcon noarchTileIcon; + private static ImageIcon noarchTileIcon; - private ImageIcon noarchTileIconX; + private static ImageIcon noarchTileIconX; private final ArchetypeSet archetypeSet; // the one and only arch list @@ -1630,43 +1630,43 @@ return mapGridIcon; } - public ImageIcon getUnknownTileIcon() { + public static ImageIcon getUnknownTileIcon() { return unknownTileIconX; } - public ImageIcon getUnknownTileIconX() { + public static ImageIcon getUnknownTileIconX() { return unknownTileIconX; } - public ImageIcon getNoarchTileIcon() { + public static ImageIcon getNoarchTileIcon() { return noarchTileIconX; } - public ImageIcon getNoarchTileIconF() { + public static ImageIcon getNoarchTileIconF() { return noarchTileIcon; } - public ImageIcon getNoarchTileIconX() { + public static ImageIcon getNoarchTileIconX() { return noarchTileIconX; } - public ImageIcon getNofaceTileIcon() { + public static ImageIcon getNofaceTileIcon() { return nofaceTileIconX; } - public ImageIcon getNofaceTileIconF() { + public static ImageIcon getNofaceTileIconF() { return nofaceTileIcon; } - public ImageIcon getNofaceTileIconX() { + public static ImageIcon getNofaceTileIconX() { return nofaceTileIconX; } - public ImageIcon getMapSelIconF() { + public static ImageIcon getMapSelIconF() { return mapSelIcon; } - public ImageIcon getMapSelIconX() { + public static ImageIcon getMapSelIconX() { return mapSelIconX; } @@ -1674,7 +1674,7 @@ * Load all system tile icons into temporare variables for more convenient * access. */ - private void loadDefTiles() { + private static void loadDefTiles() { mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IGRID_TILE); mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_ISEL_TILE); unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IUNKNOWN); @@ -1731,7 +1731,7 @@ return scriptControl; } - public ImageIcon getEmptyTileIcon() { + public static ImageIcon getEmptyTileIcon() { return nofaceTileIconX; } Modified: trunk/crossfire/src/cfeditor/CMapTileList.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-02 11:35:36 UTC (rev 786) +++ trunk/crossfire/src/cfeditor/CMapTileList.java 2006-12-02 11:42:16 UTC (rev 787) @@ -410,7 +410,7 @@ // We must set a disabled Icon (even though we don't want it) // If unset, in JDK 1.4 swing tries to generate a greyed out version // of the lable-icon from the image-producer - causing a runtime error. - setDisabledIcon(mainControl.getUnknownTileIcon()); + setDisabledIcon(CMainControl.getUnknownTileIcon()); // arch == null should not happen, but it *can* happen when the active // window gets changed by user and java is still blitting here @@ -422,11 +422,11 @@ } if (gameObject.getArchetypeName() == null) { - setIcon(mainControl.getNoarchTileIcon()); + setIcon(CMainControl.getNoarchTileIcon()); } else if (gameObject.getFaceFlag()) { - setIcon(mainControl.getNofaceTileIcon()); + setIcon(CMainControl.getNofaceTileIcon()); } else if (gameObject.getFaceNr() == -1) { - setIcon(mainControl.getUnknownTileIcon()); + setIcon(CMainControl.getUnknownTileIcon()); } else { setIcon(mainControl.getFace(gameObject.getFaceNr())); } @@ -450,7 +450,7 @@ } } } else { - setIcon(mainControl.getUnknownTileIcon()); + setIcon(CMainControl.getUnknownTileIcon()); setText("?"); } setBorder(BorderFactory.createEmptyBorder(0, Math.max(0, indent - 1) * 16, 0, 0)); // indentation 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:35:36
|
Revision: 786 http://svn.sourceforge.net/gridarta/?rev=786&view=rev Author: akirschbaum Date: 2006-12-02 03:35:36 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Make method private. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CMainControl.java Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:33:24 UTC (rev 785) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:35:36 UTC (rev 786) @@ -1674,7 +1674,7 @@ * Load all system tile icons into temporare variables for more convenient * access. */ - public void loadDefTiles() { + private void loadDefTiles() { mapGridIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IGRID_TILE); mapSelIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_ISEL_TILE); unknownTileIcon = CGUIUtils.getSysIcon(IGUIConstants.TILE_IUNKNOWN); 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:33:25
|
Revision: 785 http://svn.sourceforge.net/gridarta/?rev=785&view=rev Author: akirschbaum Date: 2006-12-02 03:33:24 -0800 (Sat, 02 Dec 2006) Log Message: ----------- Rename method names. Modified Paths: -------------- trunk/crossfire/src/cfeditor/CFJavaEditor.java trunk/crossfire/src/cfeditor/CMainControl.java trunk/crossfire/src/cfeditor/CMainMenu.java trunk/crossfire/src/cfeditor/CMainToolbar.java trunk/crossfire/src/cfeditor/CMainView.java trunk/crossfire/src/cfeditor/CMapViewBasic.java Modified: trunk/crossfire/src/cfeditor/CFJavaEditor.java =================================================================== --- trunk/crossfire/src/cfeditor/CFJavaEditor.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CFJavaEditor.java 2006-12-02 11:33:24 UTC (rev 785) @@ -147,7 +147,7 @@ if (f.canRead()) { mainControl.openFile(f); mainControl.createImageWanted(out); - mainControl.closeCurrentLevelWanted(); + mainControl.close(); } } Modified: trunk/crossfire/src/cfeditor/CMainControl.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-02 11:33:24 UTC (rev 785) @@ -416,7 +416,7 @@ this.getMainView().setMapTileListBottom(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(CMainView.MAPTILE_BOTTOM_KEY, "false")).booleanValue()); - setPickmapsLocked(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false")).booleanValue()); + setLockAllPickmaps(new Boolean(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(PICKMAPS_LOCKED, "false")).booleanValue()); // docu version if (IGUIConstants.DOCU_VERSION > (new Integer(CSettings.getInstance(IGUIConstants.APP_NAME).getProperty(DOCU_VERSION_KEY, "0"))).intValue()) { @@ -473,7 +473,7 @@ return loadFromArchive; } - public boolean isPickmapsLocked() { + public boolean isLockAllPickmaps() { return pickmapsLocked; } @@ -611,7 +611,7 @@ } /** Invoked when user wants to begin editing a new (empty) map. */ - public void newLevelWanted() { + public void createNew() { newLevelWanted(null); } @@ -626,7 +626,7 @@ } /** Invoked when user wants to open a new pickmap */ - public void newPickmapWanted() { + public void addNewPickmap() { CMainStatusbar.getInstance().setText(" Creating new pickmap..."); CNewMapDialog.showNewMapDialog(this, mainView, null, MapType.PICKMAP); CMainStatusbar.getInstance().setText(""); @@ -670,7 +670,7 @@ } /** Invoked when the user wants to close the current level. */ - public void closeCurrentLevelWanted() { + public void close() { if (currentMap != null) { closeLevel(currentMap, false); if (currentMap != null) { @@ -680,7 +680,7 @@ } /** Invoked when the user wants to close all levels. */ - public void closeAllLevelsWanted() { + public void closeAll() { for (; levels.size() > 0;) { closeLevel(currentMap, false); if (currentMap != null) { @@ -690,7 +690,7 @@ } /** Invoked when the user wants to close the active pickmap */ - public void closeActivePickmapWanted() { + public void closePickmap() { if (!CPickmapPanel.getInstance().isLoadComplete()) { showMessage("Cannot close Pickmap", "Pickmaps aren't loaded.\n" + "Either there are no pickmaps or the loading process is not complete."); @@ -765,7 +765,7 @@ } /** Open active pickmap as normal map for extensive editing */ - public void openActivePickmapAsMapWanted() { + public void openPickmapMap() { if (!CPickmapPanel.getInstance().isLoadComplete()) { showMessage("Cannot open Pickmap", "Pickmaps aren't loaded.\n" + "Either there are no pickmaps or the loading process is not complete."); @@ -783,7 +783,7 @@ if (!pickmapFile.exists()) { if (askConfirm("Cannot open Pickmap", "The map file for '" + activePickmap.getMapFileName() + "' does not exist.\n" + "Do you want to create the file by saving this pickmap?")) { - saveActivePickmapWanted(); + savePickmap(); openFile(pickmapFile); } } else { @@ -795,7 +795,7 @@ } /** Invoked when user wants to open a file. */ - public void openFileWanted() { + public void open() { final JFileChooser fileChooser = new JFileChooser(); fileChooser.setDialogTitle("Open Map File"); fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); @@ -997,7 +997,7 @@ } /** Invoked when user wants to save the current level. */ - public void saveCurrentLevelWanted() { + public void save() { if (currentMap == null) { return; } @@ -1006,7 +1006,7 @@ } /** Save current active pickmap */ - public void saveActivePickmapWanted() { + public void savePickmap() { if (!CPickmapPanel.getInstance().isLoadComplete()) { showMessage("Cannot save Pickmap", "Pickmaps aren't loaded.\n" + "Either there are no pickmaps or the loading process is not complete."); @@ -1026,7 +1026,7 @@ } /** Invoked when user wants to save the current level to certain file. */ - public void saveCurrentLevelAsWanted() { + public void saveAs() { saveLevelAsWanted(currentMap); } @@ -1078,7 +1078,7 @@ * In this method, a filechooser is opened to let the user select * an output file name/path for the png image. */ - public void createImageWanted() { + public void createImg() { final MapControl mc = currentMap; // control of current map if (mc == null) { @@ -1164,7 +1164,7 @@ } /** Invoked when user wants to see/edit the level properties. */ - void mapPropertiesWanted() { + public void mapProperties() { showMapProperties(currentMap); } @@ -1189,7 +1189,7 @@ void toggleShowTiles() { } - void optionsWanted() { + public void options() { new COptionDialog(this, mainView); } @@ -1208,12 +1208,12 @@ } } - void setPickmapsLocked(final boolean state) { + void setLockAllPickmaps(final boolean state) { pickmapsLocked = state; } /** Invoked when user wants to exit from the program. */ - void exitWanted() { + public void exit() { if (levels.size() > 0) { for (final MapControl level : levels) { closeLevel(level, false); @@ -1231,7 +1231,7 @@ /** * Try to load the map where the selected map-exit points to. */ - public void enterExitWanted() { + public void enterExit() { final GameObject exit = currentMap.getMapModel().getExit(); if (exit == null) { // no exit found @@ -1373,12 +1373,12 @@ } /** Gives focus to the previous window. */ - public void previousWindowWanted() { + public void prevWindow() { mainView.previousWindowWanted(); } /** Gives focus to the next window. */ - public void nextWindowWanted() { + public void nextWindow() { mainView.nextWindowWanted(); } @@ -1395,7 +1395,7 @@ } /** Invoked when user wants to revert the current map to previously saved state */ - public void revertCurrentLevelWanted() { + public void revert() { final MapControl modmap = this.currentMap; // "modified map" to be reverted // ask for confirmation @@ -1413,7 +1413,7 @@ } /** Invoked when user wants to revert the current map to previously saved state */ - public void revertActivePickmapWanted() { + public void revertPickmap() { if (!CPickmapPanel.getInstance().isLoadComplete()) { showMessage("Cannot revert Pickmap", "Pickmaps aren't loaded.\n" + "Either there are no pickmaps or the loading process is not complete."); @@ -1448,7 +1448,7 @@ } /** "Clear" was selected from the Edit menu. */ - public void clearWanted() { + public void clear() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... } @@ -1457,7 +1457,7 @@ } /** "Cut" was selected from the Edit menu. */ - public void cutWanted() { + public void cut() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... } @@ -1466,7 +1466,7 @@ } /** "Copy" was selected from the Edit menu. */ - public void copyWanted() { + public void copy() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... } @@ -1475,7 +1475,7 @@ } /** "Paste" was selected from the Edit menu. */ - public void pasteWanted() { + public void paste() { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... } @@ -1483,11 +1483,21 @@ copybuffer.paste(currentMap); } + /** "Fill above" was selected from the Edit menu. */ + public void fillAbove() { + fillWanted(false); + } + + /** "Fill below" was selected from the Edit menu. */ + public void fillBelow() { + fillWanted(true); + } + /** * "Fill" was selected from the Edit menu. * @param fillBelow true if "Fill Below" was activated, false if "Fill Above" */ - public void fillWanted(final boolean fillBelow) { + private void fillWanted(final boolean fillBelow) { if (currentMap == null || currentMap.getMapViewFrame() == null) { return; // this should never be possible, but I just wanna make sure... } Modified: trunk/crossfire/src/cfeditor/CMainMenu.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CMainMenu.java 2006-12-02 11:33:24 UTC (rev 785) @@ -253,7 +253,7 @@ m_new.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.newLevelWanted(); + mainControl.createNew(); } }); menuManager.addMenuEntry("main.file", m_new); @@ -265,7 +265,7 @@ m_open.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.openFileWanted(); + mainControl.open(); } }); menuManager.addMenuEntry("main.file", m_open); @@ -277,7 +277,7 @@ m_close.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.closeCurrentLevelWanted(); + mainControl.close(); } }); menuManager.addMenuEntry("main.file", m_close); @@ -291,7 +291,7 @@ m_save.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.saveCurrentLevelWanted(); + mainControl.save(); } }); menuManager.addMenuEntry("main.file", m_save); @@ -303,7 +303,7 @@ m_saveAs.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.saveCurrentLevelAsWanted(); + mainControl.saveAs(); } }); menuManager.addMenuEntry("main.file", m_saveAs); @@ -314,7 +314,7 @@ m_revert.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.revertCurrentLevelWanted(); + mainControl.revert(); } }); menuManager.addMenuEntry("main.file", m_revert); @@ -325,7 +325,7 @@ m_createImg.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.createImageWanted(); + mainControl.createImg(); } }); menuManager.addMenuEntry("main.file", m_createImg); @@ -339,7 +339,7 @@ m_options.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.optionsWanted(); + mainControl.options(); } }); menuManager.addMenuEntry("main.file", m_options); @@ -352,7 +352,7 @@ m_exit.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.exitWanted(); + mainControl.exit(); } }); menuManager.addMenuEntry("main.file", m_exit); @@ -374,7 +374,7 @@ m_clear.setIcon(CGUIUtils.getIcon(IGUIConstants.EMPTY_SMALLICON)); m_clear.addActionListener(new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.clearWanted(); + mainControl.clear(); } }); menuManager.addMenuEntry("main.edit", m_clear); @@ -386,7 +386,7 @@ m_cut.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.cutWanted(); + mainControl.cut(); } }); menuManager.addMenuEntry("main.edit", m_cut); @@ -398,7 +398,7 @@ m_copy.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.copyWanted(); + mainControl.copy(); } }); menuManager.addMenuEntry("main.edit", m_copy); @@ -410,7 +410,7 @@ m_paste.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.pasteWanted(); + mainControl.paste(); } }); menuManager.addMenuEntry("main.edit", m_paste); @@ -436,7 +436,7 @@ m_fill_above.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.fillWanted(false); + mainControl.fillAbove(); } }); menuManager.addMenuEntry("main.edit", m_fill_above); @@ -448,7 +448,7 @@ m_fill_below.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.fillWanted(true); + mainControl.fillBelow(); } }); menuManager.addMenuEntry("main.edit", m_fill_below); @@ -690,7 +690,7 @@ m_enterExit.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.enterExitWanted(); + mainControl.enterExit(); } }); menuManager.addMenuEntry("main.map", m_enterExit); @@ -774,7 +774,7 @@ m_properties.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.mapPropertiesWanted(); + mainControl.mapProperties(); } }); menuManager.addMenuEntry("main.map", m_properties); @@ -798,7 +798,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // lock pickmaps - mainControl.setPickmapsLocked(m_lockPickmaps.isChecked()); + mainControl.setLockAllPickmaps(m_lockPickmaps.isChecked()); m_newPickmap.setEnabled(!m_lockPickmaps.isChecked()); final boolean isArchLoadComplete = mainControl.getArchetypeSet().getLoadStatus() == ArchetypeSet.LoadStatus.COMPLETE; @@ -829,7 +829,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // create new pickmap - mainControl.newPickmapWanted(); + mainControl.addNewPickmap(); } }); menuManager.addMenuEntry("main.pickmaps", m_newPickmap); @@ -841,7 +841,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // close pickmap - mainControl.closeActivePickmapWanted(); + mainControl.closePickmap(); } }); menuManager.addMenuEntry("main.pickmaps", m_deletePickmap); @@ -854,7 +854,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // load pickmap as normal map - mainControl.openActivePickmapAsMapWanted(); + mainControl.openPickmapMap(); } }); menuManager.addMenuEntry("main.pickmaps", m_loadPickmap); @@ -866,7 +866,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // save pickmap - mainControl.saveActivePickmapWanted(); + mainControl.savePickmap(); } }); menuManager.addMenuEntry("main.pickmaps", m_savePickmap); @@ -878,7 +878,7 @@ new ActionListener() { public void actionPerformed(final ActionEvent event) { // revert pickmap - mainControl.revertActivePickmapWanted(); + mainControl.revertPickmap(); } }); menuManager.addMenuEntry("main.pickmaps", m_revertPickmap); @@ -1129,7 +1129,7 @@ m_closeAll.addActionListener( new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.closeAllLevelsWanted(); + mainControl.closeAll(); } }); menu_window.add(m_closeAll); @@ -1187,7 +1187,7 @@ * @param state true when there is an active pickmap */ public void setActivePickmapsEnabled(final boolean state) { - if (!mainControl.isPickmapsLocked()) { + if (!mainControl.isLockAllPickmaps()) { m_deletePickmap.setEnabled(state); m_loadPickmap.setEnabled(state); m_revertPickmap.setEnabled(state); @@ -1213,7 +1213,7 @@ if (isArchLoadComplete) { m_viewTreasure.setEnabled(true); - if (!mainControl.isPickmapsLocked() && mainControl.getMainView().isPickmapActive()) { + if (!mainControl.isLockAllPickmaps() && mainControl.getMainView().isPickmapActive()) { m_deletePickmap.setEnabled(true); m_loadPickmap.setEnabled(true); m_revertPickmap.setEnabled(true); @@ -1232,7 +1232,7 @@ m_savePickmap.setEnabled(false); } - m_newPickmap.setEnabled(!mainControl.isPickmapsLocked()); + m_newPickmap.setEnabled(!mainControl.isLockAllPickmaps()); // is there a valid open map view? if (mainControl.getCurrentMap() == null) { Modified: trunk/crossfire/src/cfeditor/CMainToolbar.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CMainToolbar.java 2006-12-02 11:33:24 UTC (rev 785) @@ -146,7 +146,7 @@ checkIcon(IGUIConstants.NEW_LEVEL_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.newLevelWanted(); + mainControl.createNew(); } }); m_new.setVerticalTextPosition(JButton.BOTTOM); @@ -160,7 +160,7 @@ checkIcon(IGUIConstants.OPEN_LEVEL_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.openFileWanted(); + mainControl.open(); } }); m_open.setVerticalTextPosition(JButton.BOTTOM); @@ -174,7 +174,7 @@ checkIcon(IGUIConstants.SAVE_LEVEL_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.saveCurrentLevelWanted(); + mainControl.save(); } }); m_save.setVerticalTextPosition(JButton.BOTTOM); @@ -188,7 +188,7 @@ checkIcon(IGUIConstants.SAVE_LEVEL_AS_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.saveCurrentLevelAsWanted(); + mainControl.saveAs(); } }); m_saveAs.setVerticalTextPosition(JButton.BOTTOM); @@ -205,7 +205,7 @@ checkIcon(IGUIConstants.PREVIOUS_WINDOW_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.previousWindowWanted(); + mainControl.prevWindow(); } }); m_prevWindow.setVerticalTextPosition(JButton.BOTTOM); @@ -219,7 +219,7 @@ checkIcon(IGUIConstants.NEXT_WINDOW_ICON), new ActionListener() { public void actionPerformed(final ActionEvent event) { - mainControl.nextWindowWanted(); + mainControl.nextWindow(); } }); m_nextWindow.setVerticalTextPosition(JButton.BOTTOM); Modified: trunk/crossfire/src/cfeditor/CMainView.java =================================================================== --- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-02 11:33:24 UTC (rev 785) @@ -153,7 +153,7 @@ addWindowListener( new WindowAdapter() { @Override public void windowClosing(final WindowEvent event) { - mainControl.exitWanted(); + mainControl.exit(); } }); } Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java =================================================================== --- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-02 10:50:19 UTC (rev 784) +++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-02 11:33:24 UTC (rev 785) @@ -521,7 +521,7 @@ if (mapLoc != null) { // in "locked pickmaps" mode, pickmaps react only to leftclicks - if (mapControl.isPickmap() && mainControl.isPickmapsLocked() + if (mapControl.isPickmap() && mainControl.isLockAllPickmaps() && !(e.getModifiers() == MouseEvent.BUTTON1_MASK && !e.isShiftDown() && !e.isControlDown())) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |