May 2008 Commit Log

Number of Commits:

142

Number of Active Developers:

1

akirschbaum 2008-05-31 15:48 #142 Rev.: 4067

Fix typos.

126 lines of code changed in 44 files:

• AUTHORS (+2 -2), README (+1 -1)
• crossfire: ChangeLog (+1 -1), Developer_README.txt (+4 -4), INSTALL.txt (+3 -3), build.xml (+1 -1)
• crossfire/resource/HelpFiles: guide.html (+1 -1), map_quests.html (+1 -1), map_start.html (+3 -3), treasure_multi.html (+3 -3), treasure_special.html (+2 -2), tut_copypaste.html (+4 -4), tut_loading.html (+2 -2), tut_mapattr.html (+1 -1), tut_pickmaps.html (+1 -1)
• crossfire/resource/conf: types.xml (+8 -8)
• crossfire/src/cfeditor: messages.properties (+2 -2)
• daimonin: ChangeLog (+1 -1), INSTALL.txt (+6 -6), KNOWN_BUGS.txt (+1 -1), build.xml (+1 -1)
• daimonin/resource/HelpFiles: faq.html (+3 -3), guide.html (+1 -1), treasure_multi.html (+4 -4), treasure_special.html (+2 -2), tut_DScript.html (+9 -9), tut_copypaste.html (+5 -5), tut_loading.html (+2 -2), tut_mapattr.html (+5 -5), tut_objects.html (+2 -2)
• daimonin/src/daieditor: messages.properties (+1 -1), overview.html (+5 -5)
• resource/system/dtd: spells.dtd (+1 -1)
• src/app/net/sf/gridarta: messages.properties (+1 -1)
• src/doc: history.xhtml (+3 -3), subversion.xhtml (+1 -1)
• src/doc/dev: codeStyle.xhtml (+18 -18), howToHelp.xhtml (+2 -2), todo.xhtml (+2 -2), transactions.xhtml (+1 -1), typeParameters.xhtml (+1 -1)
• src/doc/hist: MergingEditors.xhtml (+1 -1)
• src/doc/news: 2006-05-27_1.xhtml (+6 -6)
• src/screenshots: README (+1 -1)

akirschbaum 2008-05-29 16:45 #141 Rev.: 4066

Implement Map|Shrink Map Size: remove empty tiles from a map's border.

630 lines of code changed in 23 files:

• crossfire: ChangeLog (+5)
• crossfire/src/cfeditor: MapActions.java (+29), action.properties (+2 -2), messages.properties (+3), messages_de.properties (+3), messages_fr.properties (+3), messages_sv.properties (+3)
• daimonin: ChangeLog (+5)
• daimonin/src/daieditor: MapActions.java (+29), action.properties (+2 -2), messages.properties (+3), messages_de.properties (+3), messages_fr.properties (+3), messages_sv.properties (+3)
• src/app/net/sf/gridarta: messages.properties (+13), messages_de.properties (+13), messages_fr.properties (+13), messages_sv.properties (+13)
• src/app/net/sf/gridarta/gui/map: ShrinkMapSizeDialog.java (new 231), ShrinkMapSizeDialogManager.java (new 124)
• src/app/net/sf/gridarta/map: DefaultMapModel.java (+15), MapModel.java (+10), ShrinkMapSizeUtils.java (new 102)

akirschbaum 2008-05-29 16:31 #140 Rev.: 4065

Make field final.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gui/newmap: NewMapDialog.java (+1 -1)

akirschbaum 2008-05-29 16:27 #139 Rev.: 4064

Make constructor of abstract class protected.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gui/newmap: AbstractMapsizeNewMapDialog.java (+1 -1)

akirschbaum 2008-05-28 15:13 #138 Rev.: 4063

Enable "Enter Exit" for non-head parts of multi-part exits.

20 lines of code changed in 6 files:

• crossfire: ChangeLog (+4)
• crossfire/src/cfeditor: MapActions.java (+2 -2)
• daimonin: ChangeLog (+4)
• daimonin/src/daieditor: MapActions.java (+1 -1)
• src/app/net/sf/gridarta/map: DefaultMapModel.java (+6 -5), MapModel.java (+3 -3)

akirschbaum 2008-05-25 15:18 #137 Rev.: 4062

Fix commented code.

1 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: GameObject.java (+1 -1)

akirschbaum 2008-05-23 10:47 #136 Rev.: 4061

Remove unneeded type arguments.

9 lines of code changed in 3 files:

• src/app/net/sf/gridarta/gui/archetypechooser: ArchetypeNameCellRenderer.java (+4 -6), ArchetypePanel.java (+1 -1), DisplayNameCellRenderer.java (+4 -6)

akirschbaum 2008-05-22 09:26 #135 Rev.: 4060

Remove MainView.setStatusText().

17 lines of code changed in 8 files:

• crossfire/src/cfeditor: CMainControl.java (+5 -5)
• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (+5 -5)
• daimonin/src/daieditor/gui/map: DefaultLevelRenderer.java (+1 -1)
• src/app/net/sf/gridarta: DefaultMapManager.java (+1 -1), MapImageCache.java (+1 -1)
• src/app/net/sf/gridarta/gui: MainView.java (-8)
• src/app/net/sf/gridarta/map: DefaultMapControl.java (+3 -3)

akirschbaum 2008-05-22 09:15 #134 Rev.: 4059

Make method static.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: AutoValidator.java (+1 -1)

akirschbaum 2008-05-22 09:15 #133 Rev.: 4058

Make field private.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: AutoValidator.java (+1 -1)

akirschbaum 2008-05-22 09:13 #132 Rev.: 4057

Remove Unused code.

0 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: AutoValidator.java (-6)

akirschbaum 2008-05-22 09:05 #131 Rev.: 4056

Remove import statements.

0 lines of code changed in 1 file:

• daimonin/src/daieditor/gui/map: CMapViewBasic.java (-2)

akirschbaum 2008-05-22 09:03 #130 Rev.: 4055

Merge duplicated code

28 lines of code changed in 2 files:

• crossfire/src/cfeditor/gui/map: DefaultLevelRenderer.java (+15 -8)
• daimonin/src/daieditor/gui/map: DefaultLevelRenderer.java (+13 -9)

akirschbaum 2008-05-22 08:55 #129 Rev.: 4054

Move CMapViewBasic.refreshDataFromModel() to DefaultLevelRenderer.resizeFromModel().

16 lines of code changed in 2 files:

• daimonin/src/daieditor/gui/map: CMapViewBasic.java (-18), DefaultLevelRenderer.java (+16)

akirschbaum 2008-05-22 08:53 #128 Rev.: 4053

Add Size2D.toString().

5 lines of code changed in 1 file:

• src/app/net/sf/gridarta: Size2D.java (+5)

akirschbaum 2008-05-22 08:32 #127 Rev.: 4052

Do not cut off left and right sides of pickmaps.

11 lines of code changed in 5 files:

• daimonin: ChangeLog (+4)
• daimonin/src/daieditor/gui/map: CMapViewBasic.java (+4 -13), DefaultLevelRenderer.java (+3 -1), MapRenderer.java (-5), PickmapRenderer.java (-5)

akirschbaum 2008-05-22 07:31 #126 Rev.: 4051

Move ArchetypeParser.postParseGameObject() to GameObject.postParseGameObject().

131 lines of code changed in 13 files:

• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (-47), GameObject.java (+47)
• crossfire/src/cfeditor/gameobject/scripts: ScriptedEvent.java (+1 -1)
• crossfire/src/cfeditor/gui: GameObjectAttributesDialog.java (+1 -1)
• daimonin/src/daieditor/gameobject: ArchetypeParser.java (-53), GameObject.java (+53)
• daimonin/src/daieditor/gameobject/scripts: ScriptedEvent.java (+1 -1)
• src/app/net/sf/gridarta/gameobject: AbstractArchetypeParser.java (+1 -1), ArchetypeParser.java (-22), GameObject.java (+22 -1)
• src/app/net/sf/gridarta/gui: GameObjectAttributesPanel.java (+1 -1)
• src/app/net/sf/gridarta/io: AbstractGameObjectParser.java (+1 -1)
• src/app/net/sf/gridarta/map: DefaultMapModel.java (+3 -3)

akirschbaum 2008-05-22 05:00 #125 Rev.: 4050

Make sure all lines in GameObject.objectText have a trailing newline character.

5 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (-9)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (-9)
• daimonin/src/daieditor/io: GameObjectParser.java (+1 -1)
• src/app/net/sf/gridarta/gameobject: GameObject.java (+4 -1)

akirschbaum 2008-05-22 04:39 #124 Rev.: 4049

Add more functions to StringUtils.

120 lines of code changed in 2 files:

• src/app/net/sf/gridarta/utils: StringUtils.java (+27 -2)
• src/test/net/sf/gridarta/utils: StringUtilsTest.java (new 93)

akirschbaum 2008-05-22 04:07 #123 Rev.: 4048

Fix package name.

54 lines of code changed in 3 files:

• crossfire/src/cfeditor/gameobject: GameObject.java (+1 -1)
• src/app/net/sf/gridarta/gameobject: GameObject.java (+1 -1)
• src/app/net/sf/gridarta/utils: StringUtils.java (new 52)

akirschbaum 2008-05-22 03:02 #122 Rev.: 4047

Move code to StringUtils.

56 lines of code changed in 3 files:

• crossfire/src/cfeditor/gameobject: GameObject.java (+2 -1)
• src/app/net/sf/gridarta/gameobject: GameObject.java (+2 -6)
• src/app/net/sf/gridarta/utils/utils: StringUtils.java (new 52)

akirschbaum 2008-05-22 02:48 #121 Rev.: 4046

Fix crash while collecting archetypes. From now on the collected files are slighly smaller than the files produced by Crossfire's collect script.

31 lines of code changed in 4 files:

• crossfire: ChangeLog (+6)
• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+10 -6)
• crossfire/src/cfeditor/gameobject/face: FaceObject.java (+8 -4), FaceObjects.java (+7 -42)

akirschbaum 2008-05-22 01:50 #120 Rev.: 4045

Update comment.

3 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gameobject/face: AbstractFaceObject.java (+3 -2)

akirschbaum 2008-05-21 14:32 #119 Rev.: 4044

Remove CMainView.

405 lines of code changed in 6 files:

• gridarta.ipr (+387 -1355)
• crossfire/src/cfeditor: CMainControl.java (+4 -5)
• crossfire/src/cfeditor/gui/prefs: GUIPrefs.java (+4 -5)
• daimonin/src/daieditor: CMainControl.java (+4 -5)
• daimonin/src/daieditor/gui/prefs: GUIPrefs.java (+4 -5)
• src/app/net/sf/gridarta/gui: MainView.java (+2 -2)

akirschbaum 2008-05-21 13:42 #118 Rev.: 4043

Move code to common code base.

14 lines of code changed in 5 files:

• crossfire/src/cfeditor: CMainControl.java (+4 -1)
• crossfire/src/cfeditor/gui: CMainView.java (-8)
• daimonin/src/daieditor: CMainControl.java (+4 -1)
• daimonin/src/daieditor/gui: CMainView.java (-8)
• src/app/net/sf/gridarta/gui: MainView.java (+6 -14)

akirschbaum 2008-05-21 13:07 #117 Rev.: 4042

Move most of CMainView to common code base.

766 lines of code changed in 8 files:

• gridarta.ipr (+302)
• crossfire/resource/conf: crossfire.0 (changed)
• crossfire/src/cfeditor/gui: CMainView.java (+3 -443), ObjectChooser.java (+1)
• daimonin/src/daieditor/gui: CMainView.java (+3 -443), ObjectChooser.java (+1)
• src/app/net/sf/gridarta/gui: AbstractObjectChooser.java (+2), MainView.java (+454 -27)

akirschbaum 2008-05-21 12:16 #116 Rev.: 4041

Move code to common code base.

16 lines of code changed in 6 files:

• crossfire/src/cfeditor: CMainControl.java (-9)
• crossfire/src/cfeditor/gui: CMainView.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (-9)
• daimonin/src/daieditor/gui: CMainView.java (+1 -1)
• src/app/net/sf/gridarta: AbstractMainControl.java (+10)
• src/app/net/sf/gridarta/gui: MainView.java (+4 -2)

akirschbaum 2008-05-17 12:33 #115

Unify code.

8 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+4 -3)

akirschbaum 2008-05-17 12:29 #114 Rev.: 4038

Unify comment.

5 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+3 -3)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+2 -2)

akirschbaum 2008-05-17 12:26 #113 Rev.: 4037

Unify code.

1 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+1 -2)

akirschbaum 2008-05-17 12:23 #112 Rev.: 4036

Add/fix @Nullable annotations.

4 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+2 -1)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+2 -1)

akirschbaum 2008-05-17 12:21 #111 Rev.: 4035

Unify code.

11 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+11 -11)

akirschbaum 2008-05-17 12:14 #110

Unify code.

9 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+2 -1)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+1 -1)

akirschbaum 2008-05-17 12:02 #109 Rev.: 4030

Extract code into function.

18 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+18 -12)

akirschbaum 2008-05-17 11:59 #108 Rev.: 4029

Rename variable name.

7 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+7 -7)

akirschbaum 2008-05-17 11:56 #107 Rev.: 4028

ArchetypeSet.loadAllCrossfirePNGFromCollect() to FaceObjects.loadFacesCollection()

148 lines of code changed in 6 files:

• crossfire/src/cfeditor: messages.properties (+3), messages_de.properties (+3), messages_fr.properties (+3), messages_sv.properties (+3)
• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+3 -126)
• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+133)

akirschbaum 2008-05-17 11:53 #106 Rev.: 4027

Add German translation.

2 lines of code changed in 1 file:

• daimonin/src/daieditor: messages_de.properties (+2 -2)

akirschbaum 2008-05-17 11:42 #105 Rev.: 4026

Unify code.

8 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+8 -4)

akirschbaum 2008-05-17 11:36 #104 Rev.: 4025

Simplify expression.

1 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+1 -1)

akirschbaum 2008-05-17 06:05 #103 Rev.: 4024

Remove dependency FaceObjects->MainControl.

8 lines of code changed in 2 files:

• daimonin/src/daieditor: CMainControl.java (+1 -1)
• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+7 -7)

akirschbaum 2008-05-17 06:00 #102 Rev.: 4023

Make fields private.

5 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+5 -5)

akirschbaum 2008-05-17 05:55 #101 Rev.: 4022

Move FilterFaceProvider to common code base.

92 lines of code changed in 2 files:

• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+1)
• src/app/net/sf/gridarta/gameobject/face: FilterFaceProvider.java (new 91)

akirschbaum 2008-05-17 05:54 #100 Rev.: 4021

Move DaimoninFaceProvider to common code base; rename it to CollectedFaceProvider.

95 lines of code changed in 2 files:

• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+3 -2)
• src/app/net/sf/gridarta/gameobject/face: CollectedFaceProvider.java (new 92)

akirschbaum 2008-05-17 05:51 #99 Rev.: 4020

Move ArchFaceProvider to common code base.

78 lines of code changed in 3 files:

• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+1 -1)
• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+1)
• src/app/net/sf/gridarta/gameobject/face: ArchFaceProvider.java (new 76)

akirschbaum 2008-05-17 05:48 #98 Rev.: 4019

Move AbstractFaceProvider to common code base.

75 lines of code changed in 4 files:

• daimonin/src/daieditor/gameobject/face: ArchFaceProvider.java (+1), DaimoninFaceProvider.java (+1), FilterFaceProvider.java (+1)
• src/app/net/sf/gridarta/gameobject/face: AbstractFaceProvider.java (new 72)

akirschbaum 2008-05-17 05:46 #97 Rev.: 4018

Move FaceProvider to common code base.

51 lines of code changed in 4 files:

• daimonin/src/daieditor/gameobject/face: AbstractFaceProvider.java (+1), FaceObjects.java (+1), FilterFaceProvider.java (+1)
• src/app/net/sf/gridarta/gameobject/face: FaceProvider.java (new 48)

akirschbaum 2008-05-17 05:40 #96 Rev.: 4017

Unify code.

5 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+4 -8)
• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+1 -2)

akirschbaum 2008-05-17 05:32 #95 Rev.: 4016

Unify code.

2 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+2 -2)

akirschbaum 2008-05-17 05:23 #94 Rev.: 4015

Add @NotNull annotations.

4 lines of code changed in 1 file:

• src/app/net/sf/gridarta: GlobalSettingsImpl.java (+4 -3)

akirschbaum 2008-05-17 05:18 #93 Rev.: 4014

Add @Nullable/@NotNull annotations; fix possible NullPointerExceptions.

34 lines of code changed in 6 files:

• daimonin/src/daieditor/gameobject/face: AbstractFaceProvider.java (+7 -3), ArchFaceProvider.java (+4 -3), DaimoninFaceProvider.java (+4 -3), FaceObjects.java (+1 -1), FaceProvider.java (+3 -1), FilterFaceProvider.java (+15 -7)

akirschbaum 2008-05-17 04:52 #92 Rev.: 4013

Remove PickmapChooserControl.addNewPickmap().

18 lines of code changed in 2 files:

• src/app/net/sf/gridarta/gui/newmap: NewPickmapDialog.java (+16 -4)
• src/app/net/sf/gridarta/gui/pickmapchooser: PickmapChooserControl.java (+2 -27)

akirschbaum 2008-05-17 04:12 #91 Rev.: 4012

Move AutojoinList.connectArch() to GameObject.

22 lines of code changed in 2 files:

• src/app/net/sf/gridarta: AutojoinList.java (+2 -20)
• src/app/net/sf/gridarta/gameobject: GameObject.java (+20)

akirschbaum 2008-05-17 03:50 #90 Rev.: 4011

Do not advertise internal archetypes through the archetype finder.

26 lines of code changed in 6 files:

• crossfire/src/cfeditor/gui: CMainView.java (+1 -1)
• daimonin: ChangeLog (+5)
• daimonin/src/daieditor/gui: CMainView.java (+1 -1)
• src/app/net/sf/gridarta/gui: ArchetypesActions.java (+2 -6)
• src/app/net/sf/gridarta/gui/archetypechooser: ArchetypeChooserControl.java (+10 -1)
• src/app/net/sf/gridarta/gui/findarchetypes: FindArchetypesDialog.java (+7 -6)

akirschbaum 2008-05-17 03:23 #89 Rev.: 4010

Simplify code.

2 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gui/findarchetypes: FindArchetypesDialog.java (+2 -2)

akirschbaum 2008-05-17 03:11 #88 Rev.: 4009

Do not show archetypes from "intern" folders in archetype chooser.

10 lines of code changed in 2 files:

• crossfire: ChangeLog (+5)
• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (+5 -2)

akirschbaum 2008-05-17 03:03 #87 Rev.: 4008

Fix possible NullPointerException.

7 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (+7 -1)

akirschbaum 2008-05-17 02:55 #86 Rev.: 4007

Fix possible NullPointerException.

2 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject: ArchetypeParser.java (+2 -2)

akirschbaum 2008-05-17 02:45 #85 Rev.: 4006

Move ArchetypeParser.postParseArchetype() to Archetype.

51 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (+1 -1)
• daimonin/src/daieditor/gameobject: ArchetypeParser.java (+1 -1)
• src/app/net/sf/gridarta/gameobject: AbstractArchetypeParser.java (-38), Archetype.java (+6), ArchetypeParser.java (-7), GameObject.java (+43)

akirschbaum 2008-05-16 18:42 #84 Rev.: 4005

Move MapControl.insertSelectedObject() to ObjectChooser.

796 lines of code changed in 9 files:

• gridarta.iml (+1), gridarta.ipr (+722 -5)
• crossfire: crossfire.iml (+17 -17)
• crossfire/src/cfeditor/gui/map: MapUserListener.java (+2 -2)
• daimonin/src/daieditor/gui/map/tools: InsertionTool.java (+2 -2)
• src/app/net/sf/gridarta/gui: AbstractObjectChooser.java (+26), ObjectChooser.java (+17)
• src/app/net/sf/gridarta/map: DefaultMapControl.java (+2 -29), MapControl.java (+7 -13)

akirschbaum 2008-05-16 18:27 #83 Rev.: 4004

Remove access to mainControl from DefaultMapControl.

15 lines of code changed in 3 files:

• crossfire/src/cfeditor: CrossfireObjectsFactory.java (+2 -2)
• daimonin/src/daieditor: DaimoninObjectsFactory.java (+2 -2)
• src/app/net/sf/gridarta/map: DefaultMapControl.java (+11 -3)

akirschbaum 2008-05-16 18:20 #82 Rev.: 4003

Remove redundant parameter.

10 lines of code changed in 5 files:

• crossfire/src/cfeditor/gui/map: MapUserListener.java (+2 -2)
• daimonin/src/daieditor/gui/map/tools: DeletionTool.java (+1 -1)
• src/app/net/sf/gridarta/gui/selectedsquare: SelectedSquareControl.java (+1 -1)
• src/app/net/sf/gridarta/map: DefaultMapModel.java (+4 -4), MapModel.java (+2 -5)

akirschbaum 2008-05-16 18:03 #81 Rev.: 4002

Simplify/accelerate code.

3 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: DefaultMapModel.java (+3 -3)

akirschbaum 2008-05-16 17:57 #80 Rev.: 4001

Remove access to mainControl from DefaultMapModel.

19 lines of code changed in 3 files:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+15 -6), DefaultMapModel.java (+2 -16), MapModel.java (+2 -10)

akirschbaum 2008-05-16 17:50 #79 Rev.: 4000

Extract code into function.

37 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: DefaultMapModel.java (+37 -31)

akirschbaum 2008-05-16 17:43 #78 Rev.: 3999

Add @Nullable annotation.

2 lines of code changed in 2 files:

• src/app/net/sf/gridarta/map: DefaultMapModel.java (+1 -1), MapModel.java (+1 -1)

akirschbaum 2008-05-16 17:42 #77 Rev.: 3998

Remove access to mainControl from DefaultMapModel.

8 lines of code changed in 3 files:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+5 -1), DefaultMapModel.java (+1 -6), MapModel.java (+2 -1)

akirschbaum 2008-05-16 17:36 #76

Simplify code.

40 lines of code changed in 2 files:

• src/app/net/sf/gridarta/map: DefaultMapModel.java (+26 -30)

akirschbaum 2008-05-16 17:34 #75 Rev.: 3995

Remove access to mainControl from DefaultMapModel.

20 lines of code changed in 3 files:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+4 -1), DefaultMapModel.java (+14 -18), MapModel.java (+2 -1)

akirschbaum 2008-05-16 17:27 #74 Rev.: 3994

Remove redundant final modifiers.

15 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: DefaultMapModel.java (+15 -15)

akirschbaum 2008-05-16 17:24 #73 Rev.: 3993

Remove redundant parameter.

3 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+3 -4)

akirschbaum 2008-05-16 17:22 #72 Rev.: 3992

Update comments.

31 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+31 -23)

akirschbaum 2008-05-16 17:16 #71 Rev.: 3991

Move MapControl.insertSelArchToMap() to MapModel.

64 lines of code changed in 3 files:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+1 -61), DefaultMapModel.java (+54), MapModel.java (+9)

akirschbaum 2008-05-16 17:12 #70 Rev.: 3990

Move parts of MapControl.insertMapArchToPickmap() to MapModel.

35 lines of code changed in 3 files:

• src/app/net/sf/gridarta/map: DefaultMapControl.java (+2 -21), DefaultMapModel.java (+26), MapModel.java (+7)

akirschbaum 2008-05-16 17:07 #69 Rev.: 3989

Move MapControl.addCopyToMap() to MapModel.

39 lines of code changed in 6 files:

• src/app/net/sf/gridarta: CopyBuffer.java (+3 -3)
• src/app/net/sf/gridarta/floodfill: Floodfill.java (+1 -1)
• src/app/net/sf/gridarta/map: DefaultMapControl.java (+1 -22), DefaultMapModel.java (+21), MapControl.java (-13), MapModel.java (+13)

akirschbaum 2008-05-16 16:55 #68 Rev.: 3988

Rename AbstractMapControl into DefaultMapControl since it is not abstract anymore.

589 lines of code changed in 3 files:

• crossfire/src/cfeditor: CrossfireObjectsFactory.java (+3 -3)
• daimonin/src/daieditor: DaimoninObjectsFactory.java (+3 -3)
• src/app/net/sf/gridarta/map: DefaultMapControl.java (new 583)

akirschbaum 2008-05-16 16:53 #67 Rev.: 3987

Rename variable name.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gui/newmap: NewPickmapFolderDialog.java (+1 -1)

akirschbaum 2008-05-16 16:44 #66 Rev.: 3986

Move MapControl to common code base; remove type parameter C.

1047 lines of code changed in 124 files:

• crossfire/src/cfeditor: CFJavaEditor.java (+1 -2), CFilterControl.java (+7 -4), CMainControl.java (+23 -23), CrossfireObjectsFactory.java (+9 -8), MapActions.java (+24 -24)
• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (+3 -4), GameObject.java (+2 -2)
• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+2 -2)
• crossfire/src/cfeditor/gui: CMainView.java (+25 -25), GameObjectAttributesDialog.java (+3 -4), GameObjectAttributesPanel.java (+2 -3), ObjectChooser.java (+10 -11)
• crossfire/src/cfeditor/gui/map: CMapViewBasic.java (+3 -3), DefaultLevelRenderer.java (+2 -2), MapPropertiesDialog.java (+6 -4), MapRenderer.java (+4 -2), MapTilePane.java (+4 -2), MapUserListener.java (+6 -6), PickmapRenderer.java (+4 -2)
• crossfire/src/cfeditor/gui/script/parameter: MapParameterView.java (+7 -3)
• crossfire/src/cfeditor/script/parameter: MapParameter.java (+7 -3)
• daimonin/src/daieditor: CMainControl.java (+27 -27), DaimoninEditor.java (+1 -2), DaimoninObjectsFactory.java (+9 -8), MapActions.java (+21 -21)
• daimonin/src/daieditor/gameobject: ArchetypeParser.java (+3 -4), GameObject.java (+2 -2)
• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+2 -2)
• daimonin/src/daieditor/gui: CMainView.java (+25 -25), GameObjectAttributesDialog.java (+3 -4), GameObjectAttributesPanel.java (+2 -3), ObjectChooser.java (+10 -11)
• daimonin/src/daieditor/gui/map: CMapViewBasic.java (+3 -3), DefaultLevelRenderer.java (+2 -2), MapPropertiesDialog.java (+6 -4), MapRenderer.java (+2 -2), MapTilePane.java (+4 -2), MapUserListener.java (+6 -3), PickmapRenderer.java (+4 -2)
• daimonin/src/daieditor/gui/map/event: MouseOpEvent.java (+7 -3)
• daimonin/src/daieditor/gui/map/tools: DeletionTool.java (+7 -6), InsertionTool.java (+6 -3), SelectionTool.java (+7 -4)
• src/app/net/sf/gridarta: AbstractMainControl.java (+13 -13), CopyBuffer.java (+14 -14), CurrentMapListener.java (+20 -20), DefaultMapManager.java (+43 -43), GridartaObjectsFactory.java (+4 -4), MainControl.java (+13 -13), MapImageCache.java (+10 -10), MapManager.java (+18 -18), MapManagerListener.java (+7 -7)
• src/app/net/sf/gridarta/floodfill: Floodfill.java (+2 -2)
• src/app/net/sf/gridarta/gameobject: AbstractArchetypeSet.java (+2 -2), GameObject.java (+2 -2)
• src/app/net/sf/gridarta/gui: AbstractGameObjectAttributesDialog.java (+2 -2), AbstractObjectChooser.java (+1 -2), ArchetypesActions.java (+2 -3), ErrorListView.java (+12 -12), GameObjectAttributesPanel.java (+17 -17), MainActions.java (+40 -40), MainView.java (+16 -17), MapManagerActions.java (+4 -4), ObjectChoiceDisplay.java (+3 -4), ObjectChooser.java (+3 -4), ReplaceDialog.java (+8 -8), ShiftProcessor.java (+3 -3)
• src/app/net/sf/gridarta/gui/archetypechooser: ArchetypeChooserControl.java (+14 -15), ArchetypePanel.java (+4 -5)
• src/app/net/sf/gridarta/gui/connectionview: ConnectionControl.java (+3 -4), ConnectionView.java (+2 -3), Control.java (+5 -6), LockedItemsControl.java (+3 -4), LockedItemsView.java (+2 -3), MonsterControl.java (+3 -4), MonsterView.java (+2 -3), View.java (+11 -11)
• src/app/net/sf/gridarta/gui/findarchetypes: FindArchetypesDialog.java (+3 -4)
• src/app/net/sf/gridarta/gui/map: AbstractMapTilePane.java (+8 -8), GoLocationDialog.java (+2 -2), GoLocationDialogManager.java (+12 -12), MapCursorActions.java (+16 -16), MapCursorControl.java (+13 -14), MapFileActions.java (+18 -18), MapView.java (+12 -12), MapViewBasic.java (+1 -1), ViewActions.java (+7 -8), WindowAction.java (+4 -5)
• src/app/net/sf/gridarta/gui/newmap: AbstractMapsizeNewMapDialog.java (+1 -2), AbstractNewMapDialog.java (+1 -2), NewMapDialog.java (+3 -4), NewMapDialogFactory.java (+7 -8), NewPickmapDialog.java (+3 -4), NewPickmapFolderDialog.java (+6 -7)
• src/app/net/sf/gridarta/gui/pickmapchooser: CurrentPickmapActions.java (+21 -21), Folder.java (+16 -16), FolderListAction.java (+3 -4), FolderListActions.java (+14 -15), FolderListener.java (+4 -4), Loader.java (+9 -10), Model.java (+19 -19), ModelListener.java (+4 -5), Pickmap.java (+10 -10), PickmapChooserControl.java (+30 -30), PickmapChooserView.java (+31 -31), PickmapSelectionListener.java (+7 -7)
• src/app/net/sf/gridarta/gui/selectedsquare: MapTileSelection.java (+4 -4), MapTileSelectionCache.java (+14 -14), SelectedSquareControl.java (+11 -11), SelectedSquareView.java (+20 -20)
• src/app/net/sf/gridarta/gui/undo: UndoControl.java (+9 -9)
• src/app/net/sf/gridarta/io: AbstractGameObjectParser.java (+3 -3), DefaultMapReader.java (+3 -3), DefaultMapWriter.java (+2 -2), GameObjectParser.java (+1 -1)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+21 -30), AutoValidator.java (+10 -10), AutoValidatorProcessor.java (+4 -4), DefaultMapModel.java (+4 -4), MapControl.java (+25 -7), MapControlListener.java (+7 -4), MapModel.java (+1 -1)
• src/app/net/sf/gridarta/treasurelist: CFTreasureListTree.java (+2 -2)
• src/doc/dev: typeParameters.xhtml (-1)

akirschbaum 2008-05-16 14:31 #65 Rev.: 3985

Remove MapControl.newMapView().

6 lines of code changed in 3 files:

• crossfire/src/cfeditor/map: MapControl.java (-19)
• daimonin/src/daieditor/map: MapControl.java (-19)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+6 -3)

akirschbaum 2008-05-16 13:57 #64 Rev.: 3984

Add final modifiers.

3 lines of code changed in 3 files:

• crossfire/src/cfeditor/gui: CMainView.java (+1 -1)
• daimonin/src/daieditor/gui: CMainView.java (+1 -1)
• src/app/net/sf/gridarta/gui/pickmapchooser: Model.java (+1 -1)

akirschbaum 2008-05-16 13:52 #63 Rev.: 3983

Do not call static function through instance.

2 lines of code changed in 1 file:

• crossfire/src/cfeditor: CMainControl.java (+2 -2)

akirschbaum 2008-05-16 13:50 #62 Rev.: 3982

Change double constant to canonical form.

1 lines of code changed in 1 file:

• src/app/net/sf/gridarta/textedit/textarea: TextAreaPainter.java (+1 -1)

akirschbaum 2008-05-16 13:44 #61 Rev.: 3981

Remove superfluous casts.

6 lines of code changed in 5 files:

• crossfire/src/cfeditor/gui: GameObjectAttributesDialog.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (+1 -1)
• daimonin/src/daieditor/gui: GameObjectAttributesDialog.java (+1 -1)
• src/app/net/sf/gridarta/gui: MainActions.java (+2 -2)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+1 -1)

akirschbaum 2008-05-16 13:39 #60 Rev.: 3980

Add even more type parameters.

124 lines of code changed in 75 files:

• crossfire/src/cfeditor/gui: ObjectChooser.java (+1 -1)
• crossfire/src/cfeditor/gui/map: MapUserListener.java (+2 -2)
• crossfire/src/cfeditor/map: MapControl.java (+1 -1)
• daimonin/src/daieditor/gui: ObjectChooser.java (+1 -1)
• daimonin/src/daieditor/gui/map/tools: SelectionTool.java (+2 -2)
• daimonin/src/daieditor/map: MapControl.java (+1 -1)
• src/app/net/sf/gridarta: AbstractMainControl.java (+2 -2), CopyBuffer.java (+1 -1), CurrentMapListener.java (+1 -1), DefaultMapManager.java (+1 -1), GridartaObjectsFactory.java (+1 -1), MainControl.java (+2 -2), MapImageCache.java (+2 -2), MapManager.java (+1 -1), MapManagerListener.java (+1 -1)
• src/app/net/sf/gridarta/floodfill: Floodfill.java (+1 -1)
• src/app/net/sf/gridarta/gui: AbstractObjectChooser.java (+3 -1), ArchetypesActions.java (+2 -2), ErrorListView.java (+1 -1), GameObjectAttributesPanel.java (+1 -1), MainActions.java (+1 -1), MainView.java (+1 -1), MapManagerActions.java (+1 -1), ObjectChoiceDisplay.java (+1 -1), ObjectChooser.java (+3 -3), ReplaceDialog.java (+2 -2)
• src/app/net/sf/gridarta/gui/archetypechooser: ArchetypeChooserControl.java (+1 -1), ArchetypePanel.java (+1 -1)
• src/app/net/sf/gridarta/gui/connectionview: ConnectionControl.java (+1 -1), ConnectionView.java (+1 -1), Control.java (+1 -1), LockedItemsControl.java (+1 -1), LockedItemsView.java (+1 -1), MonsterControl.java (+1 -1), MonsterView.java (+1 -1), View.java (+1 -1)
• src/app/net/sf/gridarta/gui/findarchetypes: FindArchetypesDialog.java (+3 -3)
• src/app/net/sf/gridarta/gui/map: AbstractMapTilePane.java (+6 -6), GoLocationDialogManager.java (+1 -1), MapCursorActions.java (+1 -1), MapCursorControl.java (+1 -1), MapFileActions.java (+1 -1), MapView.java (+1 -1), MapViewBasic.java (+1 -1), ViewActions.java (+1 -1), WindowAction.java (+1 -1)
• src/app/net/sf/gridarta/gui/newmap: AbstractMapsizeNewMapDialog.java (+1 -1), AbstractNewMapDialog.java (+1 -1), NewMapDialog.java (+1 -1), NewMapDialogFactory.java (+1 -1), NewPickmapDialog.java (+1 -1), NewPickmapFolderDialog.java (+1 -1)
• src/app/net/sf/gridarta/gui/pickmapchooser: CurrentPickmapActions.java (+1 -1), Folder.java (+1 -1), FolderListAction.java (+1 -1), FolderListActions.java (+1 -1), FolderListener.java (+1 -1), Loader.java (+1 -1), Model.java (+1 -1), ModelListener.java (+1 -1), Pickmap.java (+1 -1), PickmapChooserControl.java (+3 -3), PickmapChooserView.java (+1 -1), PickmapSelectionListener.java (+3 -3)
• src/app/net/sf/gridarta/gui/selectedsquare: MapTileSelection.java (+1 -1), MapTileSelectionCache.java (+1 -1), SelectedSquareControl.java (+3 -3), SelectedSquareView.java (+1 -1)
• src/app/net/sf/gridarta/gui/undo: UndoControl.java (+1 -1)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+18 -18), AutoValidator.java (+1 -1), AutoValidatorProcessor.java (+1 -1), DefaultMapModel.java (+3 -3), MapControl.java (+7 -7), MapModel.java (+1 -1)

akirschbaum 2008-05-16 12:40 #59 Rev.: 3979

Add GridartaObjectsFactory.newMapView().

36 lines of code changed in 5 files:

• crossfire/src/cfeditor: CrossfireObjectsFactory.java (+11)
• crossfire/src/cfeditor/map: MapControl.java (+1 -2)
• daimonin/src/daieditor: DaimoninObjectsFactory.java (+11)
• daimonin/src/daieditor/map: MapControl.java (+1 -2)
• src/app/net/sf/gridarta: GridartaObjectsFactory.java (+12)

akirschbaum 2008-05-08 13:01 #58 Rev.: 3978

Extract GlobalSettings from MainControl.

524 lines of code changed in 23 files:

• crossfire/src/cfeditor: CMainControl.java (+32 -116), GlobalSettingsImpl.java (new 102), MapActions.java (+3 -3)
• crossfire/src/cfeditor/gameobject: ArchetypeSet.java (+2 -2)
• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+1 -1)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchEditor.java (+2 -2)
• crossfire/src/cfeditor/gui/prefs: ResPrefs.java (+20 -18)
• daimonin/src/daieditor: CMainControl.java (+32 -102), GlobalSettingsImpl.java (new 87), MapActions.java (+1 -1)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+4 -4)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchEditor.java (+2 -2)
• daimonin/src/daieditor/gui/map: MapPropertiesDialog.java (+1 -1)
• daimonin/src/daieditor/gui/prefs: ResPrefs.java (+19 -18)
• src/app/net/sf/gridarta: AbstractMainControl.java (+2 -14), GlobalSettings.java (new 65), GlobalSettingsImpl.java (new 125), MainControl.java (+3 -21)
• src/app/net/sf/gridarta/gameobject/scripts: ScriptedEventEditor.java (+1 -1)
• src/app/net/sf/gridarta/gui: AbstractGameObjectAttributesDialog.java (+3 -3), RecentManager.java (+4 -4)
• src/app/net/sf/gridarta/gui/map: AbstractMapTilePane.java (+4 -4)
• src/app/net/sf/gridarta/io: PathManager.java (+9 -8)

akirschbaum 2008-05-07 17:05 #57 Rev.: 3977

Move Helper to gui package.

94 lines of code changed in 7 files:

• crossfire/src/cfeditor/gui: CMainView.java (+1 -1)
• crossfire/src/cfeditor/gui/script: ScriptView.java (+1 -1)
• daimonin/src/daieditor/gui: CMainView.java (+1 -1)
• src/app/net/sf/gridarta/gui: MenuHelper.java (new 89), RecentManager.java (-1)
• src/app/net/sf/gridarta/gui/map: MapView.java (+1 -1)
• src/app/net/sf/gridarta/gui/pickmapchooser: FolderListActions.java (+1 -1)

akirschbaum 2008-05-07 16:49 #56 Rev.: 3976

Move CMapViewBasic into gui.map package.

466 lines of code changed in 24 files:

• crossfire/src/cfeditor: CFJavaEditor.java (+1), CMainControl.java (+1), CrossfireObjectsFactory.java (+1), MapActions.java (+1)
• crossfire/src/cfeditor/gameobject: ArchetypeParser.java (+1 -1)
• crossfire/src/cfeditor/gui: CMainView.java (+1 -1), GameObjectAttributesDialog.java (+1 -1), GameObjectAttributesPanel.java (+1 -1), ObjectChooser.java (+1 -1)
• crossfire/src/cfeditor/gui/map: CMapViewBasic.java (new 207), MapUserListener.java (-1)
• crossfire/src/cfeditor/map: MapControl.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (+1), DaimoninEditor.java (+1), DaimoninObjectsFactory.java (+1), MapActions.java (+1)
• daimonin/src/daieditor/gameobject: ArchetypeParser.java (+1 -1)
• daimonin/src/daieditor/gui: CMainView.java (+1 -1), GameObjectAttributesDialog.java (+1 -1), GameObjectAttributesPanel.java (+1 -1), ObjectChooser.java (+1 -1)
• daimonin/src/daieditor/gui/map: CMapViewBasic.java (new 239), MapUserListener.java (-1)
• daimonin/src/daieditor/map: MapControl.java (+1 -1)

akirschbaum 2008-05-07 16:40 #55 Rev.: 3975

Move CMainView into gui package.

1012 lines of code changed in 6 files:

• crossfire/src/cfeditor: CMainControl.java (+1)
• crossfire/src/cfeditor/gui: CMainView.java (new 504)
• crossfire/src/cfeditor/gui/prefs: GUIPrefs.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (+1)
• daimonin/src/daieditor/gui: CMainView.java (new 504)
• daimonin/src/daieditor/gui/prefs: GUIPrefs.java (+1 -1)

akirschbaum 2008-05-07 16:23 #54 Rev.: 3974

Fix script related menu entries.

3 lines of code changed in 2 files:

• crossfire/resource/icons/general: Edit16.gif (new 1)
• crossfire/src/cfeditor: messages_de.properties (+2 -2)

akirschbaum 2008-05-04 12:18 #53 Rev.: 3973

Add "New Script" and "Edit Script" to Tools menu.

44 lines of code changed in 7 files:

• crossfire: ChangeLog (+4)
• crossfire/src/cfeditor: CMainControl.java (+11 -1), action.properties (+5 -1), messages.properties (+6), messages_de.properties (+6), messages_fr.properties (+6), messages_sv.properties (+6)

akirschbaum 2008-05-04 12:07 #52 Rev.: 3972

Unify menu entries.

4 lines of code changed in 2 files:

• crossfire/src/cfeditor: action.properties (+3 -4)
• daimonin/src/daieditor: action.properties (+1 -1)

akirschbaum 2008-05-04 11:52 #51 Rev.: 3971

Move MApControl.mapModel to common code base.

33 lines of code changed in 3 files:

• crossfire/src/cfeditor/map: MapControl.java (+1 -22)
• daimonin/src/daieditor/map: MapControl.java (+1 -22)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+31 -24)

akirschbaum 2008-05-04 11:32 #50 Rev.: 3970

Move MapControl.repaint() to common code base.

7 lines of code changed in 3 files:

• crossfire/src/cfeditor/map: MapControl.java (-7)
• daimonin/src/daieditor/map: MapControl.java (-7)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+7)

akirschbaum 2008-05-04 11:25 #49 Rev.: 3969

Move LevelRenderer.printFullImage() to common code base.

47 lines of code changed in 5 files:

• crossfire/src/cfeditor/gui/map: DefaultLevelRenderer.java (+2 -11), SimpleLevelRenderer.java (+2 -11)
• daimonin/src/daieditor/gui/map: DefaultLevelRenderer.java (+2 -11), SimpleLevelRenderer.java (+2 -11)
• src/app/net/sf/gridarta/gui/map: AbstractLevelRenderer.java (new 39)

akirschbaum 2008-05-04 10:57 #48 Rev.: 3968

Add MapViewBasic.getLevelRenderer().

75 lines of code changed in 9 files:

• crossfire/src/cfeditor: CMapViewBasic.java (+3 -1)
• crossfire/src/cfeditor/gui/map: DefaultLevelRenderer.java (+3 -17), SimpleLevelRenderer.java (+17)
• daimonin/src/daieditor: CMainControl.java (+3 -2), CMapViewBasic.java (+3 -1)
• daimonin/src/daieditor/gui/map: DefaultLevelRenderer.java (+3 -17), SimpleLevelRenderer.java (+17)
• src/app/net/sf/gridarta/gui/map: LevelRenderer.java (+24), MapViewBasic.java (+2)

akirschbaum 2008-05-04 10:31 #47 Rev.: 3967

Remove MapControl.getFullImage().

1 lines of code changed in 3 files:

• src/app/net/sf/gridarta: MapImageCache.java (+1 -1)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (-6), MapControl.java (-7)

akirschbaum 2008-05-04 10:27 #46 Rev.: 3966

Whitespace change.

2 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: AbstractMapControl.java (+2 -1)

akirschbaum 2008-05-04 10:26 #45 Rev.: 3965

Move MapControl.getRenderer() to common code base.

20 lines of code changed in 3 files:

• crossfire/src/cfeditor/map: MapControl.java (-21)
• daimonin/src/daieditor/map: MapControl.java (-21)
• src/app/net/sf/gridarta/map: AbstractMapControl.java (+20)

akirschbaum 2008-05-04 10:18 #44 Rev.: 3964

Unify code.

44 lines of code changed in 5 files:

