Commit Log

Adding support for editor plugins
Those plugins are in beanshell language
An example plugin is provided
Consider as beta release.
Should not crash but some features not fully working (123 Files changed, 23924 Lines changed)

src/cfeditor/CMapModel.java 1.12 (+53 -2)

lib/bsh-commands.jar 1.1 added

src/cfeditor/CScriptController.java 1.1 added 303

resource/icons/SaveLevelSmallIcon.gif 1.2 (+0 -0)

src/cfeditor/parameter/IntegerParameterView.java 1.1 added 135

src/cfeditor/CResourceLoader.java 1.1 added 255

src/cfeditor/filter/SimpleFilterConfig.java 1.1 added 32

lib/jdom.jar 1.2 (+0 -0)

resource/icons/SaveLevelAsSmallIcon.gif 1.2 (+0 -0)

lib/bsh-util.jar 1.1 added

src/cfeditor/menu/MenuLocation.java 1.1 added 58

src/cfeditor/gui/ScriptEditor.java 1.1 added 335

resource/conf/archetypes 1.12 (+15790 -11919)

src/cfeditor/CFJavaEditor.java 1.19 (+56 -5)

src/cfeditor/menu/MenuChangeEvent.java 1.1 added 53

src/cfeditor/parameter/ParameterDescriptionEditor.java 1.1 added 38

src/cfeditor/parameter/FilterParameterView.java 1.1 added 44

src/cfeditor/filter/AttributeFilter.java 1.2 (+63 -5)

src/cfeditor/textedit/scripteditor/ScriptEditMenuBar.java 1.3 (+6 -1)

src/cfeditor/CScriptView.java 1.1 added 252

src/cfeditor/CMainMenu.java 1.14 (+370 -282)

src/cfeditor/PluginParameterView.java 1.1 added 22

src/cfeditor/filter/ConfigListener.java 1.1 added 17

lib/bsh-classgen.jar 1.1 added

resource/conf/autojoin.txt 1.3 (+590 -551)

src/cfeditor/textedit/scripteditor/ScriptEditControl.java 1.3 (+7 -2)

resource/icons/CloseTabSmallIcon.gif 1.1 added

src/cfeditor/CMapFileDecode.java 1.9 (+14 -6)

src/cfeditor/CMapViewIFrame.java 1.7 (+14 -1)

src/cfeditor/IdGenerator.java 1.1 added 44

src/cfeditor/MapArchObject.java 1.7 (+5 -1)

src/cfeditor/parameter/ParameterNameEditor.java 1.1 added 46

src/cfeditor/ArchObjectParser.java 1.9 (+39 -28)

src/cfeditor/menu/CheckBoxMenuEntry.java 1.1 added 113

src/cfeditor/parameter/StringParameter.java 1.1 added 50

src/cfeditor/menu/LocationMenuEntry.java 1.1 added 105

src/cfeditor/menu/SeparatorMenuEntry.java 1.1 added 47

src/cfeditor/parameter/BooleanParameterView.java 1.1 added 86

src/cfeditor/parameter/MapParameter.java 1.1 added 76

resource/conf/treasures 1.7 (+1 -3045)

src/cfeditor/parameter/BooleanParameter.java 1.1 added 98

src/cfeditor/AutojoinList.java 1.6 (+15 -10)

src/cfeditor/CScriptModel.java 1.1 added 393

src/cfeditor/parameter/StringParameterView.java 1.1 added 65

src/cfeditor/menu/MenuManager.java 1.1 added 236

src/cfeditor/PluginParameter.java 1.1 added 101

resource/icons/ImportPluginSmallIcon.gif 1.1 added

src/cfeditor/parameter/DoubleParameter.java 1.1 added 101

src/cfeditor/CMainControl.java 1.20 (+101 -35)

lib/log4j.jar 1.1 added

resource/icons/FilterSmallIcon.gif 1.1 added

src/cfeditor/CMapArchPanel.java 1.13 (+13 -2)

src/cfeditor/textedit/textarea/InputHandler.java 1.5 (+7 -3)

src/cfeditor/CFArchType.java 1.7 (+28 -20)

src/cfeditor/CFHelp.java 1.4 (+12 -5)

src/cfeditor/CFArchAttrib.java 1.7 (+14 -9)

src/cfeditor/textedit/scripteditor/ScriptEditView.java 1.3 (+7 -3)

src/cfeditor/CFileReader.java 1.4 (+11 -5)

src/cfeditor/filter/NamedFilterConfig.java 1.1 added 90

src/cfeditor/CAttribDialog.java 1.10 (+13 -5)

src/cfeditor/CFArchTypeList.java 1.9 (+33 -27)

src/cfeditor/BshThread.java 1.1 added 62

src/cfeditor/textedit/textarea/DefaultInputHandler.java 1.3 (+7 -3)

src/cfeditor/menu/MenuGroup.java 1.1 added 29

src/cfeditor/CMainView.java 1.15 (+9 -4)

lib/bsh-core.jar 1.1 added

src/cfeditor/textedit/textarea/TextAreaPainter.java 1.4 (+7 -4)

src/cfeditor/CMapViewBasic.java 1.15 (+15 -6)

src/cfeditor/parameter/ArchParameter.java 1.1 added 73

src/cfeditor/CArchPanelPan.java 1.8 (+9 -3)

src/cfeditor/parameter/IntegerParameter.java 1.1 added 98

src/cfeditor/filter/ConfigEvent.java 1.1 added 32

resource/pickmaps/exit 1.3 (+205 -205)

src/cfeditor/CFTreasureListTree.java 1.8 (+8 -3)

src/cfeditor/filter/FilterConfig.java 1.1 added 23

src/cfeditor/filter/NamedFilterListener.java 1.1 added 17

src/cfeditor/gui/ArchComboBox.java 1.1 added 396

src/cfeditor/filter/Filter.java 1.2 (+13 -4)

src/cfeditor/menu/MenuListener.java 1.1 added 30

resource/log4j.properties 1.1 added 13

src/cfeditor/parameter/ParameterTypeEditor.java 1.1 added 41

src/cfeditor/filter/NamedFilterList.java 1.2 (+275 -29)

src/cfeditor/textedit/scripteditor/CFPythonPopup.java 1.3 (+0 -1)

src/cfeditor/menu/MenuHelper.java 1.1 added 43

src/cfeditor/textedit/textarea/JEditTextArea.java 1.3 (+6 -3)

src/cfeditor/CSettings.java 1.5 (+6 -13)

src/cfeditor/CFilterControl.java 1.2 (+92 -90)

resource/icons/AutorunSmallIcon.gif 1.1 added

src/cfeditor/ScriptArchData.java 1.6 (+11 -5)

src/cfeditor/filter/NamedFilterEvent.java 1.1 added 41

src/cfeditor/menu/BasicMenuEntry.java 1.1 added 157

src/cfeditor/CAttribBitmask.java 1.7 (+13 -9)

src/cfeditor/ArchObjectStack.java 1.17 (+60 -53)

resource/icons/RunPluginSmallIcon.gif 1.1 added

src/cfeditor/menu/SwitchedMenuEntry.java 1.1 added 64

src/cfeditor/parameter/ArchParameterView.java 1.1 added 54

src/cfeditor/gui/StackLayout.java 1.1 added 83

src/cfeditor/filter/BasicFilterConfig.java 1.1 added 55

src/cfeditor/IGUIConstants.java 1.16 (+10 -0)

src/cfeditor/gui/CloseableTabbedPane.java 1.1 added 209

src/cfeditor/menu/SimpleMenuLocation.java 1.1 added 77

src/cfeditor/menu/FilterCheckBoxEntry.java 1.1 added 31

src/cfeditor/MultiPositionData.java 1.3 (+9 -3)

src/cfeditor/CMapFileEncode.java 1.8 (+7 -1)

resource/icons/EditPluginSmallIcon.gif 1.1 added

build.xml 1.6 (+6 -1)

src/cfeditor/JFontChooser.java 1.15 (+10 -4)

src/cfeditor/CGUIUtils.java 1.6 (+14 -4)

src/cfeditor/CPickmapPanel.java 1.9 (+13 -7)

src/cfeditor/menu/SimpleMenuEntry.java 1.1 added 63

src/cfeditor/CFileInputStream.java 1.4 (+8 -4)

src/cfeditor/parameter/MapParameterView.java 1.1 added 151

src/cfeditor/ArchObject.java 1.14 (+10 -3)

src/cfeditor/parameter/DoubleParameterView.java 1.1 added 137

src/cfeditor/CMapControl.java 1.12 (+12 -9)

src/cfeditor/menu/AggregateMenuLocation.java 1.1 added 130

src/cfeditor/gui/ScriptManager.java 1.1 added 164

src/cfeditor/PluginParameterFactory.java 1.1 added 80

src/cfeditor/menu/MenuEntry.java 1.1 added 117

src/cfeditor/CopyBuffer.java 1.6 (+5 -1)

src/cfeditor/JarResources.java 1.3 (+20 -16)

src/cfeditor/menu/BasicAction.java 1.1 added 81

src/cfeditor/parameter/FilterParameter.java 1.1 added 56

