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: <ryo...@us...> - 2010-08-02 18:44:50
|
Revision: 8610 http://gridarta.svn.sourceforge.net/gridarta/?rev=8610&view=rev Author: ryo_saeba Date: 2010-08-02 18:44:42 +0000 (Mon, 02 Aug 2010) Log Message: ----------- More translations. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java trunk/src/app/net/sf/gridarta/messages.properties trunk/src/app/net/sf/gridarta/messages_de.properties trunk/src/app/net/sf/gridarta/messages_fr.properties trunk/src/app/net/sf/gridarta/messages_sv.properties Modified: trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java 2010-08-02 17:02:59 UTC (rev 8609) +++ trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java 2010-08-02 18:44:42 UTC (rev 8610) @@ -26,6 +26,9 @@ import javax.swing.JPanel; import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet; import net.sf.gridarta.model.baseobject.BaseObject; +import net.sf.gridarta.utils.ActionBuilderUtils; +import net.sf.japi.swing.action.ActionBuilder; +import net.sf.japi.swing.action.ActionBuilderFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,6 +46,11 @@ private static final long serialVersionUID = 1L; /** + * The {@link ActionBuilder}. + */ + private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta"); + + /** * The {@link ArchetypeTypeSet} for looking up game object types. */ @NotNull @@ -91,16 +99,16 @@ gcl.gridwidth = 1; gcr.gridwidth = GridBagConstraints.REMAINDER; - add(new JLabel("Name:"), gcl); + add(new JLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.captionName")), gcl); add(gameObjectNameLabel, gcr); - add(new JLabel("Arch:"), gcl); + add(new JLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.captionArchetype")), gcl); add(gameObjectArchetypeNameLabel, gcr); - add(new JLabel("Type:"), gcl); + add(new JLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.captionType")), gcl); add(gameObjectTypeLabel, gcr); - add(new JLabel("Tile:"), gcl); + add(new JLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.captionTile")), gcl); add(gameObjectExtentsLabel, gcr); } @@ -114,7 +122,7 @@ public void showObjectChooserQuickObject(@Nullable final BaseObject<?, ?, ?, ?> gameObject, final boolean isPickmapActive) { if (gameObject == null) { if (isPickmapActive) { - gameObjectNameLabel.setText(" -random pick- "); + gameObjectNameLabel.setText(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.randomPick")); gameObjectNameLabel.setForeground(Color.BLUE); } else { gameObjectNameLabel.setText(null); @@ -133,9 +141,9 @@ gameObjectTypeLabel.setText(archetypeTypeSet.getDisplayName(headObject)); if (headObject.isMulti()) { - gameObjectExtentsLabel.setText("<html><span style=\"color:green;\"> multi</span> (" + headObject.getMultiRefCount() + " parts) (" + headObject.getSizeX() + ',' + headObject.getSizeY() + ")</html>"); + gameObjectExtentsLabel.setText(ACTION_BUILDER.format("objectChooser.tileSize", headObject.getMultiRefCount(), headObject.getSizeX(), headObject.getSizeY())); } else { - gameObjectExtentsLabel.setText("single"); + gameObjectExtentsLabel.setText(ActionBuilderUtils.getString(ACTION_BUILDER, "objectChooser.tileSingle")); } } } Modified: trunk/src/app/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages.properties 2010-08-02 17:02:59 UTC (rev 8609) +++ trunk/src/app/net/sf/gridarta/messages.properties 2010-08-02 18:44:42 UTC (rev 8610) @@ -378,7 +378,7 @@ newPickmap.title=Create New Pickmap newPickmapFolder.title=Create New Pickmap Folder newMapMapName=Map name: -mapSizeDefault.text=default map size (24 \xD7 24) +mapSizeDefault.text=default map size (24 \u00d7 24) newMapParameters=Parameters newMapPickmapName=Pickmap name: newMapPickmapFolderName=Pickmap folder name: @@ -539,7 +539,7 @@ mapErrorFatalWrite.title=Can''t write map mapErrorFatalWrite.message=Can''t write map\nFatal Error:\n{0} mapErrorDifferentSize.title=Different size -mapErrorDifferentSize.message=The maps you''re attaching have different sizes.\n{0} has size {1} � {2}, while\n{3} has size {4} � {5}.\nThis is hazardous for server and client and MUST BE FIXED! +mapErrorDifferentSize.message=The maps you''re attaching have different sizes.\n{0} has size {1} \u00ef\u00bf\u00bd {2}, while\n{3} has size {4} \u00ef\u00bf\u00bd {5}.\nThis is hazardous for server and client and MUST BE FIXED! mapTileRevert.shortdescription=Revert to stored path mapTileRevert.text= mapTileClear.shortdescription=Delete path @@ -1497,8 +1497,14 @@ # Object Chooser objectChooser.archetypesTabTitle=Archetypes objectChooser.pickmapsTabTitle=Pickmaps +objectChooser.captionName=Name: +objectChooser.captionArchetype=Arch: +objectChooser.captionType=Type: +objectChooser.captionTile=Tile: +objectChooser.tileSingle=single +objectChooser.randomPick= -random pick- +objectChooser.tileSize=<html><span style=\"color:green;\"> multi</span> ({0} parts) ({1},{2})</html> - #################### # Archetype Chooser editPopup.text=Edit Archetype Modified: trunk/src/app/net/sf/gridarta/messages_de.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-08-02 17:02:59 UTC (rev 8609) +++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-08-02 18:44:42 UTC (rev 8610) @@ -52,14 +52,14 @@ goEast.text=Cursor nach Ost goEast.shortdescription=Bewegt den Cursor nach Osten. -goSouthEast.text=Cursor nach S\xFCdost -goSouthEast.shortdescription=Bewegt den Cursor nach S\xFCdosten. +goSouthEast.text=Cursor nach S\u00fcdost +goSouthEast.shortdescription=Bewegt den Cursor nach S\u00fcdosten. -goSouth.text=Cursor nach S\xFCd -goSouth.shortdescription=Bewegt den Cursor nach S\xFCden. +goSouth.text=Cursor nach S\u00fcd +goSouth.shortdescription=Bewegt den Cursor nach S\u00fcden. -goSouthWest.text=Cursor nach S\xFCdwest -goSouthWest.shortdescription=Bewegt den Cursor nach S\xFCdwesten. +goSouthWest.text=Cursor nach S\u00fcdwest +goSouthWest.shortdescription=Bewegt den Cursor nach S\u00fcdwesten. goWest.text=Cursor nach West goWest.shortdescription=Bewegt den Cursor nach Westen. @@ -76,47 +76,47 @@ goLocation.text=Cursor setzen goLocation.mnemonic=S -goLocation.shortdescription=\xD6ffnet den Dialog "Cursor setzen". +goLocation.shortdescription=\u00d6ffnet den Dialog "Cursor setzen". -selectSquare.text=Feld ausw\xE4hlen -selectSquare.shortdescription=Das Cursor-Feld ausw\xE4hlen. +selectSquare.text=Feld ausw\u00e4hlen +selectSquare.shortdescription=Das Cursor-Feld ausw\u00e4hlen. startStopDrag.text=Auswahl starten/beenden startStopDrag.shortdescription=Beginnt eine neue Auswahl. -addToSelection.text=Zu Auswahl hinzuf\xFCgen -addToSelection.shortdescription=F\xFCgt neue Auswahl zur vorhandenen Auswahl hinzu. +addToSelection.text=Zu Auswahl hinzuf\u00fcgen +addToSelection.shortdescription=F\u00fcgt neue Auswahl zur vorhandenen Auswahl hinzu. subFromSelection.text=Von Auswahl entfernen subFromSelection.shortdescription=Entfernt neue Auswahl von vorhandener Auswahl. -releaseDrag.text=Auswahl l\xF6schen +releaseDrag.text=Auswahl l\u00f6schen releaseDrag.shortdescription=Beendet neue Auswahl. -insertArch.text=Objekt einf\xFCgen -insertArch.shortdescription=F\xFCgt neues Objekt ein. +insertArch.text=Objekt einf\u00fcgen +insertArch.shortdescription=F\u00fcgt neues Objekt ein. -deleteArch.text=Objekt l\xF6schen -deleteArch.shortdescription=L\xF6scht ausgew\xE4hltes Objekt. +deleteArch.text=Objekt l\u00f6schen +deleteArch.shortdescription=L\u00f6scht ausgew\u00e4hltes Objekt. -selectArchAbove.text=Objekt oberhalb ausw\xE4hlen -selectArchAbove.shortdescription=\xC4ndert das ausgew\xE4hlte Objekt auf das dar\xFCberliegende Objekt. +selectArchAbove.text=Objekt oberhalb ausw\u00e4hlen +selectArchAbove.shortdescription=\u00c4ndert das ausgew\u00e4hlte Objekt auf das dar\u00fcberliegende Objekt. -selectArchBelow.text=Objekt unterhalb ausw\xE4hlen -selectArchBelow.shortdescription=\xC4ndert das ausgew\xE4hlte Objekt auf das darunterliegende Objekt. +selectArchBelow.text=Objekt unterhalb ausw\u00e4hlen +selectArchBelow.shortdescription=\u00c4ndert das ausgew\u00e4hlte Objekt auf das darunterliegende Objekt. archAttributes.text=Objektattribute -archAttributes.shortdescription=\xD6ffnet den Dialog zum \xC4ndern der Objekt-Attribute. +archAttributes.shortdescription=\u00d6ffnet den Dialog zum \u00c4ndern der Objekt-Attribute. # Map Manager -closeAllMaps.text=Alle schlie\xDFen +closeAllMaps.text=Alle schlie\u00dfen closeAllMaps.mnemonic=L -closeAllMaps.shortdescription=Schlie\xDFt alle ge\xF6ffneten Karten. -closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten. Ungesicherte Karten erfordern eine Best\xE4tigung. +closeAllMaps.shortdescription=Schlie\u00dft alle ge\u00f6ffneten Karten. +closeAllMaps.longdescription=Schlie\u00dft alle ge\u00f6ffneten Karten. Ungesicherte Karten erfordern eine Best\u00e4tigung. saveAllMaps.text=Alle speichern -saveAllMaps.shortdescription=Speichert alle ge\xF6ffneten Karten. +saveAllMaps.shortdescription=Speichert alle ge\u00f6ffneten Karten. gridVisible.text=Gitter anzeigen gridVisible.mnemonic=G @@ -124,57 +124,57 @@ smoothing.text=Smoothing anzeigen smoothing.mnemonic=S -smoothing.shortdescription=Verwischt die \xDCberg\xE4nge zwischen benachbarten Kartenfeldern. +smoothing.shortdescription=Verwischt die \u00dcberg\u00e4nge zwischen benachbarten Kartenfeldern. tileShow.text=Angrenzende Karten zeigen tileShow.shortdescription=Zeigt angrenzende Karten. mapCreateView.text=Neue Kartenansicht -mapCreateView.shortdescription=\xD6ffnet eine neue Kartenansicht. -mapCreateView.longdescription=\xD6ffnet eine neue Kartenansicht der aktiven Karte. Alle Kartenansichten zeigen dieselbe Karten; \xC4nderungen werden auf allen Ansichten angezeigt. +mapCreateView.shortdescription=\u00d6ffnet eine neue Kartenansicht. +mapCreateView.longdescription=\u00d6ffnet eine neue Kartenansicht der aktiven Karte. Alle Kartenansichten zeigen dieselbe Karten; \u00c4nderungen werden auf allen Ansichten angezeigt. mapProperties.text=Karteneigenschaften mapProperties.mnemonic=K -mapProperties.shortdescription=\xD6ffnet den Dialog "Karteneigenschaften". -mapProperties.longdescription=\xD6ffnet den Dialog "Karteneigenschaften" f\xFCr die aktive Karte. +mapProperties.shortdescription=\u00d6ffnet den Dialog "Karteneigenschaften". +mapProperties.longdescription=\u00d6ffnet den Dialog "Karteneigenschaften" f\u00fcr die aktive Karte. -shrinkMapSize.text=Kartengr\xF6\xDFe reduzieren... +shrinkMapSize.text=Kartengr\u00f6\u00dfe reduzieren... shrinkMapSize.shortdescription=Entfernt freie Felder am rechten bzw. unteren Kartenrand. autoJoin.text=Automatisch verbinden autoJoin.mnemonic=V -autoJoin.shortdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von W\xE4nden. -autoJoin.longdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von eingef\xFCgten und gel\xF6schten W\xE4nden. +autoJoin.shortdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von W\u00e4nden. +autoJoin.longdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von eingef\u00fcgten und gel\u00f6schten W\u00e4nden. enterExit.text=Gehe zu Ausgang enterExit.mnemonic=A -enterExit.shortdescription=\xD6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist. -enterExit.longdescription=\xD6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist. Pr\xE4fertiert das ausgew\xE4hlte Objekt, wenn dies ein Ausgang ist. Andernfalls wird das oberste Objekt im Cursor-Feld verwendet, welches ein Ausgang ist. -enterExitIOException.title=Ung\xFCltiger Pfad +enterExit.shortdescription=\u00d6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist. +enterExit.longdescription=\u00d6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist. Pr\u00e4fertiert das ausgew\u00e4hlte Objekt, wenn dies ein Ausgang ist. Andernfalls wird das oberste Objekt im Cursor-Feld verwendet, welches ein Ausgang ist. +enterExitIOException.title=Ung\u00fcltiger Pfad enterExitIOException.message=Konnte Datei nicht laden:\n{0} -enterExitClose.title=Letzte Karte schlie\xDFen? -enterExitClose.message=Sie haben eine neue Karte ge\xF6ffnet.\nSoll die letzte Karte geschlossen werden? +enterExitClose.title=Letzte Karte schlie\u00dfen? +enterExitClose.message=Sie haben eine neue Karte ge\u00f6ffnet.\nSoll die letzte Karte geschlossen werden? -enterTileIOException.title=Ung\xFCltiger Pfad +enterTileIOException.title=Ung\u00fcltiger Pfad enterTileIOException.message=Kann verbundene Karte nicht laden.\n{0} -enterExitRandomDestination.title=Ziel ung\xFCltig -enterExitRandomDestination.message=Der Ausgang ''{0}'' zeigt auf eine zuf\xE4llig generierte Karte. +enterExitRandomDestination.title=Ziel ung\u00fcltig +enterExitRandomDestination.message=Der Ausgang ''{0}'' zeigt auf eine zuf\u00e4llig generierte Karte. enterExitNotSaved.title=Karte nicht gesichert -enterExitNotSaved.message=Der Ausgang verwendet einen relativen Dateinamen ''{0}''.\nUm ihm zu folgen m\xFCssen Sie die Karte vorher sichern. +enterExitNotSaved.message=Der Ausgang verwendet einen relativen Dateinamen ''{0}''.\nUm ihm zu folgen m\u00fcssen Sie die Karte vorher sichern. -nextExit.text=N\xE4chster Ausgang +nextExit.text=N\u00e4chster Ausgang nextExit.mnemonic=N -nextExit.shortdescription=W\xE4hlt den n\xE4chsten Ausgang aus. -nextExit.longdescription=W\xE4hlt den n\xE4chsten Ausgang aus. Die Suche beginnt im Cursor-Feld oder links oben, falls kein Cursor aktiv ist. +nextExit.shortdescription=W\u00e4hlt den n\u00e4chsten Ausgang aus. +nextExit.longdescription=W\u00e4hlt den n\u00e4chsten Ausgang aus. Die Suche beginnt im Cursor-Feld oder links oben, falls kein Cursor aktiv ist. prevExit.text=Vorheriger Ausgang prevExit.mnemonic=O -prevExit.shortdescription=W\xE4hlt den vorigen Ausgang aus. -prevExit.longdescription=W\xE4hlt den vorigen Ausgang aus. Die Suche beginnt im Cursor-Feld oder rechts unten, falls kein Cursor aktiv ist. +prevExit.shortdescription=W\u00e4hlt den vorigen Ausgang aus. +prevExit.longdescription=W\u00e4hlt den vorigen Ausgang aus. Die Suche beginnt im Cursor-Feld oder rechts unten, falls kein Cursor aktiv ist. -exitConnector.text=Ausg\xE4nge verbinden +exitConnector.text=Ausg\u00e4nge verbinden exitConnector.mnemonic=A exitConnector.shortdescription=Erzeugt oder aktualisiert einen Ausgang. @@ -182,42 +182,42 @@ exitCopy.mnemonic=K exitCopy.shortdescription=Kopiert die Position des Cursor-Feldes als Ausgangs-Position. -exitPaste.text=Ausgang einf\xFCgen +exitPaste.text=Ausgang einf\u00fcgen exitPaste.mnemonic=E -exitPaste.shortdescription=F\xFCgt die Ausgangs-Position in das Cursor-Feld ein. -exitPaste.longdescription=F\xFCgt die vorher gespeicherte Ausgangs-Position in das Cursor-Feld ein. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt. +exitPaste.shortdescription=F\u00fcgt die Ausgangs-Position in das Cursor-Feld ein. +exitPaste.longdescription=F\u00fcgt die vorher gespeicherte Ausgangs-Position in das Cursor-Feld ein. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt. -exitConnect.text=Ausg\xE4nge verbinden +exitConnect.text=Ausg\u00e4nge verbinden exitConnect.mnemonic=V exitConnect.shortdescription=Verbindet die Ausgangs-Position bidirektional mit dem Cursor-Feld. exitConnect.longdescription=Verbindet die vorher gespeicherte Ausgangs-Position bidirektional mit dem Cursor-Feld. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt. enterNorthMap.text=Gehe zu Nord-Karte -enterNorthMap.shortdescription=\xD6ffnet die n\xF6rdlich an die aktive Karte angrenzende Karte. +enterNorthMap.shortdescription=\u00d6ffnet die n\u00f6rdlich an die aktive Karte angrenzende Karte. enterNorthEastMap.text=Gehe zu Nordost-Karte -enterNorthEastMap.shortdescription=\xD6ffnet die n\xF6rd\xF6stlich an die aktive Karte angrenzende Karte. +enterNorthEastMap.shortdescription=\u00d6ffnet die n\u00f6rd\u00f6stlich an die aktive Karte angrenzende Karte. enterEastMap.text=Gehe zu Ost-Karte -enterEastMap.shortdescription=\xD6ffnet die \xF6stlich an die aktive Karte angrenzende Karte. +enterEastMap.shortdescription=\u00d6ffnet die \u00f6stlich an die aktive Karte angrenzende Karte. -enterSouthEastMap.text=Gehe zu S\xFCdost-Karte -enterSouthEastMap.shortdescription=\xD6ffnet die s\xFCd\xF6stlich an die aktive Karte angrenzende Karte. +enterSouthEastMap.text=Gehe zu S\u00fcdost-Karte +enterSouthEastMap.shortdescription=\u00d6ffnet die s\u00fcd\u00f6stlich an die aktive Karte angrenzende Karte. -enterSouthMap.text=Gehe zu S\xFCd-Karte -enterSouthMap.shortdescription=\xD6ffnet die s\xFCdlich an die aktive Karte angrenzende Karte. +enterSouthMap.text=Gehe zu S\u00fcd-Karte +enterSouthMap.shortdescription=\u00d6ffnet die s\u00fcdlich an die aktive Karte angrenzende Karte. -enterSouthWestMap.text=Gehe zu S\xFCdwest-Karte -enterSouthWestMap.shortdescription=\xD6ffnet die s\xFCdwestlich an die aktive Karte angrenzende Karte. +enterSouthWestMap.text=Gehe zu S\u00fcdwest-Karte +enterSouthWestMap.shortdescription=\u00d6ffnet die s\u00fcdwestlich an die aktive Karte angrenzende Karte. enterWestMap.text=Gehe zu West-Karte -enterWestMap.shortdescription=\xD6ffnet die westlich an die aktive Karte angrenzende Karte. +enterWestMap.shortdescription=\u00d6ffnet die westlich an die aktive Karte angrenzende Karte. enterNorthWestMap.text=Gehe zu Nordwest-Karte -enterNorthWestMap.shortdescription=\xD6ffnet die nordwestlich an die aktive Karte angrenzende Karte. +enterNorthWestMap.shortdescription=\u00d6ffnet die nordwestlich an die aktive Karte angrenzende Karte. -deleteUnknownObjects.text=Undefinierte Objekte l\xF6schen -deleteUnknownObjects.shortdescription=L\xF6scht alle Objekte aus der aktiven Karte, welche auf unbekannte Archetypen verweisen. +deleteUnknownObjects.text=Undefinierte Objekte l\u00f6schen +deleteUnknownObjects.shortdescription=L\u00f6scht alle Objekte aus der aktiven Karte, welche auf unbekannte Archetypen verweisen. gameObjectTextEditor.text=Objekttext-Editor umschalten gameObjectTextEditor.shortdescription=Aktiviert bzw. deaktiviert den Objekttext-Editor. @@ -232,7 +232,7 @@ editPlugins.text=Plugins bearbeiten... editPlugins.mnemonic=B -editPlugins.shortdescription=\xD6ffnet den Editor zum Bearbeiten von Beanshell-Plugins. +editPlugins.shortdescription=\u00d6ffnet den Editor zum Bearbeiten von Beanshell-Plugins. runPlugin.text={0} starten runPlugin.shortdescription=Startet das Plugin. @@ -249,15 +249,15 @@ # Resources viewTreasurelists.text=Schatzlisten anschauen viewTreasurelists.mnemonic=S -viewTreasurelists.shortdescription=\xD6ffnet den Dialog zur Anzeige von Schatzlisten. +viewTreasurelists.shortdescription=\u00d6ffnet den Dialog zur Anzeige von Schatzlisten. -collectSpells.text=Zauberspr\xFCche sammeln +collectSpells.text=Zauberspr\u00fcche sammeln collectSpells.mnemonic=Z -collectSpells.shortdescription=Aktualisiert Zaubersr\xFCche aus einer Datei. +collectSpells.shortdescription=Aktualisiert Zaubersr\u00fcche aus einer Datei. # Zoom -zoomMen.text=Vergr\xF6\xDFerung +zoomMen.text=Vergr\u00f6\u00dferung zoomMen.mnemonic=V zoom0.text=spezial zoom12.text=12.5% @@ -272,7 +272,7 @@ zoom400.text=400% zoomSave.text=Vorschau speichern... zoomSave.mnemonic=S -zoomClose.text=Schlie\xDFen +zoomClose.text=Schlie\u00dfen zoomClose.mnemonic=C zoomSaveException.title=Vorschau speichern zoomSave.exception.java.io.IOException.title=Ein-/Ausgabefehler @@ -310,7 +310,7 @@ zoomAlgFast.mnemonic=C zoomAlgFast.exception.java.lang.OutOfMemoryError.title=Speichermangel zoomAlgFast.exception.java.lang.OutOfMemoryError.message=<html>Speichermangel beim Speichern des Bildes.<br>Probieren Sie es erneut mit <code>-Xmx128m</code> oder <code>-Xmx256m</code>.<br><br>{0} -zoomAlgSmooth.text=Gl\xE4ttung +zoomAlgSmooth.text=Gl\u00e4ttung zoomAlgSmooth.mnemonic=G zoomAlgSmooth.exception.java.lang.OutOfMemoryError.title=Speichermangel zoomAlgSmooth.exception.java.lang.OutOfMemoryError.message=<html>Speichermangel beim Speichern des Bildes.<br>Probieren Sie es erneut mit <code>-Xmx128m</code> oder <code>-Xmx256m</code>.<br><br>{0} @@ -318,62 +318,62 @@ zoomAlgReplicate.mnemonic=R zoomAlgReplicate.exception.java.lang.OutOfMemoryError.title=Speichermangel zoomAlgReplicate.exception.java.lang.OutOfMemoryError.message=<html>Speichermangel beim Speichern des Bildes.<br>Probieren Sie es erneut mit <code>-Xmx128m</code> oder <code>-Xmx256m</code>.<br><br>{0} -zoomAlgAreaAveraging.text=Fl\xE4chenmittelwert +zoomAlgAreaAveraging.text=Fl\u00e4chenmittelwert zoomAlgAreaAveraging.mnemonic=F zoomAlgAreaAveraging.exception.java.lang.OutOfMemoryError.title=Speichermangel zoomAlgAreaAveraging.exception.java.lang.OutOfMemoryError.message=<html>Speichermangel beim Speichern des Bildes.<br>Probieren Sie es erneut mit <code>-Xmx128m</code> oder <code>-Xmx256m</code>.<br><br>{0} # Dialogs -mapDirDoesntExist.title=Ung\xFCltiges Verzeichnis -mapDirDoesntExist.message=Das Verzeichnis f\xFCr Karten "{0}" existiert nicht.\nBitte legen sie es unter ''Datei->Optionen...'' fest. +mapDirDoesntExist.title=Ung\u00fcltiges Verzeichnis +mapDirDoesntExist.message=Das Verzeichnis f\u00fcr Karten "{0}" existiert nicht.\nBitte legen sie es unter ''Datei->Optionen...'' fest. -mapOutOfMemory.title=Kann Karte nicht \xF6ffnen -mapOutOfMemory.message=Es ist nicht gen\xFCgend freier Speicher vorhanden, um die\nKarte {0} zu laden. +mapOutOfMemory.title=Kann Karte nicht \u00f6ffnen +mapOutOfMemory.message=Es ist nicht gen\u00fcgend freier Speicher vorhanden, um die\nKarte {0} zu laden. -openFileLoadMap.title=Kann Karte nicht \xF6ffnen -openFileLoadMap.message=Beim \xD6ffnen der Datei {0} ist ein Ein-/Ausgabefehler aufgetreten:\n{1} +openFileLoadMap.title=Kann Karte nicht \u00f6ffnen +openFileLoadMap.message=Beim \u00d6ffnen der Datei {0} ist ein Ein-/Ausgabefehler aufgetreten:\n{1} openFileOutOfMapBoundsDeleted.title=Karte {0} laden -openFileOutOfMapBoundsDeleted.message=Beim Laden von {0}\nwurden {1} Objekte wurden gel\xF6scht, da sie nicht innerhalb der Katenfl\xE4che liegen:{2} +openFileOutOfMapBoundsDeleted.message=Beim Laden von {0}\nwurden {1} Objekte wurden gel\u00f6scht, da sie nicht innerhalb der Katenfl\u00e4che liegen:{2} -overwriteOtherFile.title=Datei \xFCberschreiben? -overwriteOtherFile.message=Eine Datei mit Namen "{0}" existiert bereits.\n\nWirklich \xFCberschreiben? +overwriteOtherFile.title=Datei \u00fcberschreiben? +overwriteOtherFile.message=Eine Datei mit Namen "{0}" existiert bereits.\n\nWirklich \u00fcberschreiben? mkdirIOError.title=Kann Verzeichnis nicht anlegen mkdirIOError.message=Kann Verzeichnis nicht anlegen:\n{0} pickmapExists.title=Kann Pickmap nicht erstellen -pickmapExists.message=Die Pickmap ''{0}'' existiert bereits.\nSie m\xFCssen die existierende Pickmap erst l\xF6schen oder einen anderen Namen w\xE4hlen. +pickmapExists.message=Die Pickmap ''{0}'' existiert bereits.\nSie m\u00fcssen die existierende Pickmap erst l\u00f6schen oder einen anderen Namen w\u00e4hlen. pickmapIOError.title=Kann Pickmap nicht erstellen pickmapIOError.message=Beim Erstellen der Pickmap ''{0}'' ist ein Fehler aufgetreten:\n{1} -pickmapConfirmSaveChanges.title=\xC4nderungen sichern? -pickmapConfirmSaveChanges.message=Wollen Sie die \xC4nderungen der Pickmap {0} sichern? +pickmapConfirmSaveChanges.title=\u00c4nderungen sichern? +pickmapConfirmSaveChanges.message=Wollen Sie die \u00c4nderungen der Pickmap {0} sichern? -dialogDontShowAgain=Diesen Dialog n\xE4chstes Mal wieder anzeigen. +dialogDontShowAgain=Diesen Dialog n\u00e4chstes Mal wieder anzeigen. openScriptNotFound.title=Script-Datei nicht gefunden -openScriptNotFound.message=Die Datei ''{0}'' existiert nicht.\nBitte geben sie einen g\xFCltigen Dateinamen an. +openScriptNotFound.message=Die Datei ''{0}'' existiert nicht.\nBitte geben sie einen g\u00fcltigen Dateinamen an. # New Map newMap.title=Neue Karte erstellen newPickmap.title=Neue Pickmap erstellen newPickmapFolder.title=Pickmap-Gruppe erstellen newMapMapName=Name: -mapSizeDefault.text=Standardgr\xF6\xDFe (24 \xD7 24) +mapSizeDefault.text=Standardgr\u00f6\u00dfe (24 \u00d7 24) newMapParameters=Parameter newMapPickmapName=Name: newMapPickmapFolderName=Name: -newPickmapFolderInvalidName.title=Pickmap-Gruppe ung\xFCltig -newPickmapFolderInvalidName.message=Der Pickmap-Gruppenname ist ung\xFCltig.\nBitte w\xE4hlen Sie einen anderen Namen. +newPickmapFolderInvalidName.title=Pickmap-Gruppe ung\u00fcltig +newPickmapFolderInvalidName.message=Der Pickmap-Gruppenname ist ung\u00fcltig.\nBitte w\u00e4hlen Sie einen anderen Namen. newPickmapFolderExists.title=Pickmap-Gruppe existiert bereits -newPickmapFolderExists.message=Die Pickmap-Gruppe ''{0}'' existiert bereits.\nBitte w\xE4hlen Sie einen anderen Namen. +newPickmapFolderExists.message=Die Pickmap-Gruppe ''{0}'' existiert bereits.\nBitte w\u00e4hlen Sie einen anderen Namen. deletePickmapFolderNotEmpty.title=Pickmap-Gruppe nicht leer -deletePickmapFolderNotEmpty.message=Die Pickmap-Gruppe ''{0}'' besitzt Untergruppen.\nBitte l\xF6schen Sie diese zuerst. +deletePickmapFolderNotEmpty.message=Die Pickmap-Gruppe ''{0}'' besitzt Untergruppen.\nBitte l\u00f6schen Sie diese zuerst. -openAttrDialogNoDefaultArch.title=Attribute \xE4ndern -openAttrDialogNoDefaultArch.message=Attribute von Objekten ohne Archetyp k\xF6nnen nicht ge\xE4ndert werden. +openAttrDialogNoDefaultArch.title=Attribute \u00e4ndern +openAttrDialogNoDefaultArch.message=Attribute von Objekten ohne Archetyp k\u00f6nnen nicht ge\u00e4ndert werden. encodeMapFile.title=Fehler beim Sichern encodeMapFile.message=Beim Sichern von {0}\nist ein Fehler aufgetreten:\n{1} @@ -381,25 +381,25 @@ createImageIOException.title=Kann Bild nicht erzeugen createImageIOException.message=Das Bild kann nicht erzeugt werden, da ein Ein-/Ausgabefehler\nbeim Schreiben von {0} aufgetreten ist:\n{1} -enterExitOutside.title=Ziel ung\xFCltig -enterExitOutside.message=Der Ausgang besitzt Zielkoordinaten au\xDFerhalb der Karte. -enterExitInvalidPath.title=Ung\xFCltiger Pfad -enterExitInvalidPath.message=Der Ausgang zeigt auf einen ung\xFCltigen Dateinamen:\n{0} +enterExitOutside.title=Ziel ung\u00fcltig +enterExitOutside.message=Der Ausgang besitzt Zielkoordinaten au\u00dferhalb der Karte. +enterExitInvalidPath.title=Ung\u00fcltiger Pfad +enterExitInvalidPath.message=Der Ausgang zeigt auf einen ung\u00fcltigen Dateinamen:\n{0} -revertPickmapGone.title=Kann \xC4nderungen nicht zur\xFCcknehmen -revertPickmapGone.message=F\xFCr die Pickmap ''{0}'' existiert keine Datei. +revertPickmapGone.title=Kann \u00c4nderungen nicht zur\u00fccknehmen +revertPickmapGone.message=F\u00fcr die Pickmap ''{0}'' existiert keine Datei. -confirmDeletePickmap.title=Pickmap l\xF6schen? -confirmDeletePickmap.message=Wollen Sie die Pickmap-Datei ''{0}'' l\xF6schen?\nDies wird die Pickmap endg\xFCltig l\xF6schen. +confirmDeletePickmap.title=Pickmap l\u00f6schen? +confirmDeletePickmap.message=Wollen Sie die Pickmap-Datei ''{0}'' l\u00f6schen?\nDies wird die Pickmap endg\u00fcltig l\u00f6schen. confirmDeletePickmapFolder.title=Pickmap-Gruppe folder? -confirmDeletePickmapFolder.message=The Pickmap-Gruppe ''{0}'' enth\xE4lt {1} Pickmaps.\nWollen Sie die Pickmap-Gruppe wirklich l\xF6schen?\nDies wird alle diese Pickmaps endg\xFCltig l\xF6schen. +confirmDeletePickmapFolder.message=The Pickmap-Gruppe ''{0}'' enth\u00e4lt {1} Pickmaps.\nWollen Sie die Pickmap-Gruppe wirklich l\u00f6schen?\nDies wird alle diese Pickmaps endg\u00fcltig l\u00f6schen. -confirmSaveChanges.title=\xC4nderungen sichern? -confirmSaveChanges.message=Wollen Sie die \xC4nderungen der Karte {0} sichern? +confirmSaveChanges.title=\u00c4nderungen sichern? +confirmSaveChanges.message=Wollen Sie die \u00c4nderungen der Karte {0} sichern? -confirmRevertPickmap.title=\xC4nderungen in Pickmap zur\xFCcknehmen? -confirmRevertPickmap.message=Die letzten \xC4nderungen in der Pickmap ''{0}''\ngehen verlosen, wenn Sie die Datei neu laden.\nSind Sie sicher, dass die das wollen? +confirmRevertPickmap.title=\u00c4nderungen in Pickmap zur\u00fccknehmen? +confirmRevertPickmap.message=Die letzten \u00c4nderungen in der Pickmap ''{0}''\ngehen verlosen, wenn Sie die Datei neu laden.\nSind Sie sicher, dass die das wollen? goLocation.title=Cursor setzen goLocationOkay.text=OK @@ -408,24 +408,24 @@ goLocationText=Cursor in Karte {0} setzen: goLocationX=X-Koordinate: goLocationY=Y-Koordinate: -goLocationCoordinateNotANumber.title=Ung\xFCltiger Wert +goLocationCoordinateNotANumber.title=Ung\u00fcltiger Wert goLocationCoordinateNotANumber.message=Die Koordinate muss ganzzahlig sein. -goLocationCoordinateOutOfRange.title=Ung\xFCltiger Wert -goLocationCoordinateOutOfRange.message=Die Koordinate ist ung\xFCltig. +goLocationCoordinateOutOfRange.title=Ung\u00fcltiger Wert +goLocationCoordinateOutOfRange.message=Die Koordinate ist ung\u00fcltig. # The Edit Bookmark dialog -editBookmark.title=Lesezeichen \xE4ndern +editBookmark.title=Lesezeichen \u00e4ndern editBookmarkOkay.text=Ok editBookmarkCancel.text=Abbrechen editBookmark.description=Beschreibung: # The Edit Bookmarks dialog manageBookmarks.title=Lesezeichen verwalten -manageBookmarksEdit.text=\xC4ndern +manageBookmarksEdit.text=\u00c4ndern manageBookmarksMoveUp.text=Nach oben manageBookmarksMoveDown.text=Nach unten -manageBookmarksRemove.text=L\xF6schen -manageBookmarksClose.text=Schie\xDFen +manageBookmarksRemove.text=L\u00f6schen +manageBookmarksClose.text=Schie\u00dfen # The Configure Keyboard Shortcuts dialog shortcuts.title=Tastenkombinationen @@ -433,37 +433,37 @@ shortcuts.borderAllActions=Alle Aktionen shortcuts.actionDescription=Beschreibung: shortcuts.shortcut=Tastenkombination: -shortcuts.selectedAction=Ausgew\xE4hlte Aktion +shortcuts.selectedAction=Ausgew\u00e4hlte Aktion shortcutsOkay.text=OK -shortcutsDefaults.text=Alle Zur\xFCcksetzen -shortcutsDefaults.shortdescription=Setzt alle Tastenkombinationen auf ihre Standardwerte zur\xFCck. -shortcutsRestoreDefaults.title=Tastenkombinationen zur\xFCcksetzen? -shortcutsRestoreDefaults.message=Sollen alle Tastenkombinationen auf ihre\nStandardwerte zur\xFCckgesetzt werden?\n\nAchtung: diese Operation kann nicht zur\xFCckgenommen werden. +shortcutsDefaults.text=Alle Zur\u00fccksetzen +shortcutsDefaults.shortdescription=Setzt alle Tastenkombinationen auf ihre Standardwerte zur\u00fcck. +shortcutsRestoreDefaults.title=Tastenkombinationen zur\u00fccksetzen? +shortcutsRestoreDefaults.message=Sollen alle Tastenkombinationen auf ihre\nStandardwerte zur\u00fcckgesetzt werden?\n\nAchtung: diese Operation kann nicht zur\u00fcckgenommen werden. shortcutsSetShortcut.text=Taste setzen shortcutsSetShortcut.mnemonic=S -shortcutsUnsetShortcut.text=Taste zur\xFCcksetzen +shortcutsUnsetShortcut.text=Taste zur\u00fccksetzen shortcutsUnsetShortcut.mnemonic=Z # The Select Key Stroke dialog (part of Configure Keyboard Shortcuts dialog) -keyStroke.title=Taste ausw\xE4hlen +keyStroke.title=Taste ausw\u00e4hlen keyStroke.borderKeyStroke=Taste keyStroke.borderConflicts=Konflikte keyStroke.borderConflictAssigned=Bereits verwendet in {0} in Kategorie {1}. keyStrokeOkay.text=OK keyStrokeCancel.text=Abbruch -shrinkMapSizeDialogTitle=Kartengr\xF6\xDFe reduzieren +shrinkMapSizeDialogTitle=Kartengr\u00f6\u00dfe reduzieren shrinkMapSizeDialogLabel=Freien Bereich entfernen von: shrinkMapSizeDialogEast.text=Ost-Rand -shrinkMapSizeDialogSouth.text=S\xFCd-Rand +shrinkMapSizeDialogSouth.text=S\u00fcd-Rand shrinkMapSizeDialogOk.text=OK shrinkMapSizeDialogCancel.text=Abbrechen shrinkMapSizeDialogWarning=Warnung: shrinkMapSizeDialogNoEmptySpace=kein freier Bereich am Kartenrand -shrinkMapSizeDialogEastBreaksNorthTiling=l\xF6schen von leeren Feldern am \xF6stlichen Kartenrand st\xF6rt Verbindung zu n\xF6rdlicher Karte -shrinkMapSizeDialogEastBreaksSouthTiling=l\xF6schen von leeren Feldern am \xF6stlichen Kartenrand st\xF6rt Verbindung zu s\xFCdlicher Karte -shrinkMapSizeDialogSouthBreaksWestTiling=l\xF6schen von leeren Feldern am s\xFCdlichen Kartenrand st\xF6rt Verbindung zu westlicher Karte -shrinkMapSizeDialogSouthBreaksEastTiling=l\xF6schen von leeren Feldern am s\xFCdlichen Kartenrand st\xF6rt Verbindung zu \xF6stlicher Karte +shrinkMapSizeDialogEastBreaksNorthTiling=l\u00f6schen von leeren Feldern am \u00f6stlichen Kartenrand st\u00f6rt Verbindung zu n\u00f6rdlicher Karte +shrinkMapSizeDialogEastBreaksSouthTiling=l\u00f6schen von leeren Feldern am \u00f6stlichen Kartenrand st\u00f6rt Verbindung zu s\u00fcdlicher Karte +shrinkMapSizeDialogSouthBreaksWestTiling=l\u00f6schen von leeren Feldern am s\u00fcdlichen Kartenrand st\u00f6rt Verbindung zu westlicher Karte +shrinkMapSizeDialogSouthBreaksEastTiling=l\u00f6schen von leeren Feldern am s\u00fcdlichen Kartenrand st\u00f6rt Verbindung zu \u00f6stlicher Karte loadArchesNoArchetypes.title=Keine Archetypen gefunden loadArchesNoArchetypes.message=Es konnten keine Archetypen gefunden werden.\n\ @@ -476,15 +476,15 @@ # Map Properties mapTitle={0} ({1}) - Karteneigenschaften mapHelp.text=Hilfe -mapRestore.text=Zur\xFCcksetzen +mapRestore.text=Zur\u00fccksetzen mapMapTabTitle=Karte mapTilesTabTitle=Verbindungspfade mapErrorMissingMapName.title=Kartenname fehlt mapErrorMissingMapName.message=Dar Kartenname muss angegeben werden. -mapErrorInvalidEntry.title=Ung\xFCltiger Wert -mapErrorInvalidEntry.message=Ung\xFCltiger Wert:\n{0} -mapErrorIllegalSize.title=Ung\xFCltiger Wert -mapErrorIllegalSize.message=Die Kartengr\xF6\xDFe muss positiv sein. +mapErrorInvalidEntry.title=Ung\u00fcltiger Wert +mapErrorInvalidEntry.message=Ung\u00fcltiger Wert:\n{0} +mapErrorIllegalSize.title=Ung\u00fcltiger Wert +mapErrorIllegalSize.message=Die Kartengr\u00f6\u00dfe muss positiv sein. # attribute fields: mapName=Name mapBackgroundMusic=Hintergrundmusik @@ -497,66 +497,66 @@ mapResetTimeout=Reset-Zeit mapNorth=Norden mapEast=Osten -mapSouth=S\xFCden +mapSouth=S\u00fcden mapWest=Westen mapNorthEast=Nordosten mapNorthWest=Nordwesten -mapSouthEast=S\xFCdosten -mapSouthWest=S\xFCdwesten +mapSouthEast=S\u00fcdosten +mapSouthWest=S\u00fcdwesten mapTiles=Pfade zum Verbinden von Karten mapControl=Verbindungspfade steuern mapTilesAttach.text=Karten verbinden 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. -mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\xFCgbar -mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\xFCgbar. -mapQueryLoaded.title=Karte ist ge\xF6ffnet -mapQueryLoaded.message=Die Karte {0} ist im Editor ge\xF6ffnet.\nSoll ich sie automatisch speichern und aktualisieren? +mapTilesClear.text=Pfade l\u00f6schen +mapTilesClear.shortdescription=L\u00f6scht die Verbindungspfade zu den benachbarten Karten. +mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\u00fcgbar +mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\u00fcgbar. +mapQueryLoaded.title=Karte ist ge\u00f6ffnet +mapQueryLoaded.message=Die Karte {0} ist im Editor ge\u00f6ffnet.\nSoll ich sie automatisch speichern und aktualisieren? mapErrorPath2.title=Karte nicht gefunden -mapErrorPath2.message=Bitte \xFCberpr\xFCfe den Dateipfad f\xFCr die Karte: "{0}}". -mapErrorInvalid.title=Ung\xFCltiger Kartenpfad -mapErrorInvalid.message=In {0}: {1}\nder Pfad zu {2} ist ung\xFCltig.\nDer Pfad nach {3} ist {4}\nErzeugter Pfad:{5}\nVerbinden abbrechen? +mapErrorPath2.message=Bitte \u00fcberpr\u00fcfe den Dateipfad f\u00fcr die Karte: "{0}}". +mapErrorInvalid.title=Ung\u00fcltiger Kartenpfad +mapErrorInvalid.message=In {0}: {1}\nder Pfad zu {2} ist ung\u00fcltig.\nDer Pfad nach {3} ist {4}\nErzeugter Pfad:{5}\nVerbinden abbrechen? mapErrorFatalWrite.title=Fehler beim Speichern mapErrorFatalWrite.message=Die Karte kann nicht gespeichert werden:\n{0} -mapErrorDifferentSize.title=Unterschiedliche Gr\xF6\xDFe -mapErrorDifferentSize.message=Die verbundenen Karten sind nicht gleich gro\xDF.\n{0} hat die Gr\xF6\xDFe {1} # {2},\n{3} hat die Gr\xF6\xDFe {4} # {5}.\nDies ist nicht erlaubt. -mapTileRevert.shortdescription=Pfad auf gespeicherten Pfad zur\xFCcksetzen +mapErrorDifferentSize.title=Unterschiedliche Gr\u00f6\u00dfe +mapErrorDifferentSize.message=Die verbundenen Karten sind nicht gleich gro\u00df.\n{0} hat die Gr\u00f6\u00dfe {1} # {2},\n{3} hat die Gr\u00f6\u00dfe {4} # {5}.\nDies ist nicht erlaubt. +mapTileRevert.shortdescription=Pfad auf gespeicherten Pfad zur\u00fccksetzen mapTileRevert.text= -mapTileClear.shortdescription=Pfad l\xF6schen +mapTileClear.shortdescription=Pfad l\u00f6schen mapTileClear.text= -mapTileChoose.shortdescription=Pfad w\xE4hlen +mapTileChoose.shortdescription=Pfad w\u00e4hlen mapTileChoose.text= mapTilePathMode.shortdescription=Zwischen relativem und absoluten Pfad wechseln # Other Strings mapWidth=Breite -mapHeight=H\xF6he +mapHeight=H\u00f6he mapOkay.text=OK mapCancel.text=Abbrechen #replace replaceTitle=Ersetze replaceOn=In -replaceOn.shortdescription=<html>W\xE4hlt den Bereich:<br>- der ganzen Karte: alle Objekte auf der Karte; die Auswahl with ignoriert<br>- der Auswahl auf: erstezt nur Objekte in der Auswahl +replaceOn.shortdescription=<html>W\u00e4hlt den Bereich:<br>- der ganzen Karte: alle Objekte auf der Karte; die Auswahl with ignoriert<br>- der Auswahl auf: erstezt nur Objekte in der Auswahl replaceOnMap=der ganzen Karte replaceOnSelection=der Auswahl auf -replaceDelete=l\xF6sche Objekte mit -replaceDelete.shortdescription=<html>W\xE4hlt die zu ersetzenden Objekte:<br>- Archetyp: durch Archetyp-Name<br>- Namen: durch Objekt-Namen +replaceDelete=l\u00f6sche Objekte mit +replaceDelete.shortdescription=<html>W\u00e4hlt die zu ersetzenden Objekte:<br>- Archetyp: durch Archetyp-Name<br>- Namen: durch Objekt-Namen replaceArchetype=Archetyp replaceName=Namen -replaceInput1.shortdescription=<html>Der zu ersetzende Name.<br>''*'' - beliebige Zeichenkette (einschlie\xDFlich leer)<br>''?'' - genau ein Zeichen<br>Gro\xDF-/Kleinschreibung wird ignoriert. +replaceInput1.shortdescription=<html>Der zu ersetzende Name.<br>''*'' - beliebige Zeichenkette (einschlie\u00dflich leer)<br>''?'' - genau ein Zeichen<br>Gro\u00df-/Kleinschreibung wird ignoriert. replaceBy=und ersetze durch -replaceBy.shortdescription=<html>W\xE4hlt die Ersetzungen:<br>- Objekt: das aktive Objekt in der Objektauswahl<br>- Zwischenablage: zuf\xE4llige Objekte aus den zuletzt kopierten oder ausgeschnittenen Objekten<br>- Pickmap: zuf\xE4llige Objekte aus der Objektauswahl<br>- nichts (=l\xF6schen): l\xF6scht die Objekte +replaceBy.shortdescription=<html>W\u00e4hlt die Ersetzungen:<br>- Objekt: das aktive Objekt in der Objektauswahl<br>- Zwischenablage: zuf\u00e4llige Objekte aus den zuletzt kopierten oder ausgeschnittenen Objekten<br>- Pickmap: zuf\u00e4llige Objekte aus der Objektauswahl<br>- nichts (=l\u00f6schen): l\u00f6scht die Objekte replaceByObject=Objekt replaceByCopyBuffer=Zwischenablage replaceByPickmap=Pickmap -replaceByNothing=nichts (=l\xF6schen) +replaceByNothing=nichts (=l\u00f6schen) replaceDensity=Ersetzungsdichte: -replaceDensity.shortdescription=<html>Die Ersetzungsdichte in % (1..100).<br>100=ersetzt alle Objekte<br>sonst=ersetzt (zuf\xE4llig) diesen Anteil der ausgew\xE4hlten Objekte +replaceDensity.shortdescription=<html>Die Ersetzungsdichte in % (1..100).<br>100=ersetzt alle Objekte<br>sonst=ersetzt (zuf\u00e4llig) diesen Anteil der ausgew\u00e4hlten Objekte -replaceInvalidDensity.title=Ung\xFCltiger Wert -replaceInvalidDensity.message=Die Ersetzungsdichte ist ung\xFCltig.\nSie muss zwischen 1 und 100 liegen. +replaceInvalidDensity.title=Ung\u00fcltiger Wert +replaceInvalidDensity.message=Die Ersetzungsdichte ist ung\u00fcltig.\nSie muss zwischen 1 und 100 liegen. replaceMapNoSelection.title=Keine Selektion replaceMapNoSelection.message=Ich kann ohne Selektion keine selektierten Felder\nauf der Karte "{0}" ersetzen. @@ -600,15 +600,15 @@ statusCursorInactive=Cursor nicht auf Karte # Edit -undo.text=R\xFCckg\xE4ngig -undo.name=R\xFCckg\xE4ngig {0} +undo.text=R\u00fcckg\u00e4ngig +undo.name=R\u00fcckg\u00e4ngig {0} undo.mnemonic=R -undo.shortdescription=Nimmt die letzte durchgef\xFChrte Aktion zur\xFCck. +undo.shortdescription=Nimmt die letzte durchgef\u00fchrte Aktion zur\u00fcck. redo.text=Wiederholen redo.name=Wiederholen {0} redo.mnemonic=W -redo.shortdescription=Wiederholt die letzte durchgef\xFChrte Aktion. +redo.shortdescription=Wiederholt die letzte durchgef\u00fchrte Aktion. ########### # File Menu @@ -632,43 +632,43 @@ createImage.shortdescription=Speichert ein Bild der aktiven Karte. createImage.error.text=Fehler beim Bild speichern -revertMap.text=Karte zur\xFCcksetzen +revertMap.text=Karte zur\u00fccksetzen revertMap.mnemonic=R -revertMap.shortdescription=Nimmt alle \xC4nderungen der aktiven Karte zur\xFCck und stellt die zuletzt gespeicherte Fassung wieder her. -revertMap.error.text=Fehler beim Zur\xFCcksetzen +revertMap.shortdescription=Nimmt alle \u00c4nderungen der aktiven Karte zur\u00fcck und stellt die zuletzt gespeicherte Fassung wieder her. +revertMap.error.text=Fehler beim Zur\u00fccksetzen -closeMap.text=Karte schie\xDFen +closeMap.text=Karte schie\u00dfen closeMap.mnemonic=C -closeMap.shortdescription=Karte schlie\xDFen -closeMap.longdescription=Schlie\xDFt die aktive Karte. +closeMap.shortdescription=Karte schlie\u00dfen +closeMap.longdescription=Schlie\u00dft die aktive Karte. -recent.text=Zuletzt ge\xF6ffnete Karten +recent.text=Zuletzt ge\u00f6ffnete Karten recent.mnemonic=Z -recent.shortdescription=\xD6ffnet eine k\xFCrzlich ge\xF6ffnete Karte. -recentItem.shortdescriptionformat=\xD6ffnet Karte {0} ({1}). +recent.shortdescription=\u00d6ffnet eine k\u00fcrzlich ge\u00f6ffnete Karte. +recentItem.shortdescriptionformat=\u00d6ffnet Karte {0} ({1}). newMap.text=Neue Karte... newMap.mnemonic=N newMap.shortdescription=Erzeugt eine neue Karte. -openFile.text=Datei \xF6ffnen... +openFile.text=Datei \u00f6ffnen... openFile.mnemonic=F -openFile.shortdescription=\xD6ffnet eine Datei. +openFile.shortdescription=\u00d6ffnet eine Datei. openFile.error.text=Fehler beim Laden options.text=Optionen... options.mnemonic=O -options.shortdescription=\xD6ffnet den Dialog f\xFCr Editoreinstellungen. -options.longdescription=\xD6ffnet den Dialog f\xFCr Editoreinstellungen. +options.shortdescription=\u00d6ffnet den Dialog f\u00fcr Editoreinstellungen. +options.longdescription=\u00d6ffnet den Dialog f\u00fcr Editoreinstellungen. shortcuts.text=Tastenkombinationen festlegen... -shortcuts.shortdescription=\xD6ffnet den Dialog f\xFCr Tastenkombinationen. -shortcuts.longdescription=\xD6ffnet den Dialog f\xFCr Tastenkombinationen. +shortcuts.shortdescription=\u00d6ffnet den Dialog f\u00fcr Tastenkombinationen. +shortcuts.longdescription=\u00d6ffnet den Dialog f\u00fcr Tastenkombinationen. exit.text=Beenden exit.mnemonic=B -exit.shortdescription=Verl\xE4sst den Editor. -exit.longdescription=Verl\xE4sst den Editor. Ungesicherte Karten oder Plugins erfordern eine Best\xE4tigung. +exit.shortdescription=Verl\u00e4sst den Editor. +exit.longdescription=Verl\u00e4sst den Editor. Ungesicherte Karten oder Plugins erfordern eine Best\u00e4tigung. ####### @@ -677,95 +677,95 @@ edit.text=Bearbeiten edit.mnemonic=B -clear.text=L\xF6schen +clear.text=L\u00f6schen clear.mnemonic=L -clear.shortdescription=L\xF6scht die Auswahl. +clear.shortdescription=L\u00f6scht die Auswahl. cut.text=Ausschneiden cut.mnemonic=A -cut.shortdescription=Schneidet die ausgew\xE4hlten Felder aus und kopiert sie in die Zwischenablage. +cut.shortdescription=Schneidet die ausgew\u00e4hlten Felder aus und kopiert sie in die Zwischenablage. copy.text=Kopieren copy.mnemonic=K -copy.shortdescription=Kopiert die ausgew\xE4hlten Felder in die Zwischenablage. +copy.shortdescription=Kopiert die ausgew\u00e4hlten Felder in die Zwischenablage. -paste.text=Einf\xFCgen +paste.text=Einf\u00fcgen paste.mnemonic=E paste.shortdescription=Kopiert die Zwischenablage an das Cursor-Feld. -pasteTiled.text=Gekachelt einf\xFCgen -pasteTiled.shortdescription=Kopiert die Zwischenablage in die ausgew\xE4hlten Felder. -pasteTiled.longdescription=Kopiert die Zwischenablage in die ausgew\xE4hlten Felder. Falls the Zwischenablage kleiner als die ausgew\xE4hlten Felder ist, wird gekachelt. +pasteTiled.text=Gekachelt einf\u00fcgen +pasteTiled.shortdescription=Kopiert die Zwischenablage in die ausgew\u00e4hlten Felder. +pasteTiled.longdescription=Kopiert die Zwischenablage in die ausgew\u00e4hlten Felder. Falls the Zwischenablage kleiner als die ausgew\u00e4hlten Felder ist, wird gekachelt. shift.text=Verschieben shift.mnemonic=V -shift.shortdescription=Verschiebt die ausgew\xE4hlten Felder. +shift.shortdescription=Verschiebt die ausgew\u00e4hlten Felder. shiftNorth.text=Nach Nord verschieben shiftNorth.mnemonic=N -shiftNorth.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nord. +shiftNorth.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach Nord. shiftNorthEast.text=Nach Nordost verschieben -shiftNorthEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nordost. +shiftNorthEast.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach Nordost. shiftEast.text=Nach Ost verschieben shiftEast.mnemonic=O -shiftEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Ost. -shiftSouthEast.text=Nach S\xFCdost verschieben -shiftSouthEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCdost. -shiftSouth.text=Nach S\xFCd verschieben +shiftEast.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach Ost. +shiftSouthEast.text=Nach S\u00fcdost verschieben +shiftSouthEast.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach S\u00fcdost. +shiftSouth.text=Nach S\u00fcd verschieben shiftSouth.mnemonic=S -shiftSouth.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCd. -shiftSouthWest.text=Nach S\xFCdwest verschieben -shiftSouthWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCdwest. +shiftSouth.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach S\u00fcd. +shiftSouthWest.text=Nach S\u00fcdwest verschieben +shiftSouthWest.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach S\u00fcdwest. shiftWest.text=Nach West verschieben shiftWest.mnemonic=W -shiftWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach West. +shiftWest.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach West. shiftNorthWest.text=Nach Nordwest verschieben -shiftNorthWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nordwest. +shiftNorthWest.shortdescription=Verschiebt die ausgew\u00e4hlten Felder nach Nordwest. replace.text=Ersetzen replace.mnemonic=Z -replace.shortdescription=\xD6ffnet den Dialog zum Ersetzen von Objekten. +replace.shortdescription=\u00d6ffnet den Dialog zum Ersetzen von Objekten. -fillAuto.text=F\xFCllen +fillAuto.text=F\u00fcllen fillAuto.mnemonic=F -fillAuto.shortdescription=F\xFCllt die ausgew\xE4hlten Felder. -fillAuto.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\xFCllt wird. +fillAuto.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder. +fillAuto.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\u00fcllt wird. -fillAbove.text=Oben f\xFCllen +fillAbove.text=Oben f\u00fcllen fillAbove.mnemonic=O -fillAbove.shortdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt. -fillAbove.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte. +fillAbove.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder. Neu eingef\u00fcgte Objekte werden \u00fcber bereits existierenden Objekten eingef\u00fcgt. +fillAbove.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder. Neu eingef\u00fcgte Objekte werden \u00fcber bereits existierenden Objekten eingef\u00fcgt und ersetzen niemals bereits existierende Objekte. -fillBelow.text=Unten f\xFCllen +fillBelow.text=Unten f\u00fcllen fillBelow.mnemonic=U -fillBelow.shortdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt. -fillBelow.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte. +fillBelow.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder. Neu eingef\u00fcgte Objekte werden unter bereits existierenden Objekten eingef\u00fcgt. +fillBelow.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder. Neu eingef\u00fcgte Objekte werden unter bereits existierenden Objekten eingef\u00fcgt und ersetzen niemals bereits existierende Objekte. -randFillAuto.text=Zuf\xE4llig f\xFCllen -randFillAuto.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. -randFillAuto.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\xFCllt wird. +randFillAuto.text=Zuf\u00e4llig f\u00fcllen +randFillAuto.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. +randFillAuto.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\u00fcllt wird. -randFillAbove.text=Zuf\xE4llig oben f\xFCllen -randFillAbove.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt. -randFillAbove.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte. +randFillAbove.text=Zuf\u00e4llig oben f\u00fcllen +randFillAbove.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. Neu eingef\u00fcgte Objekte werden \u00fcber bereits existierenden Objekten eingef\u00fcgt. +randFillAbove.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. Neu eingef\u00fcgte Objekte werden \u00fcber bereits existierenden Objekten eingef\u00fcgt und ersetzen niemals bereits existierende Objekte. -randFillBelow.text=Zuf\xE4llig unten f\xFCllen -randFillBelow.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt. -randFillBelow.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte. +randFillBelow.text=Zuf\u00e4llig unten f\u00fcllen +randFillBelow.shortdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. Neu eingef\u00fcgte Objekte werden unter bereits existierenden Objekten eingef\u00fcgt. +randFillBelow.longdescription=F\u00fcllt die ausgew\u00e4hlten Felder zuf\u00e4llig. Neu eingef\u00fcgte Objekte werden unter bereits existierenden Objekten eingef\u00fcgt und ersetzen niemals bereits existierende Objekte. -floodFill.text=Freien Bereich f\xFCllen -floodFill.shortdescription=F\xFCllt freie Felder. -floodFill.longdescription=F\xFCllt freie Felder. Der F\xFCllvorgang beginnt im Cursor-Feld. +floodFill.text=Freien Bereich f\u00fcllen +floodFill.shortdescription=F\u00fcllt freie Felder. +floodFill.longdescription=F\u00fcllt freie Felder. Der F\u00fcllvorgang beginnt im Cursor-Feld. -selectAll.text=Alles ausw\xE4hlen +selectAll.text=Alles ausw\u00e4hlen selectAll.mnemonic=S -selectAll.shortdescription=W\xE4hlt alle Felder der aktiven Karte aus. +selectAll.shortdescription=W\u00e4hlt alle Felder der aktiven Karte aus. expandEmptySelection.text=Leere Auswahl erweitern -expandEmptySelection.shortdescription=Erweitert die Auswahl um leere Felder, die an ausgew\xE4hlte leere Felder angrenzen. +expandEmptySelection.shortdescription=Erweitert die Auswahl um leere Felder, die an ausgew\u00e4hlte leere Felder angrenzen. -growSelection.text=Auswahl vergr\xF6\xDFern -growSelection.shortdescription=Vergr\xF6\xDFert die Auswahl um ein Feld. +growSelection.text=Auswahl vergr\u00f6\u00dfern +growSelection.shortdescription=Vergr\u00f6\u00dfert die Auswahl um ein Feld. shrinkSelection.text=Auswahl verkleinern shrinkSelection.shortdescription=Verkleinert die Auswahl um ein Feld. @@ -780,11 +780,11 @@ collectArches.text=Archetypen sammeln collectArches.mnemonic=A collectArches.shortdescription=Sammelt Archetypen in Dateien. -collectArches.longdescription=Sammelt Archetypen in Dateien. Diese Dateien werden vom Server ben\xF6tigt. +collectArches.longdescription=Sammelt Archetypen in Dateien. Diese Dateien werden vom Server ben\u00f6tigt. reloadFaces.text=Grafiken neu laden reloadFaces.mnemonic=F -reloadFaces.shortdescription=L\xE4dt alle Grafiken von Archetypen neu. +reloadFaces.shortdescription=L\u00e4dt alle Grafiken von Archetypen neu. ######### @@ -805,25 +805,25 @@ newScript.mnemonic=P newScript.shortdescription=Erzeugt ein neues Script. -editScript.text=Script \xE4ndern +editScript.text=Script \u00e4ndern editScript.mnemonic=N -editScript.shortdescription=\xD6ffnet ein Script. +editScript.shortdescription=\u00d6ffnet ein Script. -validateMap.text=Karte pr\xFCfen +validateMap.text=Karte pr\u00fcfen validateMap.mnemonic=K -validateMap.shortdescription=Pr\xFCft die aktive Karte auf Fehler. +validateMap.shortdescription=Pr\u00fcft die aktive Karte auf Fehler. zoom.text=Zoom zoom.mnemonic=Z -zoom.shortdescription=\xD6ffnet die Karten-Vorschau. +zoom.shortdescription=\u00d6ffnet die Karten-Vorschau. gc.text=Starte Garbage Collection gc.mnemonic=G -gc.shortdescription=F\xFChrt eine "Garbage Collection" aus. +gc.shortdescription=F\u00fchrt eine "Garbage Collection" aus. -cleanCompletelyBlockedSquares.text=Blockierte Felder l\xF6schen +cleanCompletelyBlockedSquares.text=Blockierte Felder l\u00f6schen cleanCompletelyBlockedSquares.mnemonic=B -cleanCompletelyBlockedSquares.shortdescription=L\xF6scht alle Felder, die Sicht und Durchgang blockieren, und die von solchen Feldern umgeben sind. +cleanCompletelyBlockedSquares.shortdescription=L\u00f6scht alle Felder, die Sicht und Durchgang blockieren, und die von solchen Feldern umgeben sind. ########### @@ -831,15 +831,15 @@ bookmarks.text=Lesezeichen bookmarks.mnemonic=Z -addBookmark.text=Lesezeichen hinzuf\xFCgen... +addBookmark.text=Lesezeichen hinzuf\u00fcgen... addBookmark.mnemonic=L -addBookmark.shortdescription=F\xFCgt ein Lesezeichen f\xFCr die aktuelle Karte hinzu. +addBookmark.shortdescription=F\u00fcgt ein Lesezeichen f\u00fcr die aktuelle Karte hinzu. manageBookmarks.text=Lesezeichen verwalten... manageBookmarks.mnemonic=V -manageBookmarks.shortdescription=\xD6ffnet den Dialog zum Verwalten der Lesezeichen. +manageBookmarks.shortdescription=\u00d6ffnet den Dialog zum Verwalten der Lesezeichen. -bookmarkItem.shortdescriptionformat=\xD6ffnet Karte {0} ({1}). +bookmarkItem.shortdescriptionformat=\u00d6ffnet Karte {0} ({1}). ####### @@ -850,17 +850,17 @@ showHelp.text=Hilfe showHelp.mnemonic=H -showHelp.shortdescription=\xD6ffnet die Hilfe. +showHelp.shortdescription=\u00d6ffnet die Hilfe. tipOfTheDay.text=Tipp des Tages... tipOfTheDay.mnemonic=T -tipOfTheDay.shortdescription=\xD6ffnet den "Tipp des Tages". +tipOfTheDay.shortdescription=\u00d6ffnet den "Tipp des Tages". -about.text=\xDCber... +about.text=\u00dcber... about.mnemonic=B -about.shortdescription=Zeigt Informationen \xFCber Gridarta an. +about.shortdescription=Zeigt Informationen \u00fcber Gridarta an. -aboutTab.title=\xDCber +aboutTab.title=\u00dcber aboutRuntimeProperties.title=Laufzeitparameter license.text=Lizenz... @@ -873,40 +873,40 @@ # Map Arch Panel mapArchAttrib.text=Attribute -mapArchAttrib.shortdescription=\xD6ffnet den Attribute-Dialog +mapArchAttrib.shortdescription=\u00d6ffnet den Attribute-Dialog -mapArchAddInv.text=Einf\xFCgen -mapArchAddInv.shortdescription=F\xFCgt ein Objekt zum Inventory hinzu +mapArchAddInv.text=Einf\u00fcgen +mapArchAddInv.shortdescription=F\u00fcgt ein Objekt zum Inventory hinzu mapArchAddEnv.text=Umgebung -mapArchAddEnv.shortdescription=F\xFCgt das markierte Objekt zum Inventory des eingef\xFCgten Objekts hinzu +mapArchAddEnv.shortdescription=F\u00fcgt das markierte Objekt zum Inventory des eingef\u00fcgten Objekts hinzu -eventAddNew.text=Event hinzuf\xFCgen -eventEditData.text=Event \xE4ndern -eventEdit.text=Script \xE4ndern -eventRemove.text=Event l\xF6schen +eventAddNew.text=Event hinzuf\u00fcgen +eventEditData.text=Event \u00e4ndern +eventEdit.text=Script \u00e4ndern +eventRemove.text=Event l\u00f6schen direction0.text=0 -direction0.shortdescription=Objekt ohne Ausrichtung einf\xFCgen +direction0.shortdescription=Objekt ohne Ausrichtung einf\u00fcgen -direction1.shortdescription=Eingef\xFCgtes Objekt nach Nord ausrichten +direction1.shortdescription=Eingef\u00fcgtes Objekt nach Nord ausrichten -direction2.shortdescription=Eingef\xFCgtes Objekt nach Nordost ausrichten +direction2.shortdescription=Eingef\u00fcgtes Objekt nach Nordost ausrichten -direction3.shortdescription=Eingef\xFCgtes Objekt nach Ost ausrichten +direction3.shortdescription=Eingef\u00fcgtes Objekt nach Ost ausrichten -direction4.shortdescription=Eingef\xFCgtes Objekt nach S\xFCdost ausrichten +direction4.shortdescription=Eingef\u00fcgtes Objekt nach S\u00fcdost ausrichten -direction5.shortdescription=Eingef\xFCgtes Objekt nach S\xFCd ausrichten +direction5.shortdescription=Eingef\u00fcgtes Objekt nach S\u00fcd ausrichten -direction6.shortdescription=Eingef\xFCgtes Objekt nach S\xFCdwest ausrichten +direction6.shortdescription=Eingef\u00fcgtes Objekt nach S\u00fcdwest ausrichten -direction7.shortdescription=Eingef\xFCgtes Objekt nach West ausrichten +direction7.shortdescription=Eingef\u00fcgtes Objekt nach West ausrichten -direction8.shortdescription=Eingef\xFCgtes Objekt nach Nordwest ausrichten +direction8.shortdescription=Eingef\u00fcgtes Objekt nach Nordwest ausrichten directionnull.text=Vorgabe -directionnull.shortdescription=Ausrichtung des Objekts von Archetyp \xFCbernehmen +directionnull.shortdescription=Ausrichtung des Objekts von Archetyp \u00fcbernehmen ########### @@ -917,34 +917,34 @@ lockAllPickmaps.text=Alle Pickmaps sperren lockAllPickmaps.mnemonic=P -lockAllPickmaps.shortdescription=\xC4ndert den Zustand "nur lesen" der Pickmaps. -lockAllPickmaps.longdescription=\xC4ndert den Zustand "nur lesen" der Pickmaps. Im Zustand "nur lesen" k\xF6nnen Pickmaps nicht ge\xE4ndert werden; dies verhindert unbeabsichtigte \xC4nderungen. +lockAllPickmaps.shortdescription=\u00c4ndert den Zustand "nur lesen" der Pick... [truncated message content] |
From: <ryo...@us...> - 2010-08-02 17:03:06
|
Revision: 8609 http://gridarta.svn.sourceforge.net/gridarta/?rev=8609&view=rev Author: ryo_saeba Date: 2010-08-02 17:02:59 +0000 (Mon, 02 Aug 2010) Log Message: ----------- Some translations. Modified Paths: -------------- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties trunk/src/app/net/sf/gridarta/messages_fr.properties Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-07-27 06:27:23 UTC (rev 8608) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-08-02 17:02:59 UTC (rev 8609) @@ -21,8 +21,8 @@ # See http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html#encoding # Translation done by Marmoth -application.name=Gridarta for Crossfire -mainWindow.title=Gridarta for Crossfire +application.name=Gridarta pour Crossfire +mainWindow.title=Gridarta pour Crossfire ########## Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-27 06:27:23 UTC (rev 8608) +++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-08-02 17:02:59 UTC (rev 8609) @@ -113,27 +113,27 @@ #closeAllMaps.longdescription= closeAllMaps.mnemonic=U -#saveAllMaps.text= -#saveAllMaps.shortdescription= +saveAllMaps.text=Engistrer toutes les cartes +saveAllMaps.shortdescription=Enregistre toutes les cartes modifi\u00e9s. gridVisible.text=Montrer la grille gridVisible.mnemonic=G #gridVisible.shortdescription= -#smoothing.text= +smoothing.text=Lissage #smoothing.mnemonic= -#smoothing.shortdescription= +smoothing.shortdescription=Active le lissage des images, permettant un rendu moins carr\u00e9. tileShow.text=Montrer les cartes li\u00e9es tileShow.shortdescription=Affiche les cartes li\u00e9es. -#mapCreateView.text= -#mapCreateView.shortdescription= +mapCreateView.text=Nouvelle vue +mapCreateView.shortdescription=Ouvre une nouvelle vue sur la carte actuelle. #mapCreateView.longdescription= mapProperties.text=Propri\u00e9t\u00e9s de la carte mapProperties.mnemonic=R -#mapProperties.shortdescription= +mapProperties.shortdescription=Ouvre le dialogue des propri\u00e9t\u00e9s de la carte actuelle. #mapProperties.longdescription= shrinkMapSize.text=R\u00e9duire la carte @@ -210,11 +210,11 @@ enterNorthWestMap.text=Aller Carte Nord-Ouest #enterNorthWestMap.shortdescription= -#deleteUnknownObjects.text= -#deleteUnknownObjects.shortdescription= +deleteUnknownObjects.text=Supprimer les objets inconnus +deleteUnknownObjects.shortdescription=Supprime de la carte courante les objets se r\u00e9f\u00e9rant \u00e0 des arch\u00e9types inconnus. -#gameObjectTextEditor.text= -#gameObjectTextEditor.shortdescription= +gameObjectTextEditor.text=\u00c9diteur texte pour objet +gameObjectTextEditor.shortdescription=Affiche ou cache l'\u00e9diteur mode texte pour l'objet courant. #gameObjectTextEditor.longdescription= @@ -669,7 +669,7 @@ clear.text=Effacer clear.mnemonic=E -clear.shortdescription=Efface les cases s\u00e9lectionn\u00e9es +clear.shortdescription=Efface les cases s\u00e9lectionn\u00e9es. cut.text=Couper cut.mnemonic=O @@ -687,52 +687,52 @@ #pasteTiled.shortdescription= #pasteTiled.longdescription= -#shift.text= +shift.text=D\u00e9caler shift.mnemonic=S -#shift.shortdescription= +shift.shortdescription=D\u00e9cale les cases s\u00e9lectionn\u00e9es. -#shiftNorth.text= +shiftNorth.text=D\u00e9caler vers le nord #shiftNorth.mnemonic= -#shiftNorth.shortdescription= -#shiftNorthEast.text= -#shiftNorthEast.shortdescription= -#shiftEast.text= +shiftNorth.shortdescription=D\u00e9cale la s\u00e9lection vers le nord. +shiftNorthEast.text=D\u00e9caler vers le nord-est +shiftNorthEast.shortdescription=D\u00e9cale la s\u00e9lection vers le nord-est. +shiftEast.text=D\u00e9caler vers l'est #shiftEast.mnemonic= -#shiftEast.shortdescription= -#shiftSouthEast.text= -#shiftSouthEast.shortdescription= -#shiftSouth.text= +shiftEast.shortdescription=D\u00e9cale la s\u00e9lection vers l'est. +shiftSouthEast.text=D\u00e9caler vers le sud-est +shiftSouthEast.shortdescription=D\u00e9cale la s\u00e9lection vers le sud-est. +shiftSouth.text=D\u00e9caler vers le sud #shiftSouth.mnemonic= -#shiftSouth.shortdescription= -#shiftSouthWest.text= -#shiftSouthWest.shortdescription= -#shiftWest.text= +shiftSouth.shortdescription=D\u00e9cale la s\u00e9lection vers le sud. +shiftSouthWest.text=D\u00e9caler vers le sud-ouest +shiftSouthWest.shortdescription=D\u00e9cale la s\u00e9lection vers le sud-ouest. +shiftWest.text=D\u00e9caler vers l'ouest #shiftWest.mnemonic= -#shiftWest.shortdescription= -#shiftNorthWest.text= -#shiftNorthWest.shortdescription= +shiftWest.shortdescription=D\u00e9cale la s\u00e9lection vers l'ouest. +shiftNorthWest.text=D\u00e9caler vers le nord-ouest +shiftNorthWest.shortdescription=D\u00e9cale la s\u00e9lection vers le nord-ouest. replace.text=Remplacer replace.mnemonic=M #replace.shortdescription= -#fillAuto.text= +fillAuto.text=Remplir #fillAuto.mnemonic= -#fillAuto.shortdescription= +fillAuto.shortdescription=Remplit les cases s\u00e9lectionn\u00e9es, en effa\u00e7ant les objets existants. #fillAuto.longdescription= -fillAbove.text=Remplir vers le haut +fillAbove.text=Remplir au-dessus fillAbove.mnemonic=H -#fillAbove.shortdescription= +fillAbove.shortdescription=Remplit la s\u00e9lection en ajoutant au-dessus des objets existants. #fillAbove.longdescription= -fillBelow.text=Remplir vers le bas +fillBelow.text=Remplir en-dessous fillBelow.mnemonic=B -#fillBelow.shortdescription= +fillBelow.shortdescription=Remplit la s\u00e9lection en ajoutant au-dessous des objets existants. #fillBelow.longdescription= -#randFillAuto.text= -#randFillAuto.shortdescription= +randFillAuto.text=Remplir al\u00e9atoirement +randFillAuto.shortdescription=Remplit al\u00e9atoirement les cases s\u00e9lectionn\u00e9es, rempla\u00e7ant les objets existants. #randFillAuto.longdescription= randFillAbove.text=Remplir en haut al\u00e9atoirement @@ -743,22 +743,22 @@ #randFillBelow.shortdescription= #randFillBelow.longdescription= -#floodFill.text= -#floodFill.shortdescription= +floodFill.text=Remplir les zones vides +floodFill.shortdescription=Remplit les zones vides de la s\u00e9lection. #floodFill.longdescription= selectAll.text=Tout s\u00e9lectionner selectAll.mnemonic=T #selectAll.shortdescription= -#expandEmptySelection.text= -#expandEmptySelection.shortdescription= +expandEmptySelection.text=\u00c9tendre la s\u00e9lection aux carr\u00e9s vides +expandEmptySelection.shortdescription=\u00c9tend la s\u00e9lection aux carr\u00e9s vides adjacents \u00e0 un carr\u00e9 vide d\u00e9j\u00e0 s\u00e9lectionn\u00e9. -#growSelection.text= -#growSelection.shortdescription= +growSelection.text=Agrandir la s\u00e9lection +growSelection.shortdescription=Agrandit la s\u00e9lection d'une case autour des cases s\u00e9lectionn\u00e9es. -#shrinkSelection.text= -#shrinkSelection.shortdescription= +shrinkSelection.text=R\u00e9duire la s\u00e9lection +shrinkSelection.shortdescription=R\u00e9duit la s\u00e9lection d'une case autour des cases s\u00e9lectionn\u00e9es. ############ @@ -1343,35 +1343,35 @@ ########## # Main Window -#tabButton.gameObject.title1= -#tabButton.gameObject.title2= +tabButton.gameObject.title1=Objet +tabButton.gameObject.title2={0} : Objet #tabButton.gameObject.shortdescription= -#tabButton.selectedSquare.title1= -#tabButton.selectedSquare.title2= +tabButton.selectedSquare.title1=Objet s\u00e9lectionn\u00e9 +tabButton.selectedSquare.title2={0} : Objet s\u00e9lectionn\u00e9 #tabButton.selectedSquare.shortdescription= -#tabButton.tools.title1= -#tabButton.tools.title2= +tabButton.tools.title1=Outils +tabButton.tools.title2={0} : Outils #tabButton.tools.shortdescription= -#tabButton.objects.title1=Objects -#tabButton.objects.title2= +tabButton.objects.title1=Objets +tabButton.objects.title2={0} : Objets #tabButton.objects.shortdescription= -#tabButton.monsters.title1= -#tabButton.monsters.title2= +tabButton.monsters.title1=Monstres +tabButton.monsters.title2={0} : Monstres #tabButton.monsters.shortdescription= -#tabButton.connections.title1= -#tabButton.connections.title2= +tabButton.connections.title1=Connexions +tabButton.connections.title2={0} : Connexions #tabButton.connections.shortdescription= -#tabButton.lockedItems.title1= -#tabButton.lockedItems.title2= +tabButton.lockedItems.title1=Objets verrouill\u00e9s +tabButton.lockedItems.title2={0} : Objets verrouill\u00e9s #tabButton.lockedItems.shortdescription= -#tabButton.warnings.title1= -#tabButton.warnings.title2= +tabButton.warnings.title1=Alertes +tabButton.warnings.title2={0} : Alertes #tabButton.warnings.shortdescription= -#tabButtonMoveTo.text= -#tabButtonMoveToTop.text= -#tabButtonMoveToBottom.text= -#tabButtonMoveToLeft.text= -#tabButtonMoveToRight.text= +tabButtonMoveTo.text=D\u00e9placer vers +tabButtonMoveToTop.text=Haut +tabButtonMoveToBottom.text=Bas +tabButtonMoveToLeft.text=Gauche +tabButtonMoveToRight.text=Droite ############ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-27 06:27:30
|
Revision: 8608 http://gridarta.svn.sourceforge.net/gridarta/?rev=8608&view=rev Author: akirschbaum Date: 2010-07-27 06:27:23 +0000 (Tue, 27 Jul 2010) Log Message: ----------- Default loading config from 'archetype directory' rather than 'collected directory' when starting Gridarta for the first time. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-24 06:46:01 UTC (rev 8607) +++ trunk/atrinik/ChangeLog 2010-07-27 06:27:23 UTC (rev 8608) @@ -1,3 +1,8 @@ +2010-07-27 Andreas Kirschbaum + + * Default loading config from 'archetype directory' rather than + 'collected directory' when starting Gridarta for the first time. + 2010-07-24 Andreas Kirschbaum * Remove the "Apply" button from game object attributes panel as Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-24 06:46:01 UTC (rev 8607) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-27 06:27:23 UTC (rev 8608) @@ -23,7 +23,7 @@ application.name=Gridarta for Atrinik mainWindow.title=Gridarta for Atrinik {0} -configSources=net.sf.gridarta.var.atrinik.model.settings.CollectedConfigSource net.sf.gridarta.var.atrinik.model.settings.FilesConfigSource +configSources=net.sf.gridarta.var.atrinik.model.settings.FilesConfigSource net.sf.gridarta.var.atrinik.model.settings.CollectedConfigSource # configSource.<config source name>.<file type>.<sequence> values support the # following variables: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-24 06:46:08
|
Revision: 8607 http://gridarta.svn.sourceforge.net/gridarta/?rev=8607&view=rev Author: akirschbaum Date: 2010-07-24 06:46:01 +0000 (Sat, 24 Jul 2010) Log Message: ----------- Remove the "Apply" button from game object attributes panel as change are automatically applied. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/crossfire/ChangeLog trunk/daimonin/ChangeLog trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java trunk/src/app/net/sf/gridarta/messages.properties trunk/src/app/net/sf/gridarta/messages_de.properties trunk/src/app/net/sf/gridarta/messages_fr.properties trunk/src/app/net/sf/gridarta/messages_sv.properties Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/atrinik/ChangeLog 2010-07-24 06:46:01 UTC (rev 8607) @@ -1,3 +1,8 @@ +2010-07-24 Andreas Kirschbaum + + * Remove the "Apply" button from game object attributes panel as + change are automatically applied. + 2010-07-23 Andreas Kirschbaum * (Re-)add "Save All Maps" function. Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/crossfire/ChangeLog 2010-07-24 06:46:01 UTC (rev 8607) @@ -1,3 +1,8 @@ +2010-07-24 Andreas Kirschbaum + + * Remove the "Apply" button from game object attributes panel as + change are automatically applied. + 2010-07-23 Andreas Kirschbaum * (Re-)add "Save All Maps" function. Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/daimonin/ChangeLog 2010-07-24 06:46:01 UTC (rev 8607) @@ -1,3 +1,8 @@ +2010-07-24 Andreas Kirschbaum + + * Remove the "Apply" button from game object attributes panel as + change are automatically applied. + 2010-07-23 Andreas Kirschbaum * (Re-)add "Save All Maps" function. Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-07-24 06:46:01 UTC (rev 8607) @@ -150,12 +150,6 @@ private Severity severity = Severity.DEFAULT; /** - * Action for "apply changes". - */ - @NotNull - private final Action aMapArchApply = ACTION_BUILDER.createAction(false, "mapArchApply", this); - - /** * Action for "add to inventory". */ @NotNull @@ -549,7 +543,6 @@ * Update the displayed information for the selected game object. */ private void refreshDisplay() { - aMapArchApply.setEnabled(selectedGameObject != null); aMapArchAddInv.setEnabled(selectedGameObject != null); aMapArchAddEnv.setEnabled(selectedGameObject != null); aMapArchAttribute.setEnabled(selectedGameObject != null); @@ -557,14 +550,6 @@ } /** - * Action method for applying the changes made in the arch panel. - */ - @ActionMethod - public void mapArchApply() { - applyArchPanelChanges(); - } - - /** * Action method for displaying the attributes of the currently selected * object. */ @@ -704,7 +689,6 @@ @NotNull private Container createButtonPanel() { final Container buttonPanel = new JPanel(); - buttonPanel.add(new JButton(aMapArchApply)); buttonPanel.add(new JButton(aMapArchAddInv)); buttonPanel.add(new JButton(aMapArchAddEnv)); buttonPanel.add(new JButton(aMapArchAttribute)); Modified: trunk/src/app/net/sf/gridarta/messages.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages.properties 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/src/app/net/sf/gridarta/messages.properties 2010-07-24 06:46:01 UTC (rev 8607) @@ -939,9 +939,6 @@ ################# # Map Arch Panel -mapArchApply.text=Apply -mapArchApply.shortdescription=Apply object changes - mapArchAttrib.text=Attributes mapArchAttrib.shortdescription=Open attributes dialog Modified: trunk/src/app/net/sf/gridarta/messages_de.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-07-24 06:46:01 UTC (rev 8607) @@ -872,9 +872,6 @@ ################# # Map Arch Panel -mapArchApply.text=Anwenden -mapArchApply.shortdescription=\xDCbernimmt die \xC4nderungen - mapArchAttrib.text=Attribute mapArchAttrib.shortdescription=\xD6ffnet den Attribute-Dialog Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-24 06:46:01 UTC (rev 8607) @@ -862,9 +862,6 @@ ################# # Map Arch Panel -mapArchApply.text=Appliquer -mapArchApply.shortdescription=Applique les modifications de l'objet. - mapArchAttrib.text=Attributs mapArchAttrib.shortdescription=Affiche les attributs de l'objet. Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-07-24 06:42:51 UTC (rev 8606) +++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-07-24 06:46:01 UTC (rev 8607) @@ -870,9 +870,6 @@ ################# # Map Arch Panel -mapArchApply.text=Anv\xE4nd -mapArchApply.shortdescription=Anv\xE4nd \xE4ndringarna i objektet - mapArchAttrib.text=Attribut mapArchAttrib.shortdescription=\xD6ppna attributdialogen This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-24 06:42:57
|
Revision: 8606 http://gridarta.svn.sourceforge.net/gridarta/?rev=8606&view=rev Author: akirschbaum Date: 2010-07-24 06:42:51 +0000 (Sat, 24 Jul 2010) Log Message: ----------- Add @NotNull annotations. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-07-23 21:32:47 UTC (rev 8605) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java 2010-07-24 06:42:51 UTC (rev 8606) @@ -80,11 +80,13 @@ /** * Action Builder. */ + @NotNull private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta"); /** * The MainControl to use, e.g. for accessing AnimationObjects. */ + @NotNull private final GameObjectAttributesDialogFactory<G, A, R> gameObjectAttributesDialogFactory; /** @@ -114,11 +116,13 @@ /** * The main panel. */ + @NotNull private final JTabbedPane panelDesktop = new JTabbedPane(SwingConstants.TOP); /** * The model used by this controller. */ + @NotNull private final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel; /** @@ -148,36 +152,43 @@ /** * Action for "apply changes". */ + @NotNull private final Action aMapArchApply = ACTION_BUILDER.createAction(false, "mapArchApply", this); /** * Action for "add to inventory". */ + @NotNull private final Action aMapArchAddInv = ACTION_BUILDER.createAction(false, "mapArchAddInv", this); /** * Action for "add to environment". */ + @NotNull private final Action aMapArchAddEnv = ACTION_BUILDER.createAction(false, "mapArchAddEnv", this); /** * Action for "edit attributes". */ + @NotNull private final Action aMapArchAttribute = ACTION_BUILDER.createAction(false, "mapArchAttrib", this); /** * All active tabs. Tabs not currently visible are missing. */ + @NotNull private final Collection<GameObjectAttributesTab<G, A, R>> tabs = new HashSet<GameObjectAttributesTab<G, A, R>>(); /** * Maps tab to tab index. Tabs not currently visible are missing. */ + @NotNull private final Map<GameObjectAttributesTab<G, A, R>, Integer> tabIndex = new IdentityHashMap<GameObjectAttributesTab<G, A, R>, Integer>(); /** * Maps tab's component to tab. */ + @NotNull private final Map<Component, GameObjectAttributesTab<G, A, R>> componentTabs = new IdentityHashMap<Component, GameObjectAttributesTab<G, A, R>>(); /** @@ -195,6 +206,7 @@ /** * The map manager listener. */ + @NotNull private final MapManagerListener<G, A, R> mapManagerListener = new MapManagerListener<G, A, R>() { /** {@inheritDoc} */ @@ -236,6 +248,7 @@ /** * The map model listener which is attached to {@link #currentMapControl}. */ + @NotNull private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() { /** {@inheritDoc} */ @@ -296,6 +309,7 @@ * #currentMapControl}. It triggers auto-apply whenever a map transaction is * about to start. */ + @NotNull private final MapTransactionListener<G, A, R> mapTransactionListener = new MapTransactionListener<G, A, R>() { /** {@inheritDoc} */ @@ -328,6 +342,7 @@ /** * The listener to detect changes of the selected game object. */ + @NotNull private final SelectedSquareModelListener<G, A, R> selectedSquareModelListener = new SelectedSquareModelListener<G, A, R>() { /** {@inheritDoc} */ @@ -347,6 +362,7 @@ /** * The listener attached to {@link #gameObjectAttributesModel}. */ + @NotNull private final GameObjectAttributesModelListener<G, A, R> gameObjectAttributesModelListener = new GameObjectAttributesModelListener<G, A, R>() { /** {@inheritDoc} */ @@ -368,6 +384,7 @@ /** * The listener attached to all tabs. */ + @NotNull private final GameObjectAttributesTabListener<G, A, R> gameObjectAttributesTabListener = new GameObjectAttributesTabListener<G, A, R>() { /** {@inheritDoc} */ @@ -684,6 +701,7 @@ * Creates the button panel containing the actions. * @return the button panel */ + @NotNull private Container createButtonPanel() { final Container buttonPanel = new JPanel(); buttonPanel.add(new JButton(aMapArchApply)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-23 21:32:53
|
Revision: 8605 http://gridarta.svn.sourceforge.net/gridarta/?rev=8605&view=rev Author: akirschbaum Date: 2010-07-23 21:32:47 +0000 (Fri, 23 Jul 2010) Log Message: ----------- (Re-)add "Save All Maps" function. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties trunk/crossfire/ChangeLog trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties trunk/daimonin/ChangeLog trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/atrinik/ChangeLog 2010-07-23 21:32:47 UTC (rev 8605) @@ -1,3 +1,7 @@ +2010-07-23 Andreas Kirschbaum + + * (Re-)add "Save All Maps" function. + 2010-07-22 Andreas Kirschbaum * Remove face numbers from generated "bmaps" file. Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-07-23 21:32:47 UTC (rev 8605) @@ -25,7 +25,7 @@ ######## # Menus main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help -file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit +file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/crossfire/ChangeLog 2010-07-23 21:32:47 UTC (rev 8605) @@ -1,3 +1,7 @@ +2010-07-23 Andreas Kirschbaum + + * (Re-)add "Save All Maps" function. + 2010-07-15 Andreas Kirschbaum * Add support for *.trs treasurelist files in arch directory. Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-07-23 21:32:47 UTC (rev 8605) @@ -25,7 +25,7 @@ ######## # Menus main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help -file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit +file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/daimonin/ChangeLog 2010-07-23 21:32:47 UTC (rev 8605) @@ -1,3 +1,7 @@ +2010-07-23 Andreas Kirschbaum + + * (Re-)add "Save All Maps" function. + 2010-07-15 Andreas Kirschbaum * Include correct filename for errors in *.tl treasurelists. Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-07-22 17:23:44 UTC (rev 8604) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-07-23 21:32:47 UTC (rev 8605) @@ -25,7 +25,7 @@ ######## # Menus main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help -file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit +file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-22 17:23:51
|
Revision: 8604 http://gridarta.svn.sourceforge.net/gridarta/?rev=8604&view=rev Author: akirschbaum Date: 2010-07-22 17:23:44 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Remove face numbers from generated "bmaps" file. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-22 17:01:49 UTC (rev 8603) +++ trunk/atrinik/ChangeLog 2010-07-22 17:23:44 UTC (rev 8604) @@ -1,3 +1,7 @@ +2010-07-22 Andreas Kirschbaum + + * Remove face numbers from generated "bmaps" file. + 2010-07-15 Andreas Kirschbaum * Include correct filename for errors in *.tl treasurelists. Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-22 17:01:49 UTC (rev 8603) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-22 17:23:44 UTC (rev 8604) @@ -45,7 +45,7 @@ configSource.image.name=atrinik.0 configSource.face.name=bmaps -configSource.face.output=%1$05d %3$s +configSource.face.output=%3$s configSource.facetree.name=facetree configSource.facetree.input=^(.*) configSource.facetree.output=%2$s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-22 17:01:55
|
Revision: 8603 http://gridarta.svn.sourceforge.net/gridarta/?rev=8603&view=rev Author: akirschbaum Date: 2010-07-22 17:01:49 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Remove unused import statement. Modified Paths: -------------- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java =================================================================== --- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-07-22 16:56:19 UTC (rev 8602) +++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-07-22 17:01:49 UTC (rev 8603) @@ -20,7 +20,6 @@ package net.sf.gridarta.var.atrinik.model.archetype; import java.io.IOException; -import java.util.regex.Pattern; import net.sf.gridarta.model.anim.AnimationObjects; import net.sf.gridarta.model.anim.DefaultAnimationObjects; import net.sf.gridarta.model.archetype.AbstractArchetypeBuilder; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-22 16:56:27
|
Revision: 8602 http://gridarta.svn.sourceforge.net/gridarta/?rev=8602&view=rev Author: akirschbaum Date: 2010-07-22 16:56:19 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Move hard-coded filenames and patterns for faces into text resources. Modified Paths: -------------- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/IGUIConstants.java trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/CollectedResourcesReader.java trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/CollectedResourcesReader.java trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/IGUIConstants.java trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/resource/CollectedResourcesReader.java trunk/model/src/app/net/sf/gridarta/model/face/FaceObjects.java trunk/model/src/test/net/sf/gridarta/model/face/TestFaceObjects.java trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java trunk/utils/src/app/net/sf/gridarta/utils/CommonConstants.java Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/IGUIConstants.java =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/IGUIConstants.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/IGUIConstants.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -66,14 +66,7 @@ String ARCH_FILE = "archetypes"; // file with all arches - String PNG_FILE = "atrinik.0"; // file with all pngs - /** - * File to store the face tree information after arch collection. - */ - String FACETREE_FILE = "facetree"; - - /** * File to store the animation tree information after arch collection. */ String ANIMTREE_FILE = "animtree"; Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -287,7 +287,7 @@ @NotNull @Override public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) { - return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^(.*)"), "%2$s", archFaceProvider); + return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); } /** Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-07-22 16:56:19 UTC (rev 8602) @@ -43,6 +43,13 @@ configSource.ARCH_DIRECTORY.treasures.0=${COLLECTED}/treasures configSource.ARCH_DIRECTORY.treasures.1=${MAPS} +configSource.image.name=atrinik.0 +configSource.face.name=bmaps +configSource.face.output=%1$05d %3$s +configSource.facetree.name=facetree +configSource.facetree.input=^(.*) +configSource.facetree.output=%2$s + # Internal version number of the included online-documentation. Increasing the # number causes an automated popup of the docu when users upgrade their editor # and run for the first time. Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/CollectedResourcesReader.java =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/CollectedResourcesReader.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/CollectedResourcesReader.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -148,7 +148,7 @@ } catch (final IOException ex) { errorView.addWarning(ErrorViewCategory.ARCHETYPES_FILE_INVALID, IGUIConstants.ARCH_FILE + ": " + ex.getMessage()); } - return faceObjects.loadFacesCollection(errorView, collectedDirectory, IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE); + return faceObjects.loadFacesCollection(errorView, collectedDirectory); } } // class CollectedResourcesReader Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java =================================================================== --- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -118,7 +118,7 @@ @Override protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype, ? extends AbstractArchetypeBuilder<GameObject, MapArchObject, Archetype>> newArchetypeParser() { final ArchFaceProvider archFaceProvider = new ArchFaceProvider(); - final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>("png", "facetree", Pattern.compile(".*"), "facetree.output", archFaceProvider); + final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); final GUIUtils guiUtils = new GUIUtils(); final SystemIcons systemIcons = new SystemIcons(guiUtils); final FaceObjectProviders faceObjectProviders = new FaceObjectProviders(0, faceObjects, systemIcons); Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -68,15 +68,11 @@ String ARCH_FILE = "archetypes"; // file with all arches - String PNG_FILE = "crossfire.0"; // file with all png files - /** * File to store the animation tree information after arch collection. */ String ANIMTREE_FILE = "animtree"; - String FACETREE_FILE = "bmaps.paths"; - String SMOOTH_FILE = "smooth"; } // interface IGUIConstants Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -20,7 +20,6 @@ package net.sf.gridarta.var.crossfire.maincontrol; import java.awt.Component; -import java.util.regex.Pattern; import net.sf.gridarta.gui.filter.FilterControl; import net.sf.gridarta.gui.io.GuiFileFilters; import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory; @@ -250,7 +249,7 @@ @NotNull @Override public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) { - return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^.*\t\\.?(.*)"), "\\%1$05d\t./arch%2$s", archFaceProvider); + return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); } /** Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-07-22 16:56:19 UTC (rev 8602) @@ -41,6 +41,13 @@ configSource.COLLECTED.treasures.0=${COLLECTED}/treasures configSource.ARCH_DIRECTORY.treasures.0=${ARCH} +configSource.image.name=crossfire.0 +configSource.face.name=bmaps +configSource.face.output=%1$05d %3$s +configSource.facetree.name=bmaps.paths +configSource.facetree.input=^.*\t\\.?(.*) +configSource.facetree.output=\\%1$05d\t./arch%2$s + # Internal version number of the included online-documentation. Increasing the # number causes an automated popup of the docu when users upgrade their editor # and run for the first time. Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/CollectedResourcesReader.java =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/CollectedResourcesReader.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/CollectedResourcesReader.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -166,7 +166,7 @@ } catch (final IOException ex) { errorView.addWarning(ErrorViewCategory.ARCHETYPES_FILE_INVALID, IGUIConstants.ARCH_FILE + ": " + ex.getMessage()); } - final FaceProvider faceProvider = faceObjects.loadFacesCollection(errorView, collectedDirectory, IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE); + final FaceProvider faceProvider = faceObjects.loadFacesCollection(errorView, collectedDirectory); try { final URL url = IOUtils.getResource(configurationDirectory, IGUIConstants.SMOOTH_FILE); SmoothFacesLoader.load(url, smoothFaces, errorView); Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java =================================================================== --- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -20,7 +20,6 @@ package net.sf.gridarta.var.crossfire.model.archetype; import java.io.IOException; -import java.util.regex.Pattern; import net.sf.gridarta.model.anim.AnimationObjects; import net.sf.gridarta.model.anim.DefaultAnimationObjects; import net.sf.gridarta.model.archetype.AbstractArchetypeBuilder; @@ -92,7 +91,7 @@ @Override protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype, ? extends AbstractArchetypeBuilder<GameObject, MapArchObject, Archetype>> newArchetypeParser() { final ArchFaceProvider archFaceProvider = new ArchFaceProvider(); - final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>("png", "facetree", Pattern.compile(".*"), "facetree.output", archFaceProvider); + final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); final GUIUtils guiUtils = new GUIUtils(); final SystemIcons systemIcons = new SystemIcons(guiUtils); final FaceObjectProviders faceObjectProviders = new FaceObjectProviders(0, faceObjects, systemIcons); Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java =================================================================== --- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -19,7 +19,6 @@ package net.sf.gridarta.var.crossfire.model.gameobject; -import java.util.regex.Pattern; import net.sf.gridarta.model.anim.AnimationObjects; import net.sf.gridarta.model.anim.DefaultAnimationObjects; import net.sf.gridarta.model.face.ArchFaceProvider; @@ -62,7 +61,7 @@ */ GameObjectCreator() { final ArchFaceProvider archFaceProvider = new ArchFaceProvider(); - final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>("pngFile", "faceTreeFile", Pattern.compile(""), "", archFaceProvider); + final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); final GUIUtils guiUtils = new GUIUtils(); final SystemIcons systemIcons = new SystemIcons(guiUtils); faceObjectProviders = new FaceObjectProviders(1, faceObjects, systemIcons); Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/IGUIConstants.java =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/IGUIConstants.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/IGUIConstants.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -66,14 +66,7 @@ String ARCH_FILE = "archetypes"; // file with all arches - String PNG_FILE = "daimonin.0"; // file with all pngs - /** - * File to store the face tree information after arch collection. - */ - String FACETREE_FILE = "facetree"; - - /** * File to store the animation tree information after arch collection. */ String ANIMTREE_FILE = "animtree"; Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -288,7 +288,7 @@ @NotNull @Override public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) { - return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE, Pattern.compile("^(.*)"), "%2$s", archFaceProvider); + return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider); } /** Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-07-22 16:56:19 UTC (rev 8602) @@ -43,6 +43,13 @@ configSource.ARCH_DIRECTORY.treasures.0=${COLLECTED}/treasures configSource.ARCH_DIRECTORY.treasures.1=${MAPS} +configSource.image.name=daimonin.0 +configSource.face.name=bmaps +configSource.face.output=%1$05d %3$s +configSource.facetree.name=facetree +configSource.facetree.input=^(.*) +configSource.facetree.output=%2$s + # Internal version number of the included online-documentation. Increasing the # number causes an automated popup of the docu when users upgrade their editor # and run for the first time. Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/resource/CollectedResourcesReader.java =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/resource/CollectedResourcesReader.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/resource/CollectedResourcesReader.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -148,7 +148,7 @@ } catch (final IOException ex) { errorView.addWarning(ErrorViewCategory.ARCHETYPES_FILE_INVALID, IGUIConstants.ARCH_FILE + ": " + ex.getMessage()); } - return faceObjects.loadFacesCollection(errorView, collectedDirectory, IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE); + return faceObjects.loadFacesCollection(errorView, collectedDirectory); } } // class CollectedResourcesReader Modified: trunk/model/src/app/net/sf/gridarta/model/face/FaceObjects.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/face/FaceObjects.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/model/src/app/net/sf/gridarta/model/face/FaceObjects.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -38,12 +38,10 @@ * Loads all faces from a png collection file. * @param errorView the error view for reporting errors * @param collectedDirectory directory to load from - * @param faceFile file to load faces from - * @param treeFile file to load tree information from * @return the face provider for accessing the read faces */ @NotNull - FaceProvider loadFacesCollection(@NotNull ErrorView errorView, @NotNull File collectedDirectory, @NotNull String faceFile, @NotNull String treeFile); + FaceProvider loadFacesCollection(@NotNull ErrorView errorView, @NotNull File collectedDirectory); /** * Adds a new face object. Modified: trunk/model/src/test/net/sf/gridarta/model/face/TestFaceObjects.java =================================================================== --- trunk/model/src/test/net/sf/gridarta/model/face/TestFaceObjects.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/model/src/test/net/sf/gridarta/model/face/TestFaceObjects.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -52,7 +52,7 @@ */ @NotNull @Override - public FaceProvider loadFacesCollection(@NotNull final ErrorView errorView, @NotNull final File collectedDirectory, @NotNull final String faceFile, @NotNull final String treeFile) { + public FaceProvider loadFacesCollection(@NotNull final ErrorView errorView, @NotNull final File collectedDirectory) { throw new AssertionError(); } Modified: trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java =================================================================== --- trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -45,7 +45,6 @@ import net.sf.gridarta.model.maparchobject.MapArchObject; import net.sf.gridarta.utils.ActionBuilderUtils; import net.sf.gridarta.utils.ArrayUtils; -import net.sf.gridarta.utils.CommonConstants; import net.sf.gridarta.utils.IOUtils; import net.sf.japi.swing.action.ActionBuilder; import net.sf.japi.swing.action.ActionBuilderFactory; @@ -81,35 +80,6 @@ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta"); /** - * The filename of the collected image file. - * @serial - */ - @NotNull - private final String pngFile; - - /** - * The filename of the face tree file. - * @serial - */ - @NotNull - private final String faceTreeFile; - - /** - * The {@link Pattern} for parsing face tree files. The pattern must return - * the face name in the first capturing group. - * @serial - */ - @NotNull - private final Pattern faceTreeInputPattern; - - /** - * The format string for writing face tree files. - * @serial - */ - @NotNull - private final String faceTreeOutputFormat; - - /** * The {@link ArchFaceProvider} to use for collection. */ @NotNull @@ -117,19 +87,10 @@ /** * Creates a new instance. - * @param pngFile the filename of the collected image file - * @param faceTreeFile the filename of the face tree file - * @param faceTreeInputPattern the pattern for parsing face tree files - * @param faceTreeOutputFormat the format string for writing face tree - * files * @param archFaceProvider the arch face provider to use for collection */ - public DefaultFaceObjects(@NotNull final String pngFile, @NotNull final String faceTreeFile, @NotNull final Pattern faceTreeInputPattern, @NotNull final String faceTreeOutputFormat, @NotNull final ArchFaceProvider archFaceProvider) { + public DefaultFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) { super(ActionBuilderUtils.getString(ACTION_BUILDER, "nameOfFaceObject")); - this.pngFile = pngFile; - this.faceTreeFile = faceTreeFile; - this.faceTreeInputPattern = faceTreeInputPattern; - this.faceTreeOutputFormat = faceTreeOutputFormat; this.archFaceProvider = archFaceProvider; } @@ -155,7 +116,7 @@ * @throws IOException in case of I/O problems during collection */ private void collectImageFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { - final File file = new File(collectedDirectory, pngFile); + final File file = new File(collectedDirectory, ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.image.name")); final FileOutputStream fos = new FileOutputStream(file); try { final FileChannel outChannel = fos.getChannel(); @@ -209,7 +170,7 @@ * @throws IOException in case of I/O problems during collection */ private void collectTreeFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { - collectFile(progress, new File(collectedDirectory, faceTreeFile), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectTree"), faceTreeOutputFormat); + collectFile(progress, new File(collectedDirectory, ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.facetree.name")), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectTree"), ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.facetree.output")); } /** @@ -219,7 +180,7 @@ * @throws IOException in case of I/O problems during collection */ private void collectBmapsFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { - collectFile(progress, new File(collectedDirectory, CommonConstants.BMAPS_FILE), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectBmaps"), "%1$05d %3$s"); + collectFile(progress, new File(collectedDirectory, ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.face.name")), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectBmaps"), ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.face.output")); } /** @@ -262,7 +223,9 @@ @NotNull @Override - public FaceProvider loadFacesCollection(@NotNull final ErrorView errorView, @NotNull final File collectedDirectory, @NotNull final String faceFile, @NotNull final String treeFile) { + public FaceProvider loadFacesCollection(@NotNull final ErrorView errorView, @NotNull final File collectedDirectory) { + final String faceFile = ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.image.name"); + final String treeFile = ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.facetree.name"); final File tmpFaceFile; try { tmpFaceFile = IOUtils.getFile(collectedDirectory, faceFile); @@ -293,6 +256,7 @@ final byte[] tag = "IMAGE ".getBytes(); // this is the starting string for a new png final StringBuilder faceB = new StringBuilder(); // face name of png try { + final Pattern pattern = Pattern.compile(ActionBuilderUtils.getString(ACTION_BUILDER, "configSource.facetree.input")); int offset = 0; while (offset < data.length) { // File: Structure* @@ -341,7 +305,7 @@ if (originalFilename == null) { log.warn(ACTION_BUILDER.format("logFaceObjectWithoutOriginalName", faceName)); } else { - final Matcher matcher = faceTreeInputPattern.matcher(originalFilename); + final Matcher matcher = pattern.matcher(originalFilename); if (matcher.matches()) { try { addFaceObject(faceName, matcher.group(1), offset, size); Modified: trunk/utils/src/app/net/sf/gridarta/utils/CommonConstants.java =================================================================== --- trunk/utils/src/app/net/sf/gridarta/utils/CommonConstants.java 2010-07-22 16:23:36 UTC (rev 8601) +++ trunk/utils/src/app/net/sf/gridarta/utils/CommonConstants.java 2010-07-22 16:56:19 UTC (rev 8602) @@ -43,11 +43,6 @@ public static final String TYPEDEF_FILE = "types.xml"; /** - * Name of the file that contains the list of faces. - */ - public static final String BMAPS_FILE = "bmaps"; - - /** * The height of rigid area between the two tab-panes on the pickmap- and * arch-panel. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-22 16:23:42
|
Revision: 8601 http://gridarta.svn.sourceforge.net/gridarta/?rev=8601&view=rev Author: akirschbaum Date: 2010-07-22 16:23:36 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Merge duplicated code. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java Modified: trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java =================================================================== --- trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-07-22 16:23:15 UTC (rev 8600) +++ trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-07-22 16:23:36 UTC (rev 8601) @@ -31,14 +31,12 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.PrintStream; -import java.io.PrintWriter; import java.io.Reader; import java.net.URL; import java.nio.channels.FileChannel; import java.util.regex.Matcher; import java.util.regex.Pattern; import net.sf.gridarta.model.archetype.Archetype; -import net.sf.gridarta.model.data.NamedObject; import net.sf.gridarta.model.errorview.ErrorView; import net.sf.gridarta.model.errorview.ErrorViewCategory; import net.sf.gridarta.model.errorview.ErrorViewCollector; @@ -211,32 +209,7 @@ * @throws IOException in case of I/O problems during collection */ private void collectTreeFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { - final FileOutputStream fos = new FileOutputStream(new File(collectedDirectory, faceTreeFile)); - try { - final OutputStreamWriter osw = new OutputStreamWriter(fos, "us-ascii"); - try { - final BufferedWriter treeFile = new BufferedWriter(osw); - try { - final int numOfFaceObjects = size(); - progress.setLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectTree"), numOfFaceObjects); - int i = 0; - for (final NamedObject faceObject : this) { - final String path = faceObject.getPath(); - treeFile.append(String.format(faceTreeOutputFormat, i, path)).append('\n'); - if (i++ % 100 == 0) { - progress.setValue(i); - } - } - progress.setValue(numOfFaceObjects); - } finally { - treeFile.close(); - } - } finally { - osw.close(); - } - } finally { - fos.close(); - } + collectFile(progress, new File(collectedDirectory, faceTreeFile), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectTree"), faceTreeOutputFormat); } /** @@ -245,29 +218,37 @@ * @param collectedDirectory the destination directory to collect data to * @throws IOException in case of I/O problems during collection */ - protected void collectBmapsFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { - final FileOutputStream fos = new FileOutputStream(new File(collectedDirectory, CommonConstants.BMAPS_FILE)); + private void collectBmapsFile(@NotNull final Progress progress, @NotNull final File collectedDirectory) throws IOException { + collectFile(progress, new File(collectedDirectory, CommonConstants.BMAPS_FILE), ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectBmaps"), "%1$05d %3$s"); + } + + /** + * Creates an output file containing all faces. + * @param progress the process to report progress to + * @param file the output file to write + * @param label the progress label + * @param format the format string for writing the output file + * @throws IOException if an I/O error occurs + */ + private void collectFile(@NotNull final Progress progress, @NotNull final File file, @NotNull final String label, @NotNull final String format) throws IOException { + final FileOutputStream fos = new FileOutputStream(file); try { final OutputStreamWriter osw = new OutputStreamWriter(fos); try { final BufferedWriter bw = new BufferedWriter(osw); try { - final PrintWriter textFile = new PrintWriter(bw, false); - try { - final int numOfFaceObjects = size(); - progress.setLabel(ActionBuilderUtils.getString(ACTION_BUILDER, "archCollectBmaps"), numOfFaceObjects); - int i = 0; - for (final FaceObject faceObject : this) { - final String face = faceObject.getFaceName(); - textFile.format("%05d %s\n", i, face); - if (i++ % 100 == 0) { - progress.setValue(i); - } + final int numOfFaceObjects = size(); + progress.setLabel(label, numOfFaceObjects); + int i = 0; + for (final FaceObject faceObject : this) { + final String path = faceObject.getPath(); + final String face = faceObject.getFaceName(); + bw.append(String.format(format, i, path, face)).append('\n'); + if (i++ % 100 == 0) { + progress.setValue(i); } - progress.setValue(numOfFaceObjects); - } finally { - textFile.close(); } + progress.setValue(numOfFaceObjects); } finally { bw.close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-22 16:23:22
|
Revision: 8600 http://gridarta.svn.sourceforge.net/gridarta/?rev=8600&view=rev Author: akirschbaum Date: 2010-07-22 16:23:15 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Remove redundant text resources. Modified Paths: -------------- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-07-17 21:22:51 UTC (rev 8599) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-07-22 16:23:15 UTC (rev 8600) @@ -69,7 +69,3 @@ about.logo=icons/atrinikLogoSmall.png update.url=http://www.atrinik.org/editor/update.properties - -################ -# Other Strings -nameOfFaceObject=face Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-07-17 21:22:51 UTC (rev 8599) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-07-22 16:23:15 UTC (rev 8600) @@ -69,7 +69,3 @@ about.logo=icons/daimoninLogoSmall.png update.url=http://daimonin.sourceforge.net/editor/update.properties - -################ -# Other Strings -nameOfFaceObject=face This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ryo...@us...> - 2010-07-17 21:22:58
|
Revision: 8599 http://gridarta.svn.sourceforge.net/gridarta/?rev=8599&view=rev Author: ryo_saeba Date: 2010-07-17 21:22:51 +0000 (Sat, 17 Jul 2010) Log Message: ----------- More french translations. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/messages_fr.properties Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-17 20:59:07 UTC (rev 8598) +++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-17 21:22:51 UTC (rev 8599) @@ -109,7 +109,7 @@ # Map Manager closeAllMaps.text=Tout fermer -#closeAllMaps.shortdescription= +closeAllMaps.shortdescription=Ferme toutes les cartes ouvertes. #closeAllMaps.longdescription= closeAllMaps.mnemonic=U @@ -124,8 +124,8 @@ #smoothing.mnemonic= #smoothing.shortdescription= -#tileShow.text= -#tileShow.shortdescription= +tileShow.text=Montrer les cartes li\u00e9es +tileShow.shortdescription=Affiche les cartes li\u00e9es. #mapCreateView.text= #mapCreateView.shortdescription= @@ -136,17 +136,17 @@ #mapProperties.shortdescription= #mapProperties.longdescription= -#shrinkMapSize.text= -#shrinkMapSize.shortdescription= +shrinkMapSize.text=R\u00e9duire la carte +shrinkMapSize.shortdescription=Supprime les espaces inutiles \u00e0 droite et en bas. -#autoJoin.text= +autoJoin.text=Auto-connection des murs #autoJoin.mnemonic= -#autoJoin.shortdescription= +autoJoin.shortdescription=Active ou d\u00e9sactive la connexion automatique des murs. #autoJoin.longdescription= -enterExit.text=Aller Sortie +enterExit.text=Aller \u00e0 la destination enterExit.mnemonic=A -#enterExit.shortdescription= +enterExit.shortdescription=Ouvre la carte sur laquelle la sortie courante pointe. #enterExit.longdescription= #enterExitIOException.title= #enterExitIOException.message= @@ -162,14 +162,14 @@ #enterExitNotSaved.title= #enterExitNotSaved.message= -#nextExit.text= +nextExit.text=Sortie suivante #nextExit.mnemonic= -#nextExit.shortdescription= +nextExit.shortdescription=S\u00e9lectionne la sortie suivante sur la carte courante. #nextExit.longdescription= -#prevExit.text= +prevExit.text=Sortie pr\u00e9c\u00e9dente #prevExit.mnemonic= -#prevExit.shortdescription= +prevExit.shortdescription=S\u00e9lectionne la sortie pr\u00e9c\u00e9dente sur la carte courante. #prevExit.longdescription= #exitConnector.text= @@ -186,26 +186,26 @@ #exitConnect.shortdescription= #exitConnect.longdescription= -enterNorthMap.text=Aller Carte Nord -#enterNorthMap.shortdescription= +enterNorthMap.text=Aller \u00e0 la carte nord +enterNorthMap.shortdescription=Ouvrir la carte li\u00e9e au nord de la carte courante. enterNorthEastMap.text=Aller Carte Nord-Est #enterNorthEastMap.shortdescription= -enterEastMap.text=Aller Carte Est -#enterEastMap.shortdescription= +enterEastMap.text=Aller \u00e0 la carte est +enterEastMap.shortdescription=Ouvrir la carte li\u00e9e \u00e0 l'est de la carte courante. enterSouthEastMap.text=Aller Carte Sud-Est #enterSouthEastMap.shortdescription= -enterSouthMap.text=Aller Carte Sud -#enterSouthMap.shortdescription= +enterSouthMap.text=Aller \u00e0 la carte sud +enterSouthMap.shortdescription=Ouvrir la carte li\u00e9e au sud de la carte courante. enterSouthWestMap.text=Aller Carte Sud-Ouest #enterSouthWestMap.shortdescription= -enterWestMap.text=Aller Carte Ouest -#enterWestMap.shortdescription= +enterWestMap.text=Aller \u00e0 la carte ouest +enterWestMap.shortdescription=Ouvrir la carte li\u00e9e \u00e0 l'ouest de la carte courante. enterNorthWestMap.text=Aller Carte Nord-Ouest #enterNorthWestMap.shortdescription= @@ -609,55 +609,55 @@ file.mnemonic=F saveMap.text=Enregistrer -saveMap.shortdescription=Enregistre la carte active +saveMap.shortdescription=Enregistre la carte active. saveMap.mnemonic=E #saveMap.error.text.title= saveMap.error.text=Erreur lors de l''enregistrement. saveMapAs.text=Enregistrer sous... -saveMapAs.shortdescription=Enregistre la carte dans un fichier portant un nom diff\u00e9rent +saveMapAs.shortdescription=Enregistre la carte dans un fichier portant un nom diff\u00e9rent. saveMapAs.mnemonic=S saveMapAs.error.text=Erreur lors de l''enregistrement sous... createImage.text=Cr\u00e9er image -createImage.shortdescription=Cr\u00e9e une image \u00e0 partir de la carte et l''enregistre dans un fichier +createImage.shortdescription=Cr\u00e9e une image \u00e0 partir de la carte et l'enregistre dans un fichier. createImage.mnemonic=I createImage.error.text=Erreur lors de la cr\u00e9ation d''une image. revertMap.text=Restaurer -revertMap.shortdescription=Restaure la carte selon la derni\u00e8re version enregistr\u00e9e +revertMap.shortdescription=Restaure la carte selon la derni\u00e8re version enregistr\u00e9e. revertMap.mnemonic=R revertMap.error.text=Erreur lors de la restauration de la carte. closeMap.text=Fermer -closeMap.shortdescription=Ferme la carte active +closeMap.shortdescription=Ferme la carte active. closeMap.mnemonic=F -#recent.text= -#recent.shortdescription= +recent.text=R\u00e9cemment ouvert... +recent.shortdescription=Charge une carte r\u00e9cemment ouverte. #recent.mnemonic= #recentItem.shortdescriptionformat= newMap.text=Nouveau -newMap.shortdescription=Cr\u00e9e une nouvelle carte +newMap.shortdescription=Cr\u00e9e une nouvelle carte. newMap.mnemonic=N openFile.text=Ouvrir -openFile.shortdescription=Ouvre une carte \u00e0 partir d''un fichier +openFile.shortdescription=Ouvre une carte \u00e0 partir d'un fichier. openFile.mnemonic=O openFile.error.text=Erreur lors du chargement. options.text=Options... -options.shortdescription=Affiche les options -options.longdescription=Affiche une fen\u00eatre d''options pour modifier les r\u00e9glages de l''\u00e9diteur +options.shortdescription=Affiche les options. +options.longdescription=Affiche une fen\u00eatre d'options pour modifier les r\u00e9glages de l'\u00e9diteur. options.mnemonic=P -#shortcuts.text= -#shortcuts.shortdescription= +shortcuts.text=Configurer les raccourcis clavier +shortcuts.shortdescription=Configuration des raccourcis clavier de Gridarta. #shortcuts.longdescription= exit.text=Quitter -exit.shortdescription=Quitte le programme +exit.shortdescription=Quitte le programme. exit.mnemonic=Q @@ -780,7 +780,7 @@ ######### # Analyze -#analyze.text= +analyze.text=Analyse #analyze.mnemonic= #enabled.text= @@ -823,11 +823,11 @@ addBookmark.text=Ajouter un raccourci #addBookmark.mnemonic= -addBookmark.shortdescription=Ajoute un raccourci sur la carte courante +addBookmark.shortdescription=Ajoute un raccourci sur la carte courante. manageBookmarks.text=G\u00e9rer les raccourcis #manageBookmarks.mnemonic= -manageBookmarks.shortdescription=Permet de g\u00e9rer les raccourcis d\u00e9finis +manageBookmarks.shortdescription=Permet de g\u00e9rer les raccourcis d\u00e9finis. #bookmarkItem.shortdescriptionformat= @@ -842,13 +842,13 @@ showHelp.mnemonic=A #showHelp.shortdescription= -#tipOfTheDay.text= +tipOfTheDay.text=Astuces #tipOfTheDay.mnemonic= -#tipOfTheDay.shortdescription= +tipOfTheDay.shortdescription=Affiche les astuces du programme. about.text=\u00c0 propos... about.mnemonic=P -#about.shortdescription= +about.shortdescription=Affiche des informations sur Gridarta. #aboutTab.title= #aboutRuntimeProperties.title= @@ -862,17 +862,17 @@ ################# # Map Arch Panel -#mapArchApply.text= -#mapArchApply.shortdescription= +mapArchApply.text=Appliquer +mapArchApply.shortdescription=Applique les modifications de l'objet. -#mapArchAttrib.text= -#mapArchAttrib.shortdescription= +mapArchAttrib.text=Attributs +mapArchAttrib.shortdescription=Affiche les attributs de l'objet. -#mapArchAddInv.text= -#mapArchAddInv.shortdescription= +mapArchAddInv.text=Ajout inv. +mapArchAddInv.shortdescription=Ajoute un objet dans l'inventaire de l'objet courant. -#mapArchAddEnv.text= -#mapArchAddEnv.shortdescription= +mapArchAddEnv.text=Ajout env. +mapArchAddEnv.shortdescription=Ajoute un objet dans l'environnement. #eventAddNew.text= #eventEditData.text= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ryo...@us...> - 2010-07-17 20:59:13
|
Revision: 8598 http://gridarta.svn.sourceforge.net/gridarta/?rev=8598&view=rev Author: ryo_saeba Date: 2010-07-17 20:59:07 +0000 (Sat, 17 Jul 2010) Log Message: ----------- Update some french translations. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/messages_fr.properties Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties =================================================================== --- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-15 19:49:47 UTC (rev 8597) +++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-07-17 20:59:07 UTC (rev 8598) @@ -131,7 +131,7 @@ #mapCreateView.shortdescription= #mapCreateView.longdescription= -mapProperties.text=Propri\xE9t\xE9s de la carte +mapProperties.text=Propri\u00e9t\u00e9s de la carte mapProperties.mnemonic=R #mapProperties.shortdescription= #mapProperties.longdescription= @@ -241,7 +241,7 @@ # Resources -viewTreasurelists.text=Afficher listes de tr\xE9sors +viewTreasurelists.text=Afficher listes de tr\u00e9sors viewTreasurelists.mnemonic=T #viewTreasurelists.shortdescription= @@ -331,7 +331,7 @@ #openFileOutOfMapBoundsDeleted.message= #overwriteOtherFile.title= -overwriteOtherFile.message=Un fichier nomm\xE9 "{0}" existe d\xE9j\xE0.\n\nVoulez vous vraiment le remplacer? +overwriteOtherFile.message=Un fichier nomm\u00e9 "{0}" existe d\u00e9j\u00e0.\n\nVoulez vous vraiment le remplacer? #mkdirIOError.title= #mkdirIOError.message= @@ -408,18 +408,18 @@ #goLocationCoordinateOutOfRange.message= # The Edit Bookmark dialog -#editBookmark.title= -#editBookmarkOkay.text= -#editBookmarkCancel.text= -#editBookmark.description= +editBookmark.title=\u00c9dition de raccourci +editBookmarkOkay.text=Valider +editBookmarkCancel.text=Annuler +editBookmark.description=Description : # The Edit Bookmarks dialog -#manageBookmarks.title= -#manageBookmarksEdit.text= -#manageBookmarksMoveUp.text= -#manageBookmarksMoveDown.text= -#manageBookmarksRemove.text= -#manageBookmarksClose.text= +manageBookmarks.title=Gestion des raccourcis +manageBookmarksEdit.text=Modifier +manageBookmarksMoveUp.text=Monter +manageBookmarksMoveDown.text=Descendre +manageBookmarksRemove.text=Supprimer +manageBookmarksClose.text=Fermer # The Configure Keyboard Shortcuts dialog #shortcuts.title= @@ -466,7 +466,7 @@ #loadIllegalFace= # Map Properties -mapTitle={0} ({1}) - Propri\xE9t\xE9s de la carte +mapTitle={0} ({1}) - Propri\u00e9t\u00e9s de la carte #mapHelp.text= #mapRestore.text= #mapMapTabTitle= @@ -532,7 +532,7 @@ replaceOn=Dans #replaceOn.shortdescription= replaceOnMap=toute la carte -replaceOnSelection=les cases s\xE9lectionn\xE9es +replaceOnSelection=les cases s\u00e9lectionn\u00e9es replaceDelete=delete objects with #replaceDelete.shortdescription= #replaceArchetype= @@ -551,13 +551,13 @@ #replaceInvalidDensity.message= #replaceMapNoSelection.title= -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. +replaceMapNoSelection.message=Vous avez choisi de remplacer les cases s\u00e9lectionn\u00e9es de la \ncarte \"{0}\", mais il n''y a pas de s\u00e9lection. #replacedZero.title= -replacedZero.message=Aucun objet correspondant trouv\xE9. +replacedZero.message=Aucun objet correspondant trouv\u00e9. #replacedOne.title= -replacedOne.message=1 L''objet a \xE9t\xE9 remplac\xE9. +replacedOne.message=Un objet a \u00e9t\u00e9 remplac\u00e9. #replacedMany.title= -replacedMany.message={0} Les objets ont \xE9t\xE9 remplac\xE9s. +replacedMany.message={0} objets ont \u00e9t\u00e9 remplac\u00e9s. #replaceOk.text= #replaceApply.text= @@ -579,7 +579,7 @@ ############# # Status Bar -memory=({0}/{1}) M\xE9moire: {2} utilis\xE9e, {3} libre, {4} total +memory=({0}/{1}) M\u00e9moire: {2} utilis\u00e9e, {3} libre, {4} total ################## @@ -594,12 +594,12 @@ # Edit undo.text=Annuler undo.name=Annuler {0} -undo.shortdescription=Annuler la derni\xE8re action +undo.shortdescription=Annuler la derni\u00e8re action undo.mnemonic=U -redo.text=R\xE9p\xE9ter -redo.name=R\xE9p\xE9ter {0} -redo.shortdescription=R\xE9p\xE9ter la derni\xE8re action annul\xE9e +redo.text=R\u00e9p\u00e9ter +redo.name=R\u00e9p\u00e9ter {0} +redo.shortdescription=R\u00e9p\u00e9ter la derni\u00e8re action annul\u00e9e redo.mnemonic=R ########### @@ -615,17 +615,17 @@ saveMap.error.text=Erreur lors de l''enregistrement. saveMapAs.text=Enregistrer sous... -saveMapAs.shortdescription=Enregistre la carte dans un fichier portant un nom diff\xE9rent +saveMapAs.shortdescription=Enregistre la carte dans un fichier portant un nom diff\u00e9rent saveMapAs.mnemonic=S saveMapAs.error.text=Erreur lors de l''enregistrement sous... -createImage.text=Cr\xE9er image -createImage.shortdescription=Cr\xE9e une image \xE0 partir de la carte et l''enregistre dans un fichier +createImage.text=Cr\u00e9er image +createImage.shortdescription=Cr\u00e9e une image \u00e0 partir de la carte et l''enregistre dans un fichier createImage.mnemonic=I -createImage.error.text=Erreur lors de la cr\xE9ation d''une image. +createImage.error.text=Erreur lors de la cr\u00e9ation d''une image. revertMap.text=Restaurer -revertMap.shortdescription=Restaure la carte selon la derni\xE8re version enregistr\xE9e +revertMap.shortdescription=Restaure la carte selon la derni\u00e8re version enregistr\u00e9e revertMap.mnemonic=R revertMap.error.text=Erreur lors de la restauration de la carte. @@ -639,17 +639,17 @@ #recentItem.shortdescriptionformat= newMap.text=Nouveau -newMap.shortdescription=Cr\xE9e une nouvelle carte +newMap.shortdescription=Cr\u00e9e une nouvelle carte newMap.mnemonic=N openFile.text=Ouvrir -openFile.shortdescription=Ouvre une carte \xE0 partir d''un fichier +openFile.shortdescription=Ouvre une carte \u00e0 partir d''un fichier openFile.mnemonic=O openFile.error.text=Erreur lors du chargement. options.text=Options... options.shortdescription=Affiche les options -options.longdescription=Affiche une fen\xEAtre d''options pour modifier les r\xE9glages de l''\xE9diteur +options.longdescription=Affiche une fen\u00eatre d''options pour modifier les r\u00e9glages de l''\u00e9diteur options.mnemonic=P #shortcuts.text= @@ -669,7 +669,7 @@ clear.text=Effacer clear.mnemonic=E -clear.shortdescription=Efface les cases s\xE9lectionn\xE9es +clear.shortdescription=Efface les cases s\u00e9lectionn\u00e9es cut.text=Couper cut.mnemonic=O @@ -735,11 +735,11 @@ #randFillAuto.shortdescription= #randFillAuto.longdescription= -randFillAbove.text=Remplir en haut al\xE9atoirement +randFillAbove.text=Remplir en haut al\u00e9atoirement #randFillAbove.shortdescription= #randFillAbove.longdescription= -randFillBelow.text=Remplir en bas al\xE9atoirement +randFillBelow.text=Remplir en bas al\u00e9atoirement #randFillBelow.shortdescription= #randFillBelow.longdescription= @@ -747,7 +747,7 @@ #floodFill.shortdescription= #floodFill.longdescription= -selectAll.text=Tout s\xE9lectionner +selectAll.text=Tout s\u00e9lectionner selectAll.mnemonic=T #selectAll.shortdescription= @@ -818,16 +818,16 @@ ########### # Bookmarks -#bookmarks.text= +bookmarks.text=Raccourcis #bookmarks.mnemonic= -#addBookmark.text= +addBookmark.text=Ajouter un raccourci #addBookmark.mnemonic= -#addBookmark.shortdescription= +addBookmark.shortdescription=Ajoute un raccourci sur la carte courante -#manageBookmarks.text= +manageBookmarks.text=G\u00e9rer les raccourcis #manageBookmarks.mnemonic= -#manageBookmarks.shortdescription= +manageBookmarks.shortdescription=Permet de g\u00e9rer les raccourcis d\u00e9finis #bookmarkItem.shortdescriptionformat= @@ -846,7 +846,7 @@ #tipOfTheDay.mnemonic= #tipOfTheDay.shortdescription= -about.text=\xC0 propos... +about.text=\u00c0 propos... about.mnemonic=P #about.shortdescription= @@ -1011,7 +1011,7 @@ #archCollectWarningMissed.title= #archCollectWarningMissed.message= -arcDoc.htmlText=<html><head><meta name="Gridarta" contents="tmp"><title>{0}</title></head><body><h1 style="text-align:center;colour:navy;">Type: {0}</h1><h3 style="colour:navy;">Fonctionalit\xE9s de {0}</h3><p>{1}</p><h3 style="colour:navy;">Notes d''utilisation:</h3><p>{2}</p></body></html> +arcDoc.htmlText=<html><head><meta name="Gridarta" contents="tmp"><title>{0}</title></head><body><h1 style="text-align:center;colour:navy;">Type: {0}</h1><h3 style="colour:navy;">Fonctionalit\u00e9s de {0}</h3><p>{1}</p><h3 style="colour:navy;">Notes d''utilisation:</h3><p>{2}</p></body></html> ############### # File Dialogs @@ -1056,7 +1056,7 @@ scriptEditUndo.text=Annuler scriptEditUndo.name={0} scriptEditUndo.mnemonic=N -scriptEditRedo.text=R\xE9p\xE9ter +scriptEditRedo.text=R\u00e9p\u00e9ter scriptEditRedo.name={0} scriptEditRedo.mnemonic=P @@ -1214,14 +1214,14 @@ ######### # Window -window.text=Fen\xEAtres +window.text=Fen\u00eatres window.mnemonic=N -nextWindow.text=Fen\xEAtre suivante -nextWindow.shortdescription=Affiche la fen\xEAtre suivante +nextWindow.text=Fen\u00eatre suivante +nextWindow.shortdescription=Affiche la fen\u00eatre suivante -prevWindow.text=Fen\xEAtre pr\xE9c\xE9dente -prevWindow.shortdescription=Affiche la fen\xEAtre pr\xE9c\xE9dente +prevWindow.text=Fen\u00eatre pr\u00e9c\u00e9dente +prevWindow.shortdescription=Affiche la fen\u00eatre pr\u00e9c\u00e9dente ######################## @@ -1383,7 +1383,7 @@ mapwindowFile.text=Fichier mapwindowFile.mnemonic=F -mapwindowEdit.text=Edition +mapwindowEdit.text=\u00c9dition mapwindowEdit.mnemonic=E mapwindowMap.text=Carte This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 19:49:53
|
Revision: 8597 http://gridarta.svn.sourceforge.net/gridarta/?rev=8597&view=rev Author: akirschbaum Date: 2010-07-15 19:49:47 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Add @NotNull annotations. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/commands/Collector.java Modified: trunk/src/app/net/sf/gridarta/commands/Collector.java =================================================================== --- trunk/src/app/net/sf/gridarta/commands/Collector.java 2010-07-15 19:35:23 UTC (rev 8596) +++ trunk/src/app/net/sf/gridarta/commands/Collector.java 2010-07-15 19:49:47 UTC (rev 8597) @@ -25,6 +25,7 @@ import net.sf.japi.swing.action.ActionBuilder; import net.sf.japi.swing.action.ActionBuilderFactory; import net.sf.japi.swing.misc.Progress; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -38,21 +39,25 @@ /** * Action Builder. */ + @NotNull private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta"); /** * The Collectables. */ + @NotNull private final AbstractResources<?, ?, ?> resources; /** * The destination directory to write files to. */ + @NotNull private final File collectedDirectory; /** * The Progress to use. */ + @NotNull private final Progress progress; /** @@ -67,7 +72,7 @@ * @param resources the resources to collect * @param collectedDirectory the destination directory to write files to */ - public Collector(final Progress progress, final AbstractResources<?, ?, ?> resources, final File collectedDirectory) { + public Collector(@NotNull final Progress progress, @NotNull final AbstractResources<?, ?, ?> resources, @NotNull final File collectedDirectory) { if (!resources.canWriteCollected()) { throw new IllegalArgumentException(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 19:35:29
|
Revision: 8596 http://gridarta.svn.sourceforge.net/gridarta/?rev=8596&view=rev Author: akirschbaum Date: 2010-07-15 19:35:23 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Add support for *.trs treasurelist files in arch directory. [Crossfire only] Modified Paths: -------------- trunk/crossfire/ChangeLog trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-15 19:31:31 UTC (rev 8595) +++ trunk/crossfire/ChangeLog 2010-07-15 19:35:23 UTC (rev 8596) @@ -1,5 +1,7 @@ 2010-07-15 Andreas Kirschbaum + * Add support for *.trs treasurelist files in arch directory. + * Skip special files when loading treasure lists. 2010-07-12 Andreas Kirschbaum Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-07-15 19:31:31 UTC (rev 8595) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-07-15 19:35:23 UTC (rev 8596) @@ -39,7 +39,7 @@ # - ARCH_DIRECTORY individual files in archetype directory (set in settings # dialog) configSource.COLLECTED.treasures.0=${COLLECTED}/treasures -configSource.ARCH_DIRECTORY.treasures.0=${COLLECTED}/treasures +configSource.ARCH_DIRECTORY.treasures.0=${ARCH} # Internal version number of the included online-documentation. Increasing the # number causes an automated popup of the docu when users upgrade their editor Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 19:31:31 UTC (rev 8595) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 19:35:23 UTC (rev 8596) @@ -91,7 +91,7 @@ return true; } final String lowerCaseName = name.toLowerCase(); - return lowerCaseName.endsWith(".tl"); + return lowerCaseName.endsWith(".tl") || lowerCaseName.endsWith(".trs"); } }; @@ -295,8 +295,7 @@ } /** - * Recursively traverses a directory and parses all treasurelist files - * (*.tl). + * Recursively traverses a directory and parses all treasurelist files. * @param errorView the error view to use * @param dir directory to read from * @param tmpList a collection to which all parsed treasure tree nodes are This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 19:31:37
|
Revision: 8595 http://gridarta.svn.sourceforge.net/gridarta/?rev=8595&view=rev Author: akirschbaum Date: 2010-07-15 19:31:31 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Include correct filename for errors in *.tl treasurelists. [Atrinik and Daimonin only] Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/daimonin/ChangeLog trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-15 19:20:13 UTC (rev 8594) +++ trunk/atrinik/ChangeLog 2010-07-15 19:31:31 UTC (rev 8595) @@ -1,5 +1,7 @@ 2010-07-15 Andreas Kirschbaum + * Include correct filename for errors in *.tl treasurelists. + * Skip special files when loading treasure lists. 2010-07-12 Andreas Kirschbaum Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-15 19:20:13 UTC (rev 8594) +++ trunk/daimonin/ChangeLog 2010-07-15 19:31:31 UTC (rev 8595) @@ -1,5 +1,7 @@ 2010-07-15 Andreas Kirschbaum + * Include correct filename for errors in *.tl treasurelists. + * Skip special files when loading treasure lists. * Fix crash when using --config command-line option. Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 19:20:13 UTC (rev 8594) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 19:31:31 UTC (rev 8595) @@ -130,14 +130,13 @@ break; } - final ErrorViewCollector errorViewCollector = new ErrorViewCollector(errorView, treasureLocation); final int tmpListSize = tmpList.size(); if (treasureLocation.isDirectory()) { - loadTreasureDir(errorViewCollector, treasureLocation, tmpList, needLink); + loadTreasureDir(errorView, treasureLocation, tmpList, needLink); } else if (treasureLocation.isFile()) { - loadTreasureList(errorViewCollector, treasureLocation, tmpList, needLink); + loadTreasureList(errorView, treasureLocation, tmpList, needLink); } else { - errorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "location is neither file nor directory"); + new ErrorViewCollector(errorView, treasureLocation).addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "location is neither file nor directory"); } if (log.isInfoEnabled()) { log.info("Loaded " + (tmpList.size() - tmpListSize) + " treasurelists from '" + treasureLocation + "'."); @@ -242,14 +241,15 @@ /** * Parses one treasurelist file. - * @param errorViewCollector the error view collector to use + * @param errorView the error view to use * @param file the file to read from * @param tmpList a collection to which all parsed treasure tree nodes are * added * @param needLink all sub-treasurelist nodes that need linking * @see #parseTreasures(ErrorView, Map, ConfigSource, GlobalSettings) */ - private static void loadTreasureList(@NotNull final ErrorViewCollector errorViewCollector, @NotNull final File file, final Collection<TreasureTreeNode> tmpList, final List<TreasureTreeNode> needLink) { + private static void loadTreasureList(@NotNull final ErrorView errorView, @NotNull final File file, final Collection<TreasureTreeNode> tmpList, final List<TreasureTreeNode> needLink) { + final ErrorViewCollector errorViewCollector = new ErrorViewCollector(errorView, file); try { final InputStream inputStream = new FileInputStream(file); try { @@ -297,14 +297,14 @@ /** * Recursively traverses a directory and parses all treasurelist files * (*.tl). - * @param errorViewCollector the error view collector to use + * @param errorView the error view to use * @param dir directory to read from * @param tmpList a collection to which all parsed treasure tree nodes are * added * @param needLink all sub-treasurelist nodes that need linking * @see #parseTreasures(ErrorView, Map, ConfigSource, GlobalSettings) */ - private static void loadTreasureDir(@NotNull final ErrorViewCollector errorViewCollector, @NotNull final File dir, @NotNull final List<TreasureTreeNode> tmpList, @NotNull final List<TreasureTreeNode> needLink) { + private static void loadTreasureDir(@NotNull final ErrorView errorView, @NotNull final File dir, @NotNull final List<TreasureTreeNode> tmpList, @NotNull final List<TreasureTreeNode> needLink) { final String[] traverse = dir.list(treasureListFilter); if (traverse == null) { return; @@ -314,9 +314,9 @@ for (final String entry : traverse) { final File file = new File(dir, entry); if (file.isFile()) { - loadTreasureList(errorViewCollector, file, tmpList, needLink); + loadTreasureList(errorView, file, tmpList, needLink); } else if (file.isDirectory()) { - loadTreasureDir(errorViewCollector, file, tmpList, needLink); + loadTreasureDir(errorView, file, tmpList, needLink); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 19:20:19
|
Revision: 8594 http://gridarta.svn.sourceforge.net/gridarta/?rev=8594&view=rev Author: akirschbaum Date: 2010-07-15 19:20:13 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Skip special files when loading treasure lists. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/crossfire/ChangeLog trunk/daimonin/ChangeLog trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-15 18:55:58 UTC (rev 8593) +++ trunk/atrinik/ChangeLog 2010-07-15 19:20:13 UTC (rev 8594) @@ -1,3 +1,7 @@ +2010-07-15 Andreas Kirschbaum + + * Skip special files when loading treasure lists. + 2010-07-12 Andreas Kirschbaum * Remove support for hiding archetypes in /intern path. Now all Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-15 18:55:58 UTC (rev 8593) +++ trunk/crossfire/ChangeLog 2010-07-15 19:20:13 UTC (rev 8594) @@ -1,3 +1,7 @@ +2010-07-15 Andreas Kirschbaum + + * Skip special files when loading treasure lists. + 2010-07-12 Andreas Kirschbaum * Remove support for hiding archetypes in /intern path. Now all Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-15 18:55:58 UTC (rev 8593) +++ trunk/daimonin/ChangeLog 2010-07-15 19:20:13 UTC (rev 8594) @@ -1,5 +1,7 @@ 2010-07-15 Andreas Kirschbaum + * Skip special files when loading treasure lists. + * Fix crash when using --config command-line option. 2010-07-12 Andreas Kirschbaum Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 18:55:58 UTC (rev 8593) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 19:20:13 UTC (rev 8594) @@ -134,8 +134,10 @@ final int tmpListSize = tmpList.size(); if (treasureLocation.isDirectory()) { loadTreasureDir(errorViewCollector, treasureLocation, tmpList, needLink); + } else if (treasureLocation.isFile()) { + loadTreasureList(errorViewCollector, treasureLocation, tmpList, needLink); } else { - loadTreasureList(errorViewCollector, treasureLocation, tmpList, needLink); + errorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "location is neither file nor directory"); } if (log.isInfoEnabled()) { log.info("Loaded " + (tmpList.size() - tmpListSize) + " treasurelists from '" + treasureLocation + "'."); @@ -311,9 +313,9 @@ Arrays.sort(traverse); for (final String entry : traverse) { final File file = new File(dir, entry); - if (entry.endsWith(".tl")) { + if (file.isFile()) { loadTreasureList(errorViewCollector, file, tmpList, needLink); - } else { + } else if (file.isDirectory()) { loadTreasureDir(errorViewCollector, file, tmpList, needLink); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 18:56:04
|
Revision: 8593 http://gridarta.svn.sourceforge.net/gridarta/?rev=8593&view=rev Author: akirschbaum Date: 2010-07-15 18:55:58 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Rewrite code. Modified Paths: -------------- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 18:51:54 UTC (rev 8592) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 18:55:58 UTC (rev 8593) @@ -84,7 +84,14 @@ @Override public boolean accept(@NotNull final File dir, @NotNull final String name) { final File fullPath = new File(dir, name); - return !name.startsWith(".") && (fullPath.isDirectory() || name.toLowerCase().endsWith(".tl")); + if (name.startsWith(".")) { + return false; + } + if (fullPath.isDirectory()) { + return true; + } + final String lowerCaseName = name.toLowerCase(); + return lowerCaseName.endsWith(".tl"); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 18:52:01
|
Revision: 8592 http://gridarta.svn.sourceforge.net/gridarta/?rev=8592&view=rev Author: akirschbaum Date: 2010-07-15 18:51:54 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Update comments. Modified Paths: -------------- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/package.html trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/package.html trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/package.html trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureListsParser.java trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java trunk/src/app/net/sf/gridarta/gui/map/package.html trunk/src/app/net/sf/gridarta/validation/checks/package.html trunk/src/app/overview.html Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/package.html =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/package.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/package.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -23,6 +23,6 @@ <p>Renders maps.</p> <p>Note: management of maps is in a different package: {@link - net.sf.gridarta.model.map.mapcontrol}.</p> + net.sf.gridarta.model.mapcontrol}.</p> </body> </html> Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/package.html =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/package.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/package.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -23,6 +23,6 @@ <p>Renders maps.</p> <p>Note: management of maps is in a different package: {@link - net.sf.gridarta.model.map.mapcontrol}.</p> + net.sf.gridarta.model.mapcontrol}.</p> </body> </html> Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/package.html =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/package.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/package.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -23,6 +23,6 @@ <p>Renders maps.</p> <p>Note: management of maps is in a different package: {@link - net.sf.gridarta.model.map.mapcontrol}.</p> + net.sf.gridarta.model.mapcontrol}.</p> </body> </html> Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureListsParser.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureListsParser.java 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureListsParser.java 2010-07-15 18:51:54 UTC (rev 8592) @@ -47,7 +47,7 @@ * @return the hash table */ @NotNull - public static Map<String, TreasureTreeNode> parseTreasureLists(final Document specialTreasureListsDocument) { + public static Map<String, TreasureTreeNode> parseTreasureLists(@NotNull final Document specialTreasureListsDocument) { final Map<String, TreasureTreeNode> specialTreasureLists = new HashMap<String, TreasureTreeNode>(); final Element rootElement = specialTreasureListsDocument.getDocumentElement(); Modified: trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/model/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-07-15 18:51:54 UTC (rev 8592) @@ -49,7 +49,8 @@ import org.jetbrains.annotations.Nullable; /** - * Loader for treasure list files. + * Loader for treasure list files. The same format is used for Atrinik, + * Crossfire, and Daimonin. * @author Andreas Kirschbaum */ public class TreasureLoader { @@ -66,11 +67,12 @@ */ @NotNull private static final Comparator<TreasureTreeNode> treasureNodeComparator = new Comparator<TreasureTreeNode>() { - /** {@inheritDoc} */ + @Override public int compare(@NotNull final TreasureTreeNode o1, @NotNull final TreasureTreeNode o2) { return String.CASE_INSENSITIVE_ORDER.compare(o1.getTreasureObj().getName(), o2.getTreasureObj().getName()); } + }; /** @@ -79,7 +81,6 @@ @NotNull private static final FilenameFilter treasureListFilter = new FilenameFilter() { - /** {@inheritDoc} */ @Override public boolean accept(@NotNull final File dir, @NotNull final String name) { final File fullPath = new File(dir, name); @@ -95,9 +96,9 @@ } /** - * Parse the treasure-data from the CF file "treasures.txt" into this JTree - * instance. This method must be called AFTER arch-loading is complete! + * Parses a treasure file into a {@link TreasureTree} instance. * @param errorView the error view to use + * @param specialTreasureLists maps treasure list name to parent node * @param configSource the config source to read from * @param globalSettings the global settings to use * @return the parsed treasure tree @@ -138,6 +139,14 @@ return createTreasureTree(tmpList, needLink, specialTreasureLists); } + /** + * Creates a {@link TreasureTree} instance from a list of {@link + * TreasureTreeNode TreasureTreeNodes}. + * @param tmpList the treasure tree nodes to add to the treasure tree + * @param needLink all treasure tree nodes within <code>tmpList</code> + * @param specialTreasureLists maps treasure list name to parent node + * @return the new treasure tree instance + */ @NotNull private static TreasureTree createTreasureTree(@NotNull final List<TreasureTreeNode> tmpList, @NotNull final Iterable<TreasureTreeNode> needLink, @NotNull final Map<String, TreasureTreeNode> specialTreasureLists) { final DefaultMutableTreeNode root = new DefaultMutableTreeNode("Treasurelists:"); @@ -149,12 +158,19 @@ return treasures; } + /** + * Adds a list of {@link TreasureTreeNode TreasureTreeNodes} to a root + * {@link DefaultMutableTreeNode}. The entries are added with the ordering + * specified by {@link #treasureNodeComparator}. + * @param tmpList the treasure tree nodes to add + * @param specialTreasureLists maps treasure list name to parent node + * @param root the root tree node to add to + */ private static void addTopLevelEntries(@NotNull final List<TreasureTreeNode> tmpList, @NotNull final Map<String, TreasureTreeNode> specialTreasureLists, @NotNull final DefaultMutableTreeNode root) { - // sort alphabetically and link sub-treasurelist entries Collections.sort(tmpList, treasureNodeComparator); - // Loop through all treasureone lists and calculate the real ratio - // of chances (Summed up to be 100%). Also attach lists to tree model. + // Calculate the real ratio of chances (summed up to be 100%). Also + // attach lists to tree model. for (final TreasureTreeNode realNode : tmpList) { realNode.recalculateChances(); @@ -168,6 +184,11 @@ } } + /** + * Links sub-treasure tree nodes to their parent nodes. + * @param needLink the sub-treasure tree nodes to link + * @param treasures the model to link into + */ private static void linkSubLists(@NotNull final Iterable<TreasureTreeNode> needLink, @NotNull final TreasureTree treasures) { final List<TreasureTreeNode> needSecondLink = new ArrayList<TreasureTreeNode>(); linkSubList2(needLink, treasures, false, needSecondLink); @@ -198,6 +219,12 @@ return treasures.get(node.getTreasureObj().getName()); } + /** + * Add the special treasure list parents to the root {@link + * DefaultMutableTreeNode}. + * @param specialTreasureLists maps treasure list name to parent node + * @param root the root default mutable tree node + */ private static void addSpecialEntries(@NotNull final Map<String, TreasureTreeNode> specialTreasureLists, @NotNull final DefaultMutableTreeNode root) { for (final MutableTreeNode folder : specialTreasureLists.values()) { root.add(folder); @@ -208,7 +235,8 @@ * Parses one treasurelist file. * @param errorViewCollector the error view collector to use * @param file the file to read from - * @param tmpList tmp. container for all treasurelists + * @param tmpList a collection to which all parsed treasure tree nodes are + * added * @param needLink all sub-treasurelist nodes that need linking * @see #parseTreasures(ErrorView, Map, ConfigSource, GlobalSettings) */ @@ -262,7 +290,8 @@ * (*.tl). * @param errorViewCollector the error view collector to use * @param dir directory to read from - * @param tmpList tmp. container for all treasurelists + * @param tmpList a collection to which all parsed treasure tree nodes are + * added * @param needLink all sub-treasurelist nodes that need linking * @see #parseTreasures(ErrorView, Map, ConfigSource, GlobalSettings) */ @@ -284,7 +313,7 @@ } /** - * Read and parse the text inside a treasurelist. + * Reads and parses the text inside a treasurelist definition. * @param errorViewCollector the error view collector to use * @param parentNode parent tree node * @param reader Reader to read from. Modified: trunk/src/app/net/sf/gridarta/gui/map/package.html =================================================================== --- trunk/src/app/net/sf/gridarta/gui/map/package.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/src/app/net/sf/gridarta/gui/map/package.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -20,7 +20,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <html> <body> -Base classes for rendering maps. A {@link net.sf.gridarta.model.map.grid.MapGrid +Base classes for rendering maps. A {@link net.sf.gridarta.model.mapgrid.MapGrid MapGrid} contains a 2D array of flags for highlighting tiles on a map. A {@link net.sf.gridarta.model.mapcursor.MapCursor MapCursor} is used to modify selection and cursor position flags on this MapGrid. Modified: trunk/src/app/net/sf/gridarta/validation/checks/package.html =================================================================== --- trunk/src/app/net/sf/gridarta/validation/checks/package.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/src/app/net/sf/gridarta/validation/checks/package.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -24,6 +24,7 @@ <h3>How to create your own checks</h3> <p>The easiest way to create your own checks is this:</p> + <ol> <li>Extend {@link net.sf.gridarta.validation.AbstractValidator AbstractValidator} by a class named like @@ -31,8 +32,7 @@ implements one of the {@link net.sf.gridarta.validation.Validator Validator} sub-interfaces </li> - <li>Extend {@link - net.sf.gridarta.model.map.validation.errors.ValidationError + <li>Extend {@link net.sf.gridarta.model.validation.errors.ValidationError ValidationError} or one of its subclasses by a class named like <code>net.sf.gridarta.map.validation.checks.MyError</code>. </li> </ol> @@ -50,13 +50,12 @@ <h3>FAQ</h3> <dl> <dt>Do I really have to always extend {@link - net.sf.gridarta.model.map.validation.errors.ValidationError - ValidationError} for my validator's errors? + net.sf.gridarta.model.validation.errors.ValidationError ValidationError} + for my validator's errors? </dt> <dd>Well not really. But the automatic localization of <code>ValidationError</code>s depends on separate error class names. - Also, {@link - net.sf.gridarta.model.map.validation.errors.CorrectableError + Also, {@link net.sf.gridarta.model.validation.errors.CorrectableError CorrectableError} depends on separate error classes. </dd> </dl> Modified: trunk/src/app/overview.html =================================================================== --- trunk/src/app/overview.html 2010-07-15 18:01:14 UTC (rev 8591) +++ trunk/src/app/overview.html 2010-07-15 18:51:54 UTC (rev 8592) @@ -128,7 +128,7 @@ items etc.. <p/> The Map itself is defined by a Map Arch Object. The class storing the - Map is {@link net.sf.gridarta.model.map.mapmodel.MapModel}. + Map is {@link net.sf.gridarta.model.mapmodel.MapModel}. </dd> <dt id="MapSquare">(Map )Square</dt> <dd> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-15 18:01:21
|
Revision: 8591 http://gridarta.svn.sourceforge.net/gridarta/?rev=8591&view=rev Author: akirschbaum Date: 2010-07-15 18:01:14 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Fix crash when using --config command-line option. [Daimonin only] Modified Paths: -------------- trunk/build.xml trunk/daimonin/ChangeLog Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-07-12 19:34:32 UTC (rev 8590) +++ trunk/build.xml 2010-07-15 18:01:14 UTC (rev 8591) @@ -174,6 +174,7 @@ <fileset dir="dest/daimonin/app"/> <fileset dir="dest/gridarta/app"/> <fileset dir="dest/model/app"/> + <fileset dir="dest/preferences/app"/> <fileset dir="dest/textedit/app"/> <fileset dir="dest/utils/app"/> <fileset dir="dest" includes="build.properties"/> Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-12 19:34:32 UTC (rev 8590) +++ trunk/daimonin/ChangeLog 2010-07-15 18:01:14 UTC (rev 8591) @@ -1,3 +1,7 @@ +2010-07-15 Andreas Kirschbaum + + * Fix crash when using --config command-line option. + 2010-07-12 Andreas Kirschbaum * Fix hiding of archetypes in /intern path when loading from arch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-12 19:34:38
|
Revision: 8590 http://gridarta.svn.sourceforge.net/gridarta/?rev=8590&view=rev Author: akirschbaum Date: 2010-07-12 19:34:32 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Remove support for hiding archetypes in /intern path. Now all archetypes are added to the archetype chooser. [Atrinik and Crossfire only] Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java trunk/crossfire/ChangeLog trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-12 19:28:59 UTC (rev 8589) +++ trunk/atrinik/ChangeLog 2010-07-12 19:34:32 UTC (rev 8590) @@ -1,7 +1,7 @@ 2010-07-12 Andreas Kirschbaum - * Fix hiding of archetypes in /intern path when loading from arch - directory. + * Remove support for hiding archetypes in /intern path. Now all + archetypes are added to the archetype chooser. 2010-07-03 Andreas Kirschbaum Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-07-12 19:34:32 UTC (rev 8590) @@ -169,7 +169,7 @@ */ @Override protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final Archetype archetype) { - return !isInternPath && !(editorFolder + "/").startsWith("/" + net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN + "/"); + return true; } /** Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-12 19:28:59 UTC (rev 8589) +++ trunk/crossfire/ChangeLog 2010-07-12 19:34:32 UTC (rev 8590) @@ -1,7 +1,7 @@ 2010-07-12 Andreas Kirschbaum - * Fix hiding of archetypes in /intern path when loading from arch - directory. + * Remove support for hiding archetypes in /intern path. Now all + archetypes are added to the archetype chooser. 2010-07-03 Andreas Kirschbaum Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-07-12 19:34:32 UTC (rev 8590) @@ -193,7 +193,7 @@ */ @Override protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final Archetype archetype) { - return !isInternPath && !(editorFolder + "/").startsWith("/" + net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN + "/") && !archetype.getArchetypeName().equals(START_ARCH_NAME); + return !archetype.getArchetypeName().equals(START_ARCH_NAME); } } // class ArchetypeParser This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-12 19:29:06
|
Revision: 8589 http://gridarta.svn.sourceforge.net/gridarta/?rev=8589&view=rev Author: akirschbaum Date: 2010-07-12 19:28:59 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Fix hiding of archetypes in /intern path when loading from arch directory. Modified Paths: -------------- trunk/atrinik/ChangeLog trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java trunk/crossfire/ChangeLog trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java trunk/daimonin/ChangeLog trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeParser.java trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java trunk/model/src/app/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeParser.java Modified: trunk/atrinik/ChangeLog =================================================================== --- trunk/atrinik/ChangeLog 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/atrinik/ChangeLog 2010-07-12 19:28:59 UTC (rev 8589) @@ -1,3 +1,8 @@ +2010-07-12 Andreas Kirschbaum + + * Fix hiding of archetypes in /intern path when loading from arch + directory. + 2010-07-03 Andreas Kirschbaum * Implement #1726046 (Window handling): autojoining now supports Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java =================================================================== --- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -168,8 +168,8 @@ * {@inheritDoc} */ @Override - protected boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final Archetype archetype) { - return !isInternPath && !(editorFolder != null && editorFolder.contains(net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN)); + protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final Archetype archetype) { + return !isInternPath && !(editorFolder + "/").startsWith("/" + net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN + "/"); } /** Modified: trunk/crossfire/ChangeLog =================================================================== --- trunk/crossfire/ChangeLog 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/crossfire/ChangeLog 2010-07-12 19:28:59 UTC (rev 8589) @@ -1,3 +1,8 @@ +2010-07-12 Andreas Kirschbaum + + * Fix hiding of archetypes in /intern path when loading from arch + directory. + 2010-07-03 Andreas Kirschbaum * Implement #1726046 (Window handling): autojoining now supports Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java =================================================================== --- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -192,8 +192,8 @@ * {@inheritDoc} */ @Override - protected boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final Archetype archetype) { - return !isInternPath && !(editorFolder != null && editorFolder.contains(net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN)) && !archetype.getArchetypeName().equals(START_ARCH_NAME); + protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final Archetype archetype) { + return !isInternPath && !(editorFolder + "/").startsWith("/" + net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN + "/") && !archetype.getArchetypeName().equals(START_ARCH_NAME); } } // class ArchetypeParser Modified: trunk/daimonin/ChangeLog =================================================================== --- trunk/daimonin/ChangeLog 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/daimonin/ChangeLog 2010-07-12 19:28:59 UTC (rev 8589) @@ -1,3 +1,8 @@ +2010-07-12 Andreas Kirschbaum + + * Fix hiding of archetypes in /intern path when loading from arch + directory. + 2010-07-03 Andreas Kirschbaum * Implement #1726046 (Window handling): autojoining now supports Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeParser.java =================================================================== --- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeParser.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -151,8 +151,8 @@ * {@inheritDoc} */ @Override - protected boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final Archetype archetype) { - return !isInternPath && !(editorFolder != null && editorFolder.contains(net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN)); + protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final Archetype archetype) { + return !isInternPath && !(editorFolder + "/").startsWith("/" + net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN + "/"); } /** Modified: trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -86,7 +86,7 @@ @Nullable final String path; if (!archetypeSet.isLoadedFromArchive() && archName == null) { final String tmpPath = archPath + "/"; - isInternPath = tmpPath.contains("/intern/"); + isInternPath = tmpPath.startsWith("/intern/"); path = tmpPath; } else { isInternPath = false; @@ -147,7 +147,7 @@ initParseArchetype(); - @Nullable String editorFolder = null; + @NotNull String editorFolder = archPath.isEmpty() ? "default" : archPath; while (true) { thisLine2 = in.readLine(); if (thisLine2 == null) { @@ -204,9 +204,6 @@ if (!archetypeSet.isLoadedFromArchive() || archName != null) { panel = panelName; folder = folderName; - } else if (editorFolder == null) { - panel = "default"; - folder = "default"; } else { final String[] names = editorFolder.split("/", 3); panel = names[0]; @@ -359,6 +356,6 @@ * @param archetype the archetype to add * @return whether the archetype should be added */ - protected abstract boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final R archetype); + protected abstract boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final R archetype); } // class AbstractArchetypeParser Modified: trunk/model/src/app/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/model/src/app/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -179,7 +179,7 @@ try { final BufferedReader in = new BufferedReader(isr); try { - archetypeParser.parseArchetypeFromStream(in, null, null, null, panelName, folderName, "", invObjects, new ErrorViewCollector(errorView, f)); + archetypeParser.parseArchetypeFromStream(in, null, null, null, panelName, folderName, path, invObjects, new ErrorViewCollector(errorView, f)); } finally { in.close(); } Modified: trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeParser.java =================================================================== --- trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeParser.java 2010-07-06 07:01:08 UTC (rev 8588) +++ trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeParser.java 2010-07-12 19:28:59 UTC (rev 8589) @@ -86,7 +86,7 @@ * {@inheritDoc} */ @Override - protected boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final TestArchetype archetype) { + protected boolean addToPanel(final boolean isInternPath, @NotNull final String editorFolder, @NotNull final TestArchetype archetype) { return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-06 07:01:15
|
Revision: 8588 http://gridarta.svn.sourceforge.net/gridarta/?rev=8588&view=rev Author: akirschbaum Date: 2010-07-06 07:01:08 +0000 (Tue, 06 Jul 2010) Log Message: ----------- Remove GameObjectMatchers.calculateEditType2(); clean up edit type calculation to store edit types only in head parts. Modified Paths: -------------- trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java trunk/model/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java trunk/model/src/app/net/sf/gridarta/model/mapmodel/SavedSquares.java trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-07-06 06:59:50 UTC (rev 8587) +++ trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-07-06 07:01:08 UTC (rev 8588) @@ -425,7 +425,7 @@ */ @Override public int getEditType() { - return editType; + return isHead() ? editType : getHead().getEditType(); } /** @@ -433,6 +433,7 @@ */ @Override public void setEditType(final int editType) { + assert isHead(); if (this.editType == editType) { return; } Modified: trunk/model/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-07-06 06:59:50 UTC (rev 8587) +++ trunk/model/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-07-06 07:01:08 UTC (rev 8588) @@ -204,7 +204,9 @@ final Collection<G> tailList = new ArrayList<G>(); for (final G gameObject : objects) { - gameObjectMatchers.updateEditType(gameObject, mapViewSettings.getEditType()); + if (gameObject.isHead()) { + gameObjectMatchers.updateEditType(gameObject, mapViewSettings.getEditType()); + } if (!gameObject.isInContainer()) { expandMulti(gameObject, tailList); Modified: trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java 2010-07-06 06:59:50 UTC (rev 8587) +++ trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java 2010-07-06 07:01:08 UTC (rev 8588) @@ -797,7 +797,9 @@ if (direction != null) { part.setAttributeString(BaseObject.DIRECTION, direction.toString()); } - if (!parts.isEmpty()) { + if (parts.isEmpty()) { + gameObjectMatchers.updateEditType(part, activeEditType); + } else { parts.get(0).addTailPart(part); } parts.add(part); @@ -806,7 +808,6 @@ for (final G part : parts) { final int mapX = pos.x + part.getArchetype().getMultiX(); final int mapY = pos.y + part.getArchetype().getMultiY(); - gameObjectMatchers.updateEditType(part, activeEditType); insertionMode.insert(part, mapGrid.getMapSquare(mapX, mapY)); } @@ -828,7 +829,9 @@ return; } - gameObjectMatchers.updateEditType(gameObject, activeEditType); + if (gameObject.isHead()) { + gameObjectMatchers.updateEditType(gameObject, activeEditType); + } insertionMode.insert(gameObject, mapGrid.getMapSquare(pos.x, pos.y)); } @@ -913,7 +916,7 @@ try { for (final Iterable<G> mapSquare : this) { for (final GameObject<G, A, R> gameObject : mapSquare) { - gameObjectMatchers.updateEditType(gameObject, editType); + gameObjectMatchers.updateEditType(gameObject.getHead(), editType); } } } finally { Modified: trunk/model/src/app/net/sf/gridarta/model/mapmodel/SavedSquares.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/mapmodel/SavedSquares.java 2010-07-06 06:59:50 UTC (rev 8587) +++ trunk/model/src/app/net/sf/gridarta/model/mapmodel/SavedSquares.java 2010-07-06 07:01:08 UTC (rev 8588) @@ -197,7 +197,7 @@ objectsToDelete.clear(); for (final G gameObject : square) { mapSquare.addLast(gameObject); - gameObjectMatchers.calculateEditType2(gameObject, activeEditType); + gameObjectMatchers.updateEditType(gameObject.getHead(), activeEditType); } } point.y++; @@ -214,7 +214,6 @@ for (final Iterable<G> square : col) { if (square != null) { for (final GameObject<G, A, R> gameObject : square) { - final int editType = gameObject.getEditType(); final int mapX = gameObject.getMapX(); final int mapY = gameObject.getMapY(); for (G tailGameObject = gameObject.getMultiNext(); tailGameObject != null; tailGameObject = tailGameObject.getMultiNext()) { @@ -222,7 +221,6 @@ point2.y = mapY + tailGameObject.getArchetype().getMultiY(); final GameObjectContainer<G, A, R> mapSquare = mapModel.getMapSquare(point2); mapSquare.addLast(tailGameObject); - tailGameObject.setEditType(editType); } } } Modified: trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-07-06 06:59:50 UTC (rev 8587) +++ trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-07-06 07:01:08 UTC (rev 8588) @@ -123,24 +123,22 @@ } /** - * Get the EditType of an GameObject (e.g. floor, monster, etc). These are - * determined by the various attributes of the GameObject - * (->objectText). + * Updates the edit type of a {@link GameObject}. These are determined by + * various attributes of the game object. * @param gameObject the game object * @param checkType bitmask containing the edit type(s) to be calculated - * @return new editType for this GameObject */ - public int calculateEditType2(@NotNull final GameObject<?, ?, ?> gameObject, final int checkType) { + public void updateEditType(@NotNull final GameObject<?, ?, ?> gameObject, final int checkType) { + assert gameObject.isHead(); final int editType = gameObject.getEditType(); if (checkType == 0) { - return editType; + return; } // all flags from 'checkType' must be unset in this arch because they get recalculated now final int retainedEditType = editType == GUIConstants.EDIT_TYPE_NONE ? 0 : editType & ~checkType; final int newEditType = retainedEditType | calculateEditType(gameObject, checkType); gameObject.setEditType(newEditType); - return newEditType; } /** @@ -160,17 +158,4 @@ return editType; } - /** - * Update the cached edit types. - * @param gameObject the game object to update - * @param checkType the edit types to update - */ - public void updateEditType(@NotNull final GameObject<?, ?, ?> gameObject, final int checkType) { - final GameObject<?, ?, ?> head = gameObject.getHead(); - final int headEditType = calculateEditType2(head, checkType); - if (head != gameObject) { - gameObject.setEditType(headEditType); - } - } - } // class GameObjectMatchers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-06 06:59:56
|
Revision: 8587 http://gridarta.svn.sourceforge.net/gridarta/?rev=8587&view=rev Author: akirschbaum Date: 2010-07-06 06:59:50 +0000 (Tue, 06 Jul 2010) Log Message: ----------- Add assert statement. Modified Paths: -------------- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModel.java Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModel.java =================================================================== --- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModel.java 2010-07-05 22:13:05 UTC (rev 8586) +++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModel.java 2010-07-06 06:59:50 UTC (rev 8587) @@ -54,6 +54,7 @@ return; } + assert selectedGameObject == null || selectedGameObject.isHead(); this.selectedGameObject = selectedGameObject; for (final GameObjectAttributesModelListener<G, A, R> listener : listeners) { listener.selectedGameObjectChanged(selectedGameObject); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aki...@us...> - 2010-07-05 23:10:46
|
Revision: 8585 http://gridarta.svn.sourceforge.net/gridarta/?rev=8585&view=rev Author: akirschbaum Date: 2010-07-05 22:05:37 +0000 (Mon, 05 Jul 2010) Log Message: ----------- Simplify code. Modified Paths: -------------- trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java Modified: trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-07-05 22:02:08 UTC (rev 8584) +++ trunk/model/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-07-05 22:05:37 UTC (rev 8585) @@ -136,15 +136,9 @@ return editType; } - int newEditType; - if (editType != GUIConstants.EDIT_TYPE_NONE && editType != 0) { - // all flags from 'checkType' must be unset in this arch because they get recalculated now - newEditType = editType & ~checkType; - } else { - newEditType = 0; - } - - newEditType |= calculateEditType(gameObject, checkType); + // all flags from 'checkType' must be unset in this arch because they get recalculated now + final int retainedEditType = editType == GUIConstants.EDIT_TYPE_NONE ? 0 : editType & ~checkType; + final int newEditType = retainedEditType | calculateEditType(gameObject, checkType); gameObject.setEditType(newEditType); return newEditType; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |