Menu
▾
▴
[Crossfire-cvs] SF.net SVN: crossfire:[12213] jxclient/trunk
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-10-24 14:06:41
|
Revision: 12213
http://crossfire.svn.sourceforge.net/crossfire/?rev=12213&view=rev
Author: akirschbaum
Date: 2009-10-24 14:06:26 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
Add nullable annotations.
Modified Paths:
--------------
jxclient/trunk/build.xml
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptkillCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptkillallCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptsCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScripttellCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/SetCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/UnbindCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/experience/ExperienceTable.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/AskfaceFaceQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/DefaultFaceQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/Face.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceImages.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceImagesUtils.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FaceQueueListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesManagerListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FacesQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FileCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/FileCacheFaceQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale2x.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/ImageScale8d.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/MemoryImageCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/RawScale2x.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/faces/RawScale8d.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUICheckBox.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIDialogTitle.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMagicMap.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMap.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIMetaElement.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/GUIPicture.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/AbstractButton.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/GUIButton.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/button/GUITextButton.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ConnectCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogCloseCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogOpenCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DialogToggleCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/DisconnectCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecSelectionCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteElementCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/HideCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/MetaCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/MoveSelectionCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/QuitCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollListCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollNeverCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollNextCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ScrollResetCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ShowCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/StartCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ToggleCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/ActiveSkillGaugeUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIDupGauge.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIDupTextGauge.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIGauge.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUIGaugeListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GUITextGauge.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GaugeState.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/GaugeUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/OrientationParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/SkillGaugeUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gauge/StatGaugeUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/ActivatableGUIElement.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIElement.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIElementChangedListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GUIScrollBar.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiAutoCloseListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/TooltipManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItem.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemFloor.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemInventory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemInventoryFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemItem.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemShortcut.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/GUIItemSpelllist.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/ItemPainter.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/InvalidKeyBindingException.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeMap.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/AbstractLabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIHTMLLabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabelQuery.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUILabelStats.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIMultiLineLabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUIOneLineLabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/GUISpellLabel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/label/InternalHTMLRenderer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIItemInventoryList.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIItemList.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIList.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/GUIMetaElementList.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/ItemInventoryCellRenderer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/list/MetaElementCellRenderer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Buffer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/BufferListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Fonts.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUILabelLog.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUILog.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Line.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/RenderState.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/RenderStateManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Segment.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/scrollable/GUIScrollable2.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUICommandText.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUIQueryText.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUIText.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/GUITextField.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/textinput/KeyListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/AbstractManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CfItem.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CfPlayer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/CurrentFloorManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/EventScheduler.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/InventoryManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/ItemsManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/LocationListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/LocationsListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/items/PlayerListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/main/JXClient.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/main/Options.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/AnimationState.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMap.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapAnimations.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapPatch.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapSquare.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMapSquareListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/CfMultiSquare.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/map/Location.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/Metaserver.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverEntry.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverEntryParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverModel.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/MetaserverProcessor.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/metaserver/ServerCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/DefaultScriptProcess.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/PacketWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptProcess.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/ScriptProcessListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/scripts/StatUtils.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocketListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CommandQueue.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireDrawextinfoListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireDrawinfoListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireExpTableListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireFaceListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireMagicmapListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireMusicListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireQueryListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireServerConnection.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireServerConnectionListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSkillInfoListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSoundListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireSpellListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireStatsListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateFaceListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateItemListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/CrossfireUpdateMapListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/DefaultCrossfireServerConnection.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/DefaultServerConnection.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/Pickup.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/PickupOption.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ReceivedPacketListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ServerConnection.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/UnknownCommandException.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Codec.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/CommandHistory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Filenames.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/Settings.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/CommandCheckBoxOption.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/Option.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/OptionException.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/OptionManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/settings/options/SoundCheckBoxOption.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/Shortcut.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutSpell.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/Shortcuts.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/shortcuts/ShortcutsListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skills/Skill.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skills/SkillSet.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/AbstractJXCSkinSource.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CheckBoxFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DialogFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/Dialogs.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ExpressionParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/FontParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/GaugeUpdaterParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/GuiElementParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ImageParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkin.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinClassSource.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinDirSource.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinException.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinSource.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/ParseUtils.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/Resolution.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/TextButtonFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/ConnectionStateSkinEvent.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/CrossfireMagicmapSkinEvent.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/MapscrollSkinEvent.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/SkillAddedSkinEvent.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/events/SkillRemovedSkinEvent.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/AudioFileLoader.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/ClipCache.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/ClipManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/MusicManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/MusicWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/SoundManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/SoundWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/Sounds.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/sound/StatsWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/CurrentSpellManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/CurrentSpellManagerListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/Spell.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellComparator.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellsManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/spells/SpellsManagerListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/ActiveSkillWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/PoisonWatcher.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/Stats.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/StatsListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/stats/StatsParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/timeouts/Event.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/timeouts/Timeouts.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/DebugWriter.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Filenames.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Formatter.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/HexCodec.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Images.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/NumberParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/Patterns.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/ResourceUtils.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/StringSplitter.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/util/StringUtils.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/DialogStateParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GUICommandList.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiStateListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCConnection.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindowRenderer.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeyHandler.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/MouseTracker.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/RendererGuiStateListener.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/ShortcutsManager.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/gauge/OrientationTest.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/log/ParserTest.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/gui/log/RenderStateTest.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdaterTest.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/scripts/PacketWatcherTest.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/test/TestCrossfireServerConnection.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/test/TestScriptProcess.java
jxclient/trunk/src/test/com/realtime/crossfire/jxclient/util/StringSplitterTest.java
Added Paths:
-----------
jxclient/trunk/lib/annotations.jar
jxclient/trunk/lib/annotations.jar-LICENSE
Modified: jxclient/trunk/build.xml
===================================================================
--- jxclient/trunk/build.xml 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/build.xml 2009-10-24 14:06:26 UTC (rev 12213)
@@ -18,6 +18,7 @@
<javac srcdir="${src.test}" destdir="${build}/test" source="1.6" debug="yes" fork="yes">
<classpath>
<pathelement location="jxclient.jar"/>
+ <pathelement location="lib/annotations.jar"/>
<pathelement location="lib/junit-4.2.jar"/>
</classpath>
<compilerarg value="-Xlint:unchecked"/>
@@ -78,6 +79,7 @@
<junit fork="yes" haltonerror="yes" haltonfailure="yes">
<jvmarg value="-ea"/>
<classpath>
+ <pathelement location="lib/annotations.jar"/>
<pathelement location="lib/junit-4.2.jar"/>
<pathelement location="${build}/test"/>
<pathelement location="jxclient.jar"/>
Added: jxclient/trunk/lib/annotations.jar
===================================================================
(Binary files differ)
Property changes on: jxclient/trunk/lib/annotations.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: jxclient/trunk/lib/annotations.jar-LICENSE
===================================================================
--- jxclient/trunk/lib/annotations.jar-LICENSE (rev 0)
+++ jxclient/trunk/lib/annotations.jar-LICENSE 2009-10-24 14:06:26 UTC (rev 12213)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Property changes on: jxclient/trunk/lib/annotations.jar-LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animation.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -19,6 +19,8 @@
//
package com.realtime.crossfire.jxclient.animations;
+import org.jetbrains.annotations.NotNull;
+
/**
* Manages animations frecevied from the server. Animations are uniquely
* identified by an animation id. Each animation consists of a list of faces.
@@ -35,6 +37,7 @@
/**
* The faces list of the animation.
*/
+ @NotNull
private final int[] faces;
/**
@@ -44,7 +47,7 @@
*
* @param faces The faces list of the animation.
*/
- public Animation(final int flags, final int[] faces)
+ public Animation(final int flags, @NotNull final int[] faces)
{
assert faces.length > 0;
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/animations/Animations.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -24,6 +24,8 @@
import com.realtime.crossfire.jxclient.window.JXCWindow;
import java.util.HashMap;
import java.util.Map;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Manages animations frecevied from the server. Animations are uniquely
@@ -36,12 +38,14 @@
/**
* All defined animations. Maps animation id to animation instance.
*/
+ @NotNull
private final Map<Integer, Animation> animations = new HashMap<Integer, Animation>();
/**
* The {@link GuiStateListener} for detecting established or dropped
* connections.
*/
+ @NotNull
private final GuiStateListener guiStateListener = new GuiStateListener()
{
/** {@inheritDoc} */
@@ -67,7 +71,7 @@
/** {@inheritDoc} */
@Override
- public void connecting(final ClientSocketState clientSocketState)
+ public void connecting(@NotNull final ClientSocketState clientSocketState)
{
// ignore
}
@@ -81,7 +85,7 @@
/** {@inheritDoc} */
@Override
- public void connectFailed(final String reason)
+ public void connectFailed(@NotNull final String reason)
{
// ignore
}
@@ -91,7 +95,7 @@
* Creates a new instance.
* @param window the window to attach to; <code>null</code> to not attach
*/
- public Animations(final JXCWindow window)
+ public Animations(@Nullable final JXCWindow window)
{
if (window != null)
{
@@ -108,7 +112,7 @@
*
* @param faces The faces list of the animation.
*/
- public void addAnimation(final int animationId, final int flags, final int[] faces)
+ public void addAnimation(final int animationId, final int flags, @NotNull final int[] faces)
{
if (faces.length == 1)
{
@@ -130,6 +134,7 @@
* @return The animation instance, or <code>null</code> if the animation id
* does not exist.
*/
+ @Nullable
public Animation get(final int animationId)
{
return animations.get(animationId);
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/AbstractCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -21,6 +21,7 @@
import com.realtime.crossfire.jxclient.server.CrossfireDrawinfoListener;
import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
+import org.jetbrains.annotations.NotNull;
/**
* Abstract base class for {@link Command} implementations.
@@ -31,13 +32,14 @@
/**
* The connection instance.
*/
+ @NotNull
private final CrossfireServerConnection crossfireServerConnection;
/**
* Creates a new instance.
* @param crossfireServerConnection the connection instance
*/
- protected AbstractCommand(final CrossfireServerConnection crossfireServerConnection)
+ protected AbstractCommand(@NotNull final CrossfireServerConnection crossfireServerConnection)
{
this.crossfireServerConnection = crossfireServerConnection;
}
@@ -46,7 +48,7 @@
* Displays a regular output message.
* @param message the message
*/
- protected void drawInfo(final String message)
+ protected void drawInfo(@NotNull final String message)
{
drawInfo(message, CrossfireDrawinfoListener.NDI_BLACK);
}
@@ -55,7 +57,7 @@
* Displays an error message.
* @param message the error message
*/
- protected void drawInfoError(final String message)
+ protected void drawInfoError(@NotNull final String message)
{
drawInfo(message, CrossfireDrawinfoListener.NDI_RED);
}
@@ -65,7 +67,7 @@
* @param message the message
* @param color the color code
*/
- protected void drawInfo(final String message, final int color)
+ protected void drawInfo(@NotNull final String message, final int color)
{
crossfireServerConnection.drawInfo(message, color);
}
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -25,6 +25,7 @@
import com.realtime.crossfire.jxclient.window.GUICommandList;
import com.realtime.crossfire.jxclient.window.GuiManager;
import com.realtime.crossfire.jxclient.window.JXCWindow;
+import org.jetbrains.annotations.NotNull;
/**
* Implements the "bind" command. It associates a key with a command.
@@ -35,21 +36,25 @@
/**
* The windows to execute in.
*/
+ @NotNull
private final JXCWindow window;
/**
* The commands instance for executing commands.
*/
+ @NotNull
private final Commands commands;
/**
* The {@link GuiManager} to use.
*/
+ @NotNull
private final GuiManager guiManager;
/**
* The {@link Macros} instance to use.
*/
+ @NotNull
private final Macros macros;
/**
@@ -60,7 +65,7 @@
* @param guiManager the gui manager to use
* @param macros the macros instance to use
*/
- public BindCommand(final JXCWindow window, final CrossfireServerConnection crossfireServerConnection, final Commands commands, final GuiManager guiManager, final Macros macros)
+ public BindCommand(@NotNull final JXCWindow window, @NotNull final CrossfireServerConnection crossfireServerConnection, @NotNull final Commands commands, @NotNull final GuiManager guiManager, @NotNull final Macros macros)
{
super(crossfireServerConnection);
this.window = window;
@@ -78,7 +83,7 @@
/** {@inheritDoc} */
@Override
- public void execute(final String args)
+ public void execute(@NotNull final String args)
{
final String commandList;
final boolean perCharacterBinding;
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ClearCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -22,6 +22,7 @@
import com.realtime.crossfire.jxclient.gui.log.Buffer;
import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
import com.realtime.crossfire.jxclient.window.JXCWindowRenderer;
+import org.jetbrains.annotations.NotNull;
/**
* Implements the command "clear". It clears the active message window.
@@ -32,6 +33,7 @@
/**
* The {@link JXCWindowRenderer} to affect.
*/
+ @NotNull
private final JXCWindowRenderer windowRenderer;
/**
@@ -39,7 +41,7 @@
* @param windowRenderer the window renderer to affect
* @param crossfireServerConnection the connection instance
*/
- public ClearCommand(final JXCWindowRenderer windowRenderer, final CrossfireServerConnection crossfireServerConnection)
+ public ClearCommand(@NotNull final JXCWindowRenderer windowRenderer, @NotNull final CrossfireServerConnection crossfireServerConnection)
{
super(crossfireServerConnection);
this.windowRenderer = windowRenderer;
@@ -54,7 +56,7 @@
/** {@inheritDoc} */
@Override
- public void execute(final String args)
+ public void execute(@NotNull final String args)
{
if (args.length() != 0)
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Command.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -19,6 +19,8 @@
//
package com.realtime.crossfire.jxclient.commands;
+import org.jetbrains.annotations.NotNull;
+
/**
* Implements a client-side command.
*
@@ -38,5 +40,5 @@
*
* @param args The command arguments.
*/
- void execute(String args);
+ void execute(@NotNull String args);
}
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -30,6 +30,7 @@
import com.realtime.crossfire.jxclient.window.JXCWindowRenderer;
import java.util.HashMap;
import java.util.Map;
+import org.jetbrains.annotations.NotNull;
/**
* Parses and executes client-side commands.
@@ -41,11 +42,13 @@
/**
* The command queue for sending commands.
*/
+ @NotNull
private final CommandQueue commandQueue;
/**
* Maps command name to {@link Command} instance.
*/
+ @NotNull
private final Map<String, Command> commands = new HashMap<String, Command>();
/**
@@ -59,7 +62,7 @@
* @param guiManager the gui manager to use
* @param macros the macros instance to use
*/
- public Commands(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final ScriptManager scriptManager, final OptionManager optionManager, final GuiManager guiManager, final Macros macros)
+ public Commands(@NotNull final JXCWindow window, @NotNull final JXCWindowRenderer windowRenderer, @NotNull final CommandQueue commandQueue, @NotNull final CrossfireServerConnection crossfireServerConnection, @NotNull final ScriptManager scriptManager, @NotNull final OptionManager optionManager, @NotNull final GuiManager guiManager, @NotNull final Macros macros)
{
this.commandQueue = commandQueue;
commands.put("bind", new BindCommand(window, crossfireServerConnection, this, guiManager, macros));
@@ -82,7 +85,7 @@
*
* @param commands The commands to execute.
*/
- public void executeCommand(final CharSequence commands)
+ public void executeCommand(@NotNull final CharSequence commands)
{
String cmds = StringUtils.trimLeading(commands);
while (cmds.length() > 0)
@@ -110,7 +113,7 @@
*
* @return <code>true</code> if all remaining commands have been consumed.
*/
- private boolean execute(final String command, final String commandList)
+ private boolean execute(@NotNull final String command, @NotNull final String commandList)
{
if (command.length() <= 0)
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/DebugColorsCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -21,6 +21,7 @@
import com.realtime.crossfire.jxclient.gui.log.MessageBufferUpdater;
import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
+import org.jetbrains.annotations.NotNull;
/**
* Implements the "debug_colors" command. It prints text to the log window
@@ -33,7 +34,7 @@
* Creates a new instance.
* @param crossfireServerConnection the connection instance
*/
- public DebugColorsCommand(final CrossfireServerConnection crossfireServerConnection)
+ public DebugColorsCommand(@NotNull final CrossfireServerConnection crossfireServerConnection)
{
super(crossfireServerConnection);
}
@@ -47,7 +48,7 @@
/** {@inheritDoc} */
@Override
- public void execute(final String args)
+ public void execute(@NotNull final String args)
{
if (args.length() != 0)
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ExecCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -23,6 +23,7 @@
import com.realtime.crossfire.jxclient.skin.JXCSkinException;
import com.realtime.crossfire.jxclient.window.GUICommandList;
import com.realtime.crossfire.jxclient.window.GuiManager;
+import org.jetbrains.annotations.NotNull;
/**
* Implements the "exec" command. It runs a skin command.
@@ -33,6 +34,7 @@
/**
* The {@link GuiManager} for looking up commands.
*/
+ @NotNull
private final GuiManager guiManager;
/**
@@ -40,7 +42,7 @@
* @param guiManager the gui manager for looking up commands
* @param crossfireServerConnection the connection instance
*/
- public ExecCommand(final GuiManager guiManager, final CrossfireServerConnection crossfireServerConnection)
+ public ExecCommand(@NotNull final GuiManager guiManager, @NotNull final CrossfireServerConnection crossfireServerConnection)
{
super(crossfireServerConnection);
this.guiManager = guiManager;
@@ -55,7 +57,7 @@
/** {@inheritDoc} */
@Override
- public void execute(final String args)
+ public void execute(@NotNull final String args)
{
if (args.length() == 0)
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
/**
* Manages macro expansion in command strings.
@@ -36,26 +37,30 @@
/**
* The "reply_to" macro name.
*/
+ @NotNull
private static final String REPLY_TO = "reply_to";
/**
* The {@link Pattern} matching macro names.
*/
+ @NotNull
private final Pattern macroPattern = Pattern.compile("<<([a-z_]+)>>");
/**
* The macro expansions. Maps macro name to macro expansion.
*/
+ @NotNull
private final Map<String, String> expansions = new HashMap<String, String>();
/**
* The {@link CrossfireDrawextinfoListener} for tracking tells.
*/
+ @NotNull
private final CrossfireDrawextinfoListener crossfireDrawextinfoListener = new CrossfireDrawextinfoListener()
{
/** {@inheritDoc} */
@Override
- public void commandDrawextinfoReceived(final int color, final int type, final int subtype, final String message)
+ public void commandDrawextinfoReceived(final int color, final int type, final int subtype, @NotNull final String message)
{
switch (type)
{
@@ -102,7 +107,7 @@
* @param crossfireServerConnection the crossfire server connection to
* track
*/
- public Macros(final CrossfireServerConnection crossfireServerConnection)
+ public Macros(@NotNull final CrossfireServerConnection crossfireServerConnection)
{
expansions.put(REPLY_TO, "");
crossfireServerConnection.addCrossfireDrawextinfoListener(crossfireDrawextinfoListener);
@@ -113,7 +118,8 @@
* @param string the string to expand
* @return the expanded string
*/
- public String expandMacros(final String string)
+ @NotNull
+ public String expandMacros(@NotNull final String string)
{
StringBuilder result = null;
int index = 0;
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java 2009-10-23 23:45:11 UTC (rev 12212)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScreenshotCommand.java 2009-10-24 14:06:26 UTC (rev 12213)
@@ -29,6 +29,7 @@
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
+import org.jetbrains.annotations.NotNull;
/**
* Implements the "screenshot" command. It write the current window contents
@@ -52,11 +53,13 @@
/**
* The window to execute in.
*/
+ @NotNull
private final JXCWindow window;
/**
* The renderer to use.
*/
+ @NotNull
private final JXCWindowRenderer windowRenderer;
/**
@@ -65,7 +68,7 @@
* @param windowRenderer the renderer to use
* @param crossfireServerConnection the connection instance
*/
- public ScreenshotCommand(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CrossfireServerConnection crossfireServerConnection)
+ public ScreenshotCommand(@NotNull final JXCWindow window, @NotNull final JXCWindowRenderer windowRenderer, @NotNull final CrossfireServerConnection crossfireServerConnection)
{
super(crossfireServerConnection);
this.window = window;
@@ -81,7 +84,7 @@
/** {@inheritDoc} */
@Override
- public void execute(final String args)
+ public void execute(@NotNull final String args)
{
final File file;
if (args.length() == 0)
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/ScriptCommand.java
===================================================================
--- jxclient/trunk/src/...
[truncated message content] |