I made the CFJavaEditor compliant with Java Version 1.5.
(The problems were use of 'enum' as a variable name, which has
become a reserved system keyword in 1.5, and debrecated functions
'Frame.show()' / 'Frame.hide()'. Simple fix.)
On the way, I did some other minor syntax cleanups which are not supposed
to have any effects on performance.
The editor should now compile and run on java versions 1.3, 1.4 and 1.5.

--AndreasV (46 Files changed, 90 Lines changed)

src/cfeditor/CFArchType.java 1.6 (+0 -2)

src/cfeditor/ArchObjectStack.java 1.16 (+4 -13)

src/cfeditor/textedit/scripteditor/ScriptEditView.java 1.2 (+2 -3)

src/cfeditor/textedit/scripteditor/CFPythonPopup.java 1.2 (+1 -1)

src/cfeditor/CMapViewInterface.java 1.4 (+0 -8)

src/cfeditor/CMapViewIFrame.java 1.6 (+0 -5)

src/cfeditor/CMainControl.java 1.19 (+8 -13)

src/cfeditor/CDialogBase.java 1.4 (+1 -4)

src/cfeditor/CAttribBitmask.java 1.6 (+1 -4)

src/cfeditor/COptionDialog.java 1.9 (+0 -3)

src/cfeditor/CMapControl.java 1.11 (+0 -3)

src/cfeditor/textedit/scripteditor/ScriptEditControl.java 1.2 (+2 -2)

src/cfeditor/CMainToolbar.java 1.5 (+6 -9)

src/cfeditor/textedit/textarea/SyntaxStyle.java 1.3 (+1 -3)

src/cfeditor/CArchPanelPan.java 1.7 (+0 -3)

src/cfeditor/ReplaceDialog.java 1.2 (+7 -10)

src/cfeditor/CMapFileEncode.java 1.7 (+0 -2)

src/cfeditor/CMapModel.java 1.11 (+0 -1)

src/cfeditor/AnimationObject.java 1.4 (+0 -14)

src/cfeditor/CMapViewBasic.java 1.14 (+0 -3)

src/cfeditor/textedit/scripteditor/ScriptEditMenuBar.java 1.2 (+3 -5)

src/cfeditor/CStartupScreen.java 1.3 (+1 -4)

INSTALL.txt 1.9 (+3 -3)

src/cfeditor/CFTreasureListTree.java 1.7 (+10 -10)

src/cfeditor/ScriptArchData.java 1.5 (+8 -8)

src/cfeditor/CMainMenu.java 1.13 (+1 -2)

src/cfeditor/CArchPanel.java 1.10 (+0 -4)

src/cfeditor/CArchQuickView.java 1.7 (+2 -5)

src/cfeditor/CNewMapDialog.java 1.9 (+0 -3)

src/cfeditor/textedit/textarea/TokenMarker.java 1.4 (+1 -2)

src/cfeditor/textedit/textarea/InputHandler.java 1.4 (+4 -4)

src/cfeditor/CMapTileList.java 1.12 (+3 -5)

src/cfeditor/CMapFileDecode.java 1.8 (+0 -2)

src/cfeditor/CopyBuffer.java 1.5 (+0 -1)

src/cfeditor/CPickmapPanel.java 1.8 (+0 -3)

src/cfeditor/JFontChooser.java 1.13 (+4 -7)

src/cfeditor/FaceObject.java 1.4 (+0 -5)

src/cfeditor/CMapPropertiesDialog.java 1.9 (+1 -4)

src/cfeditor/CMapArchPanel.java 1.12 (+4 -7)

src/cfeditor/textedit/textarea/JavaScriptTokenMarker.java 1.3 (+1 -3)

src/cfeditor/CFJavaEditor.java 1.17 (+4 -2)

src/cfeditor/CFancyButton.java 1.5 (+0 -3)

src/cfeditor/CAttribDialog.java 1.9 (+3 -4)

src/cfeditor/CGUIUtils.java 1.5 (+0 -3)

src/cfeditor/CMainStatusbar.java 1.4 (+0 -2)

src/cfeditor/CMainView.java 1.14 (+4 -4)

Added support for the 'other_arch' field in runes. (2 Files changed, 12 Lines changed)

resource/conf/types.xml 1.10 (+5 -2)

CHANGES.txt 1.8 (+7 -1)

Added support for filter analysing tool, for upstairs / downstairs maps and for the use_content_on_gen flag in generators.

Analysing tools can be found in analyze menu. I know some things are still slow,
working on them (release early release often :).
The upstaris/downstairs use tile_map_4 and tile_map_5. Do serverdoesn't use those
values for now, but thise could change in future. For now, this is an easy way to move
from one stage to another in towers when you create new maps.
Flag is quite obvious and has been documented in types.xml as 'template generation'. (13 Files changed, 834 Lines changed)