• crossfire/src/cfeditor: CrossfireObjectsFactory.java (+9)
• crossfire/src/cfeditor/map: MapControl.java (+8 -8)
• daimonin/src/daieditor: DaimoninObjectsFactory.java (+9)
• daimonin/src/daieditor/map: MapControl.java (+7 -7)
• src/app/net/sf/gridarta: GridartaObjectsFactory.java (+11)

akirschbaum 2008-05-04 10:00 #43 Rev.: 3963

Use ArchetypeSet from common code base.

3 lines of code changed in 1 file:

• crossfire/src/cfeditor/gui/map: SimpleLevelRenderer.java (+3 -3)

akirschbaum 2008-05-04 09:38 #42 Rev.: 3962

Include path of other face in duplicate faces error message.

24 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject/face: FaceObjects.java (+3 -2)
• daimonin/src/daieditor: messages.properties (+1 -1), messages_sv.properties (+1 -1)
• daimonin/src/daieditor/gameobject: ArchetypeSet.java (+2 -2)
• daimonin/src/daieditor/gameobject/face: FaceObjects.java (+3 -2)
• src/app/net/sf/gridarta/gameobject/face: DuplicateFaceException.java (+14 -1)

akirschbaum 2008-05-03 10:03 #41 Rev.: 3961

Unify ScriptArchEditor.

15 lines of code changed in 4 files:

• crossfire/src/cfeditor: CMainControl.java (+1 -1)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchEditor.java (+12 -10)
• daimonin/src/daieditor: CMainControl.java (+1 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchEditor.java (+1 -1)

akirschbaum 2008-05-03 09:49 #40 Rev.: 3960

Whitespace changes.

15 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchEditor.java (+2 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchEditor.java (+13 -10)

akirschbaum 2008-05-03 09:46 #39 Rev.: 3959

Move ScriptedEventEditor to common code base.

175 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+1), ScriptedEvent.java (+1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+1), ScriptedEvent.java (+1)
• src/app/net/sf/gridarta/gameobject/scripts: ScriptedEvent.java (+6), ScriptedEventEditor.java (new 165)

akirschbaum 2008-05-03 09:27 #38 Rev.: 3958

Move ScriptedEventEditor.newEventGameObject() to ScriptedEvent

59 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptedEvent.java (+29 -1), ScriptedEventEditor.java (-30)
• daimonin/src/daieditor/gameobject/scripts: ScriptedEvent.java (+30 -1), ScriptedEventEditor.java (-31)

akirschbaum 2008-05-03 09:18 #37 Rev.: 3957

Rename variables and methods.

15 lines of code changed in 5 files:

• crossfire/src/cfeditor: CMainControl.java (+1 -1)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchUtils.java (+1 -1), ScriptedEventEditor.java (+6 -6)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchUtils.java (+1 -1), ScriptedEventEditor.java (+6 -6)

akirschbaum 2008-05-03 09:12 #36 Rev.: 3956

Rename Archetype.createArch() into createGameObject().

14 lines of code changed in 11 files:

• crossfire/src/cfeditor/gameobject: GameObject.java (+2 -2)
• crossfire/src/cfeditor/gameobject/scripts: ScriptedEventEditor.java (+1 -1)
• daimonin/src/daieditor/gameobject: GameObject.java (+2 -2)
• daimonin/src/daieditor/gameobject/scripts: ScriptedEventEditor.java (+1 -1)
• src/app/net/sf/gridarta/gameobject: AbstractArchetypeParser.java (+1 -1), Archetype.java (+1 -1), ArchetypeSet.java (+1 -1), GameObject.java (+1 -1)
• src/app/net/sf/gridarta/gui: GameObjectAttributesPanel.java (+1 -1)
• src/app/net/sf/gridarta/map: DefaultMapModel.java (+2 -2)
• src/app/net/sf/gridarta/spells: GameObjectSpell.java (+1 -1)

akirschbaum 2008-05-03 09:00 #35 Rev.: 3955

Unify code.

2 lines of code changed in 1 file:

• crossfire/src/cfeditor/gameobject/scripts: ScriptedEventEditor.java (+2 -1)

akirschbaum 2008-05-03 08:51 #34 Rev.: 3954

Split off ScriptedEventEditor from ScriptedEvent.

404 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+2 -2), ScriptedEvent.java (+4 -167), ScriptedEventEditor.java (new 195)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+2 -2), ScriptedEvent.java (+4 -168), ScriptedEventEditor.java (new 197)

akirschbaum 2008-05-03 06:50 #33 Rev.: 3953

Make ScriptedEvent.openScript() static.

12 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+1 -1), ScriptedEvent.java (+5 -4)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+1 -1), ScriptedEvent.java (+5 -4)

akirschbaum 2008-05-03 06:41 #32 Rev.: 3952

Make ScriptedEvent.editParameters() static.

28 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+1 -1), ScriptedEvent.java (+13 -12)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+1 -1), ScriptedEvent.java (+13 -12)

akirschbaum 2008-05-03 06:07 #31 Rev.: 3951

Remove lazy initialization of ScriptArchEditor.

8 lines of code changed in 6 files:

• crossfire/src/cfeditor: CMainControl.java (+3)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (-3), ScriptArchEditor.java (+1 -1)
• daimonin/src/daieditor: CMainControl.java (+3)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (-3), ScriptArchEditor.java (+1 -1)

akirschbaum 2008-05-03 06:00 #30 Rev.: 3950

Move code to create event type's combo box.

20 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchEditor.java (+1 -3), ScriptArchUtils.java (+9 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchEditor.java (+1 -3), ScriptArchUtils.java (+9 -1)

akirschbaum 2008-05-03 05:50 #29 Rev.: 3949

Split off ScriptArchEditor from ScriptArchData.

794 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject: GameObject.java (+2 -1)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+4 -362), ScriptArchEditor.java (new 391)
• daimonin/src/daieditor/gameobject: GameObject.java (+2 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+4 -362), ScriptArchEditor.java (new 391)

akirschbaum 2008-05-03 05:33 #28 Rev.: 3948

Replace access to fields with getter calls.

10 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+5 -5)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+5 -5)

akirschbaum 2008-05-03 05:27 #27 Rev.: 3947

Add ScriptArchData.getOwner().

8 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+4)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+4)

akirschbaum 2008-05-03 05:23 #26 Rev.: 3946

Add ScriptArchData.isChanged().

2 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gameobject/scripts: ScriptArchData.java (+2)

akirschbaum 2008-05-03 05:09 #25 Rev.: 3945

Whitespace changes.

13 lines of code changed in 3 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+6 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+6 -1)
• src/app/net/sf/gridarta/gameobject/match: NamedGameObjectMatcher.java (+1 -1)

akirschbaum 2008-05-03 05:03 #24 Rev.: 3944

Move ScriptArchData.getLocalMapDir() to MainControl.

32 lines of code changed in 6 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+4 -28), ScriptedEvent.java (+1 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+4 -28), ScriptedEvent.java (+1 -1)
• src/app/net/sf/gridarta: AbstractMainControl.java (+16), MainControl.java (+6)

akirschbaum 2008-05-03 04:49 #23 Rev.: 3943

Make methods public.

2 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+1 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+1 -1)

akirschbaum 2008-05-03 04:46 #22 Rev.: 3942

Make ScriptArchData.createNewEvent() static.

20 lines of code changed in 2 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+10 -6)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+10 -6)

akirschbaum 2008-05-03 04:06 #21 Rev.: 3941

Make ScriptArchData.addEventScript() static.

10 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject: GameObject.java (+1 -1)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+4 -3)
• daimonin/src/daieditor/gameobject: GameObject.java (+1 -1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+4 -3)