src/cfeditor/CMapViewBasic.java 1.13 (+56 -5)

resource/conf/types.xml 1.8 (+10 -1)

src/cfeditor/CMainMenu.java 1.12 (+205 -14)

src/cfeditor/CMapControl.java 1.10 (+61 -3)

src/cfeditor/IGUIConstants.java 1.15 (+2 -0)

src/cfeditor/CMainControl.java 1.18 (+13 -1)

src/cfeditor/MapArchObject.java 1.6 (+14 -4)

src/cfeditor/ArchObject.java 1.13 (+27 -5)

src/cfeditor/filter/AttributeFilter.java 1.1 added 90

src/cfeditor/CFilterControl.java 1.1 added 162

src/cfeditor/CMapPropertiesDialog.java 1.8 (+5 -3)

src/cfeditor/filter/NamedFilterList.java 1.1 added 138

src/cfeditor/filter/Filter.java 1.1 added 51

Updated datafiles for latest arch and object data.
--AV (4 Files changed, 6984 Lines changed)

resource/conf/treasures 1.6 (+5334 -3681)

resource/conf/typenumbers.xml 1.5 (+4 -1)

resource/conf/archetypes 1.11 (+1646 -543)

resource/conf/crossfire.0 1.11 (+0 -0)

Added javadoc build target to the ant build file.
Doc generation can now be invoked by directive "ant doc".
Also cleaned up some javadoc errors in the code.
--AndreasV (13 Files changed, 40 Lines changed)

src/cfeditor/CMapFileDecode.java 1.7 (+1 -1)

src/cfeditor/ArchObject.java 1.11 (+2 -2)

src/cfeditor/CFancyButton.java 1.4 (+1 -1)

src/cfeditor/textedit/textarea/KeywordMap.java 1.3 (+2 -2)

src/cfeditor/CMainView.java 1.13 (+3 -3)

build.xml 1.5 (+20 -0)

src/cfeditor/CFTreasureListTree.java 1.6 (+0 -1)

src/cfeditor/textedit/textarea/TokenMarker.java 1.3 (+2 -2)

src/cfeditor/CFArchTypeList.java 1.8 (+2 -2)

src/cfeditor/MultiArchData.java 1.3 (+1 -1)

src/cfeditor/textedit/textarea/InputHandler.java 1.3 (+2 -2)

src/cfeditor/textedit/textarea/TextAreaPainter.java 1.3 (+3 -3)

src/cfeditor/AutojoinList.java 1.5 (+1 -1)

- add Trigger_Marker type and edit form details (2 Files changed, 57 Lines changed)

resource/conf/typenumbers.xml 1.4 (+1 -1)

resource/conf/types.xml 1.7 (+56 -1)

CFJavaEditor Update:

The archpanel tabs used to be sorted in the same order
as read from the arch directory file, which led
to unpredictable results on unix systems.
Now the archpanel tabs are always sorted in alphabetical
order. Due to the way Java handles tabbed panes, the
order is displayed left->right, bottom->up.
Anyways, as long as the archpanel width is not resized,
the order should now always stay exactly the same.

This patch was submitted by Mark Wedel.
I extended it to affect the pickmaps panel too.

Also added support for script event options.

--AndreasV (10 Files changed, 173 Lines changed)

src/cfeditor/CMapFileDecode.java 1.6 (+12 -5)

src/cfeditor/CMapArchPanel.java 1.11 (+1 -1)

src/cfeditor/CMainView.java 1.12 (+12 -0)

src/cfeditor/ArchObject.java 1.9 (+8 -3)

src/cfeditor/CArchPanelPan.java 1.6 (+5 -9)

src/cfeditor/CPickmapPanel.java 1.7 (+37 -53)

src/cfeditor/CArchPanel.java 1.8 (+34 -8)

src/cfeditor/CMainControl.java 1.17 (+5 -8)

src/cfeditor/ScriptArchData.java 1.3 (+57 -20)

src/cfeditor/ArchObjectStack.java 1.15 (+2 -1)

Fixed a bug in the parse logic for floating points.
Also improved handling of fixed attributes in
combination with type-changing.
--AV (1 Files changed, 14 Lines changed)

src/cfeditor/CAttribDialog.java 1.8 (+14 -3)

Updated pickmaps in regard to latest additions and
changes in the arches.
--AndreasV (4 Files changed, 902 Lines changed)

resource/pickmaps/food 1.3 (+299 -294)

resource/pickmaps/monster 1.4 (+4 -0)

resource/pickmaps/background 1.4 (+62 -69)

resource/pickmaps/treasure 1.4 (+537 -528)