akirschbaum 2008-05-03 03:46 #20 Rev.: 3940

Unify code.

79 lines of code changed in 4 files:

• crossfire/src/cfeditor/gameobject/scripts: ScriptedEvent.java (+1)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchUtils.java (+14), ScriptedEvent.java (+5 -1)
• src/app/net/sf/gridarta/gameobject/scripts: UndefinedEventArchetypeTypeException.java (new 59)

akirschbaum 2008-05-03 03:33 #19 Rev.: 3939

Extract code from ScriptArchData into ScriptArchUtils.

152 lines of code changed in 7 files:

• crossfire/src/cfeditor: CMainControl.java (+3 -3)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+5 -53), ScriptArchUtils.java (new 76), ScriptedEvent.java (+3 -3)
• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (+5 -37), ScriptArchUtils.java (new 58), ScriptedEvent.java (+2 -2)

akirschbaum 2008-05-03 03:01 #18 Rev.: 3938

Remove outdated TODO comment.

0 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (-1)

akirschbaum 2008-05-03 02:28 #17 Rev.: 3937

Create correct path names for new script files.

4 lines of code changed in 2 files:

• crossfire: ChangeLog (+2)
• crossfire/src/cfeditor/gameobject/scripts: ScriptArchData.java (+2 -1)

akirschbaum 2008-05-03 02:12 #16 Rev.: 3936

Remove comment.

0 lines of code changed in 1 file:

• daimonin/src/daieditor/gameobject/scripts: ScriptArchData.java (-8)

akirschbaum 2008-05-02 17:53 #15 Rev.: 3935

Rename variable name.

3 lines of code changed in 1 file:

• daimonin/src/daieditor/gui/map: DefaultLevelRenderer.java (+3 -3)

akirschbaum 2008-05-02 17:41 #14 Rev.: 3934

Remove unneeded this qualifiers.

2 lines of code changed in 2 files:

• src/app/net/sf/gridarta/gui: GameObjectAttributesPanel.java (+1 -1)
• src/app/net/sf/gridarta/gui/map: ViewActions.java (+1 -1)

akirschbaum 2008-05-02 17:39 #13 Rev.: 3933

Reorder modifiers to match recommended order.

2 lines of code changed in 2 files:

• src/app/net/sf/gridarta/gui/pickmapchooser: Model.java (+1 -1)
• src/app/net/sf/gridarta/treasurelist: TreasureListsParser.java (+1 -1)

akirschbaum 2008-05-02 17:37 #12 Rev.: 3932

Add final modifiers.

3 lines of code changed in 3 files:

• src/app/net/sf/gridarta/gameobject/match: GameObjectMatchersParser.java (+1 -1)
• src/app/net/sf/gridarta/textedit/textarea/tokenmarker: CrossfireDialogTokenMarker.java (+1 -1), DaimoninAITokenMarker.java (+1 -1)

akirschbaum 2008-05-02 17:33 #11 Rev.: 3931

Add braces to if statements.

6 lines of code changed in 1 file:

• src/app/net/sf/gridarta: CAttribBitmask.java (+6 -2)

akirschbaum 2008-05-02 17:30 #10 Rev.: 3930

Do not reuse variable.

5 lines of code changed in 1 file:

• src/app/net/sf/gridarta/gui/map: AbstractMapTilePane.java (+5 -5)

akirschbaum 2008-05-02 17:27 #9 Rev.: 3929

Make fields private.

7 lines of code changed in 5 files:

• crossfire/src/cfeditor/filter: NamedGameObjectMatcherFilter.java (+1 -1)
• crossfire/src/cfeditor/script/parameter: ArchParameter.java (+1 -1)
• daimonin/src/daieditor/gui/map/tools: InsertionTool.java (+1 -1)
• src/app/net/sf/gridarta/gui/newmap: NewMapDialogFactory.java (+3 -3)
• src/app/net/sf/gridarta/gui/selectedsquare: SelectedSquareView.java (+1 -1)

akirschbaum 2008-05-02 17:23 #8 Rev.: 3928

Fix Javadoc issues.

4 lines of code changed in 3 files:

• src/app/net/sf/gridarta/gameobject: AbstractArchetypeSet.java (+1)
• src/app/net/sf/gridarta/gui: AbstractGameObjectAttributesDialog.java (+1)
• src/app/net/sf/gridarta/io: AbstractGameObjectParser.java (+2)

akirschbaum 2008-05-02 17:20 #7 Rev.: 3927

Remove raw types.

3 lines of code changed in 1 file:

• src/app/net/sf/gridarta/map: AbstractMapArchObject.java (+3 -3)

akirschbaum 2008-05-02 17:14 #6

Remove raw types.

9 lines of code changed in 2 files:

• src/app/net/sf/gridarta/gameobject: AbstractArchetypeSet.java (+3 -3)
• src/app/net/sf/gridarta/gui: AbstractGameObjectAttributesDialog.java (+6 -6)

akirschbaum 2008-05-02 17:10 #5 Rev.: 3924

Rename field name.

10 lines of code changed in 1 file:

• crossfire/src/cfeditor/gui/script/parameter: ArchComboBox.java (+10 -10)

akirschbaum 2008-05-02 16:38 #4 Rev.: 3923

Fix NullPointerExceptions when using command line option -s with wrong number of arguments.

8 lines of code changed in 2 files:

• daimonin: ChangeLog (+3)
• daimonin/src/daieditor: DaimoninEditor.java (+5)

akirschbaum 2008-05-02 16:35 #3 Rev.: 3922

Make command line options work: exit the application after the command has finished executing.

29 lines of code changed in 2 files:

• daimonin: ChangeLog (+3)
• daimonin/src/daieditor: DaimoninEditor.java (+26 -10)

akirschbaum 2008-05-02 16:23 #2 Rev.: 3921

Wait until archetype collection has finished before exiting the application.

130 lines of code changed in 6 files:

• crossfire: ChangeLog (+5)
• crossfire/src/cfeditor: CMainControl.java (+34 -9)
• daimonin: ChangeLog (+5)
• daimonin/src/daieditor: CMainControl.java (+34 -9)
• src/app/net/sf/gridarta/gameobject: Collector.java (+33 -8)
• src/app/net/sf/gridarta/gui: MainActions.java (+19 -8)

akirschbaum 2008-05-02 13:51 #1 Rev.: 3920

Reorder import statements.

25 lines of code changed in 18 files:

• crossfire/src/cfeditor: CMainControl.java (+1 -2), CMainView.java (+1 -1), CrossfireObjectsFactory.java (+4 -4)
• daimonin/src/daieditor: CMainControl.java (-2), CMainView.java (+1 -1), DaimoninObjectsFactory.java (+4 -4)
• src/app/net/sf/gridarta: MapImageCache.java (+4 -4)
• src/app/net/sf/gridarta/gameobject: GameObject.java (+1 -1)
• src/app/net/sf/gridarta/gameobject/match: GameObjectMatchers.java (-1)
• src/app/net/sf/gridarta/gui/map: ViewActions.java (-2)
• src/app/net/sf/gridarta/gui/pickmapchooser: Model.java (+1 -1), Pickmap.java (+1 -1), PickmapSelectionListener.java (+1 -1)
• src/app/net/sf/gridarta/io: AbstractGameObjectParser.java (+1 -1), GameObjectParser.java (+1 -1), MapArchObjectParser.java (+1 -1)
• src/app/net/sf/gridarta/map: AutoValidator.java (+2 -2)
• src/app/net/sf/gridarta/textedit/textarea/actions: Replace.java (+1 -1)

April 2008 »