From 1f4c3072310613facdbe318098762e79a1ed6970 Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Thu, 29 May 2014 01:21:28 +0200 Subject: Reorganise packages --- build.xml | 9 +- res/res/img/placeholder.jpg | Bin 77504 -> 0 bytes res/res/img/placeholder.svg | 725 --------------------- res/res/snd/END.ogg | Bin 1155224 -> 0 bytes res/res/snd/FEED_ATHANASE.ogg | Bin 513150 -> 0 bytes res/res/snd/FIND_CONSOLE.ogg | Bin 1627908 -> 0 bytes res/res/snd/FIND_DISK.ogg | Bin 969007 -> 0 bytes res/res/snd/GAME_LOST.ogg | Bin 1849460 -> 0 bytes res/res/snd/INSTALL_CONSOLE.ogg | Bin 1719262 -> 0 bytes res/res/snd/INTRO.ogg | Bin 923189 -> 0 bytes res/res/snd/RUN_CONSOLE.ogg | Bin 121718 -> 0 bytes res/res/snd/WHAT_HAPPENED.ogg | Bin 2019139 -> 0 bytes res/resources/audio/END.ogg | Bin 0 -> 1155224 bytes res/resources/audio/FEED_ATHANASE.ogg | Bin 0 -> 513150 bytes res/resources/audio/FIND_CONSOLE.ogg | Bin 0 -> 1627908 bytes res/resources/audio/FIND_DISK.ogg | Bin 0 -> 969007 bytes res/resources/audio/GAME_LOST.ogg | Bin 0 -> 1849460 bytes res/resources/audio/INSTALL_CONSOLE.ogg | Bin 0 -> 1719262 bytes res/resources/audio/INTRO.ogg | Bin 0 -> 923189 bytes res/resources/audio/RUN_CONSOLE.ogg | Bin 0 -> 121718 bytes res/resources/audio/WHAT_HAPPENED.ogg | Bin 0 -> 2019139 bytes res/resources/images/placeholder.jpg | Bin 0 -> 77504 bytes res/resources/images/placeholder.svg | 725 +++++++++++++++++++++ src/esieequest/Main.java | 12 +- src/esieequest/controller/Callback.java | 15 - src/esieequest/controller/GameEngine.java | 113 ---- src/esieequest/controller/Input.java | 48 -- .../controller/commands/AleaCommand.java | 39 -- .../controller/commands/BackCommand.java | 30 - src/esieequest/controller/commands/Command.java | 101 --- src/esieequest/controller/commands/DoCommand.java | 40 -- .../controller/commands/DropCommand.java | 41 -- src/esieequest/controller/commands/Executable.java | 25 - src/esieequest/controller/commands/GoCommand.java | 61 -- .../controller/commands/HelpCommand.java | 26 - .../controller/commands/InventoryCommand.java | 27 - .../controller/commands/LoadCommand.java | 60 -- .../controller/commands/LookCommand.java | 36 - src/esieequest/controller/commands/NewCommand.java | 41 -- .../controller/commands/QuitCommand.java | 28 - .../controller/commands/SaveCommand.java | 29 - .../controller/commands/TakeCommand.java | 67 -- .../controller/commands/TalkCommand.java | 46 -- .../controller/commands/ToggleSoundCommand.java | 26 - .../controller/commands/TurnCommand.java | 45 -- src/esieequest/controller/commands/UseCommand.java | 35 - .../controller/commands/package-info.java | 4 - src/esieequest/controller/package-info.java | 5 - src/esieequest/controller/utils/EnumUtils.java | 162 ----- src/esieequest/controller/utils/ListUtils.java | 44 -- .../controller/utils/SerialisableList.java | 27 - .../controller/utils/SerialisableObject.java | 27 - src/esieequest/controller/utils/package-info.java | 5 - src/esieequest/engine/Callback.java | 15 + src/esieequest/engine/GameEngine.java | 113 ++++ src/esieequest/engine/Input.java | 48 ++ src/esieequest/engine/commands/AleaCommand.java | 39 ++ src/esieequest/engine/commands/BackCommand.java | 30 + src/esieequest/engine/commands/Command.java | 101 +++ src/esieequest/engine/commands/DoCommand.java | 40 ++ src/esieequest/engine/commands/DropCommand.java | 41 ++ src/esieequest/engine/commands/Executable.java | 25 + src/esieequest/engine/commands/GoCommand.java | 61 ++ src/esieequest/engine/commands/HelpCommand.java | 26 + .../engine/commands/InventoryCommand.java | 27 + src/esieequest/engine/commands/LoadCommand.java | 60 ++ src/esieequest/engine/commands/LookCommand.java | 36 + src/esieequest/engine/commands/NewCommand.java | 41 ++ src/esieequest/engine/commands/QuitCommand.java | 28 + src/esieequest/engine/commands/SaveCommand.java | 29 + src/esieequest/engine/commands/TakeCommand.java | 67 ++ src/esieequest/engine/commands/TalkCommand.java | 46 ++ .../engine/commands/ToggleSoundCommand.java | 26 + src/esieequest/engine/commands/TurnCommand.java | 45 ++ src/esieequest/engine/commands/UseCommand.java | 35 + src/esieequest/engine/commands/package-info.java | 4 + src/esieequest/engine/package-info.java | 5 + src/esieequest/engine/utils/EnumUtils.java | 162 +++++ src/esieequest/engine/utils/ListUtils.java | 44 ++ src/esieequest/engine/utils/SerialisableList.java | 27 + .../engine/utils/SerialisableObject.java | 27 + src/esieequest/engine/utils/package-info.java | 5 + src/esieequest/esieequest.gwt.xml | 12 +- src/esieequest/game/Game.java | 248 +++++++ src/esieequest/game/Player.java | 186 ++++++ src/esieequest/game/Text.java | 152 +++++ src/esieequest/game/characters/Athanase.java | 82 +++ src/esieequest/game/characters/Character.java | 75 +++ .../game/characters/FollowingCharacter.java | 52 ++ .../game/characters/MovingCharacter.java | 137 ++++ .../game/characters/SimpleCharacter.java | 49 ++ src/esieequest/game/characters/Sumobot.java | 58 ++ .../game/characters/WanderingCharacter.java | 52 ++ src/esieequest/game/characters/package-info.java | 5 + src/esieequest/game/doors/Door.java | 43 ++ src/esieequest/game/doors/HiddenDoor.java | 22 + src/esieequest/game/doors/LockedDoor.java | 54 ++ src/esieequest/game/doors/TransporterDoor.java | 54 ++ src/esieequest/game/doors/TrapDoor.java | 32 + src/esieequest/game/doors/package-info.java | 4 + src/esieequest/game/items/Banana.java | 25 + src/esieequest/game/items/Beamer.java | 68 ++ src/esieequest/game/items/Disk.java | 55 ++ src/esieequest/game/items/Inventory.java | 214 ++++++ src/esieequest/game/items/Item.java | 107 +++ src/esieequest/game/items/Note.java | 34 + src/esieequest/game/items/PortableConsole.java | 42 ++ src/esieequest/game/items/SimpleItem.java | 88 +++ src/esieequest/game/items/package-info.java | 5 + src/esieequest/game/map/Direction.java | 80 +++ src/esieequest/game/map/Orientation.java | 17 + src/esieequest/game/map/Room.java | 361 ++++++++++ src/esieequest/game/map/Side.java | 85 +++ src/esieequest/game/map/package-info.java | 5 + src/esieequest/game/package-info.java | 5 + src/esieequest/game/states/Quest.java | 33 + src/esieequest/game/states/Scene.java | 50 ++ src/esieequest/game/states/package-info.java | 5 + src/esieequest/model/Game.java | 248 ------- src/esieequest/model/Player.java | 186 ------ src/esieequest/model/Text.java | 152 ----- src/esieequest/model/characters/Athanase.java | 82 --- src/esieequest/model/characters/Character.java | 75 --- .../model/characters/FollowingCharacter.java | 52 -- .../model/characters/MovingCharacter.java | 137 ---- .../model/characters/SimpleCharacter.java | 49 -- src/esieequest/model/characters/Sumobot.java | 58 -- .../model/characters/WanderingCharacter.java | 52 -- src/esieequest/model/characters/package-info.java | 5 - src/esieequest/model/doors/Door.java | 43 -- src/esieequest/model/doors/HiddenDoor.java | 22 - src/esieequest/model/doors/LockedDoor.java | 54 -- src/esieequest/model/doors/TransporterDoor.java | 54 -- src/esieequest/model/doors/TrapDoor.java | 32 - src/esieequest/model/doors/package-info.java | 4 - src/esieequest/model/events/Quest.java | 33 - src/esieequest/model/events/Scene.java | 50 -- src/esieequest/model/events/package-info.java | 5 - src/esieequest/model/items/Banana.java | 25 - src/esieequest/model/items/Beamer.java | 68 -- src/esieequest/model/items/Disk.java | 55 -- src/esieequest/model/items/Inventory.java | 214 ------ src/esieequest/model/items/Item.java | 107 --- src/esieequest/model/items/Note.java | 34 - src/esieequest/model/items/PortableConsole.java | 42 -- src/esieequest/model/items/SimpleItem.java | 88 --- src/esieequest/model/items/package-info.java | 5 - src/esieequest/model/map/Direction.java | 80 --- src/esieequest/model/map/Orientation.java | 17 - src/esieequest/model/map/Room.java | 361 ---------- src/esieequest/model/map/Side.java | 85 --- src/esieequest/model/map/package-info.java | 5 - src/esieequest/model/package-info.java | 5 - src/esieequest/ui/Viewable.java | 116 ++++ src/esieequest/ui/package-info.java | 5 + src/esieequest/ui/rich/Applet.java | 28 + src/esieequest/ui/rich/UserInterface.java | 698 ++++++++++++++++++++ src/esieequest/ui/rich/Window.java | 32 + src/esieequest/ui/rich/package-info.java | 5 + src/esieequest/ui/text/Console.java | 25 + src/esieequest/ui/text/FileReader.java | 47 ++ src/esieequest/ui/text/TextInterface.java | 144 ++++ src/esieequest/ui/text/package-info.java | 5 + src/esieequest/ui/web/Main.java | 26 + src/esieequest/ui/web/WebInterface.java | 478 ++++++++++++++ src/esieequest/ui/web/WebInterface.ui.xml | 89 +++ src/esieequest/ui/web/package-info.java | 5 + src/esieequest/view/Viewable.java | 116 ---- src/esieequest/view/app/Applet.java | 28 - src/esieequest/view/app/UserInterface.java | 698 -------------------- src/esieequest/view/app/Window.java | 32 - src/esieequest/view/app/package-info.java | 5 - src/esieequest/view/package-info.java | 5 - src/esieequest/view/text/Console.java | 25 - src/esieequest/view/text/FileReader.java | 47 -- src/esieequest/view/text/TextInterface.java | 144 ---- src/esieequest/view/text/package-info.java | 5 - src/esieequest/view/web/Main.java | 26 - src/esieequest/view/web/WebInterface.java | 478 -------------- src/esieequest/view/web/WebInterface.ui.xml | 89 --- src/esieequest/view/web/package-info.java | 5 - 181 files changed, 6285 insertions(+), 6278 deletions(-) delete mode 100644 res/res/img/placeholder.jpg delete mode 100644 res/res/img/placeholder.svg delete mode 100644 res/res/snd/END.ogg delete mode 100644 res/res/snd/FEED_ATHANASE.ogg delete mode 100644 res/res/snd/FIND_CONSOLE.ogg delete mode 100644 res/res/snd/FIND_DISK.ogg delete mode 100644 res/res/snd/GAME_LOST.ogg delete mode 100644 res/res/snd/INSTALL_CONSOLE.ogg delete mode 100644 res/res/snd/INTRO.ogg delete mode 100644 res/res/snd/RUN_CONSOLE.ogg delete mode 100644 res/res/snd/WHAT_HAPPENED.ogg create mode 100644 res/resources/audio/END.ogg create mode 100644 res/resources/audio/FEED_ATHANASE.ogg create mode 100644 res/resources/audio/FIND_CONSOLE.ogg create mode 100644 res/resources/audio/FIND_DISK.ogg create mode 100644 res/resources/audio/GAME_LOST.ogg create mode 100644 res/resources/audio/INSTALL_CONSOLE.ogg create mode 100644 res/resources/audio/INTRO.ogg create mode 100644 res/resources/audio/RUN_CONSOLE.ogg create mode 100644 res/resources/audio/WHAT_HAPPENED.ogg create mode 100644 res/resources/images/placeholder.jpg create mode 100644 res/resources/images/placeholder.svg delete mode 100644 src/esieequest/controller/Callback.java delete mode 100644 src/esieequest/controller/GameEngine.java delete mode 100644 src/esieequest/controller/Input.java delete mode 100644 src/esieequest/controller/commands/AleaCommand.java delete mode 100644 src/esieequest/controller/commands/BackCommand.java delete mode 100644 src/esieequest/controller/commands/Command.java delete mode 100644 src/esieequest/controller/commands/DoCommand.java delete mode 100644 src/esieequest/controller/commands/DropCommand.java delete mode 100644 src/esieequest/controller/commands/Executable.java delete mode 100644 src/esieequest/controller/commands/GoCommand.java delete mode 100644 src/esieequest/controller/commands/HelpCommand.java delete mode 100644 src/esieequest/controller/commands/InventoryCommand.java delete mode 100644 src/esieequest/controller/commands/LoadCommand.java delete mode 100644 src/esieequest/controller/commands/LookCommand.java delete mode 100644 src/esieequest/controller/commands/NewCommand.java delete mode 100644 src/esieequest/controller/commands/QuitCommand.java delete mode 100644 src/esieequest/controller/commands/SaveCommand.java delete mode 100644 src/esieequest/controller/commands/TakeCommand.java delete mode 100644 src/esieequest/controller/commands/TalkCommand.java delete mode 100644 src/esieequest/controller/commands/ToggleSoundCommand.java delete mode 100644 src/esieequest/controller/commands/TurnCommand.java delete mode 100644 src/esieequest/controller/commands/UseCommand.java delete mode 100644 src/esieequest/controller/commands/package-info.java delete mode 100644 src/esieequest/controller/package-info.java delete mode 100644 src/esieequest/controller/utils/EnumUtils.java delete mode 100644 src/esieequest/controller/utils/ListUtils.java delete mode 100644 src/esieequest/controller/utils/SerialisableList.java delete mode 100644 src/esieequest/controller/utils/SerialisableObject.java delete mode 100644 src/esieequest/controller/utils/package-info.java create mode 100644 src/esieequest/engine/Callback.java create mode 100644 src/esieequest/engine/GameEngine.java create mode 100644 src/esieequest/engine/Input.java create mode 100644 src/esieequest/engine/commands/AleaCommand.java create mode 100644 src/esieequest/engine/commands/BackCommand.java create mode 100644 src/esieequest/engine/commands/Command.java create mode 100644 src/esieequest/engine/commands/DoCommand.java create mode 100644 src/esieequest/engine/commands/DropCommand.java create mode 100644 src/esieequest/engine/commands/Executable.java create mode 100644 src/esieequest/engine/commands/GoCommand.java create mode 100644 src/esieequest/engine/commands/HelpCommand.java create mode 100644 src/esieequest/engine/commands/InventoryCommand.java create mode 100644 src/esieequest/engine/commands/LoadCommand.java create mode 100644 src/esieequest/engine/commands/LookCommand.java create mode 100644 src/esieequest/engine/commands/NewCommand.java create mode 100644 src/esieequest/engine/commands/QuitCommand.java create mode 100644 src/esieequest/engine/commands/SaveCommand.java create mode 100644 src/esieequest/engine/commands/TakeCommand.java create mode 100644 src/esieequest/engine/commands/TalkCommand.java create mode 100644 src/esieequest/engine/commands/ToggleSoundCommand.java create mode 100644 src/esieequest/engine/commands/TurnCommand.java create mode 100644 src/esieequest/engine/commands/UseCommand.java create mode 100644 src/esieequest/engine/commands/package-info.java create mode 100644 src/esieequest/engine/package-info.java create mode 100644 src/esieequest/engine/utils/EnumUtils.java create mode 100644 src/esieequest/engine/utils/ListUtils.java create mode 100644 src/esieequest/engine/utils/SerialisableList.java create mode 100644 src/esieequest/engine/utils/SerialisableObject.java create mode 100644 src/esieequest/engine/utils/package-info.java create mode 100644 src/esieequest/game/Game.java create mode 100644 src/esieequest/game/Player.java create mode 100644 src/esieequest/game/Text.java create mode 100644 src/esieequest/game/characters/Athanase.java create mode 100644 src/esieequest/game/characters/Character.java create mode 100644 src/esieequest/game/characters/FollowingCharacter.java create mode 100644 src/esieequest/game/characters/MovingCharacter.java create mode 100644 src/esieequest/game/characters/SimpleCharacter.java create mode 100644 src/esieequest/game/characters/Sumobot.java create mode 100644 src/esieequest/game/characters/WanderingCharacter.java create mode 100644 src/esieequest/game/characters/package-info.java create mode 100644 src/esieequest/game/doors/Door.java create mode 100644 src/esieequest/game/doors/HiddenDoor.java create mode 100644 src/esieequest/game/doors/LockedDoor.java create mode 100644 src/esieequest/game/doors/TransporterDoor.java create mode 100644 src/esieequest/game/doors/TrapDoor.java create mode 100644 src/esieequest/game/doors/package-info.java create mode 100644 src/esieequest/game/items/Banana.java create mode 100644 src/esieequest/game/items/Beamer.java create mode 100644 src/esieequest/game/items/Disk.java create mode 100644 src/esieequest/game/items/Inventory.java create mode 100644 src/esieequest/game/items/Item.java create mode 100644 src/esieequest/game/items/Note.java create mode 100644 src/esieequest/game/items/PortableConsole.java create mode 100644 src/esieequest/game/items/SimpleItem.java create mode 100644 src/esieequest/game/items/package-info.java create mode 100644 src/esieequest/game/map/Direction.java create mode 100644 src/esieequest/game/map/Orientation.java create mode 100644 src/esieequest/game/map/Room.java create mode 100644 src/esieequest/game/map/Side.java create mode 100644 src/esieequest/game/map/package-info.java create mode 100644 src/esieequest/game/package-info.java create mode 100644 src/esieequest/game/states/Quest.java create mode 100644 src/esieequest/game/states/Scene.java create mode 100644 src/esieequest/game/states/package-info.java delete mode 100644 src/esieequest/model/Game.java delete mode 100644 src/esieequest/model/Player.java delete mode 100644 src/esieequest/model/Text.java delete mode 100644 src/esieequest/model/characters/Athanase.java delete mode 100644 src/esieequest/model/characters/Character.java delete mode 100644 src/esieequest/model/characters/FollowingCharacter.java delete mode 100644 src/esieequest/model/characters/MovingCharacter.java delete mode 100644 src/esieequest/model/characters/SimpleCharacter.java delete mode 100644 src/esieequest/model/characters/Sumobot.java delete mode 100644 src/esieequest/model/characters/WanderingCharacter.java delete mode 100644 src/esieequest/model/characters/package-info.java delete mode 100644 src/esieequest/model/doors/Door.java delete mode 100644 src/esieequest/model/doors/HiddenDoor.java delete mode 100644 src/esieequest/model/doors/LockedDoor.java delete mode 100644 src/esieequest/model/doors/TransporterDoor.java delete mode 100644 src/esieequest/model/doors/TrapDoor.java delete mode 100644 src/esieequest/model/doors/package-info.java delete mode 100644 src/esieequest/model/events/Quest.java delete mode 100644 src/esieequest/model/events/Scene.java delete mode 100644 src/esieequest/model/events/package-info.java delete mode 100644 src/esieequest/model/items/Banana.java delete mode 100644 src/esieequest/model/items/Beamer.java delete mode 100644 src/esieequest/model/items/Disk.java delete mode 100644 src/esieequest/model/items/Inventory.java delete mode 100644 src/esieequest/model/items/Item.java delete mode 100644 src/esieequest/model/items/Note.java delete mode 100644 src/esieequest/model/items/PortableConsole.java delete mode 100644 src/esieequest/model/items/SimpleItem.java delete mode 100644 src/esieequest/model/items/package-info.java delete mode 100644 src/esieequest/model/map/Direction.java delete mode 100644 src/esieequest/model/map/Orientation.java delete mode 100644 src/esieequest/model/map/Room.java delete mode 100644 src/esieequest/model/map/Side.java delete mode 100644 src/esieequest/model/map/package-info.java delete mode 100644 src/esieequest/model/package-info.java create mode 100644 src/esieequest/ui/Viewable.java create mode 100644 src/esieequest/ui/package-info.java create mode 100644 src/esieequest/ui/rich/Applet.java create mode 100644 src/esieequest/ui/rich/UserInterface.java create mode 100644 src/esieequest/ui/rich/Window.java create mode 100644 src/esieequest/ui/rich/package-info.java create mode 100644 src/esieequest/ui/text/Console.java create mode 100644 src/esieequest/ui/text/FileReader.java create mode 100644 src/esieequest/ui/text/TextInterface.java create mode 100644 src/esieequest/ui/text/package-info.java create mode 100644 src/esieequest/ui/web/Main.java create mode 100644 src/esieequest/ui/web/WebInterface.java create mode 100644 src/esieequest/ui/web/WebInterface.ui.xml create mode 100644 src/esieequest/ui/web/package-info.java delete mode 100644 src/esieequest/view/Viewable.java delete mode 100644 src/esieequest/view/app/Applet.java delete mode 100644 src/esieequest/view/app/UserInterface.java delete mode 100644 src/esieequest/view/app/Window.java delete mode 100644 src/esieequest/view/app/package-info.java delete mode 100644 src/esieequest/view/package-info.java delete mode 100644 src/esieequest/view/text/Console.java delete mode 100644 src/esieequest/view/text/FileReader.java delete mode 100644 src/esieequest/view/text/TextInterface.java delete mode 100644 src/esieequest/view/text/package-info.java delete mode 100644 src/esieequest/view/web/Main.java delete mode 100644 src/esieequest/view/web/WebInterface.java delete mode 100644 src/esieequest/view/web/WebInterface.ui.xml delete mode 100644 src/esieequest/view/web/package-info.java diff --git a/build.xml b/build.xml index 1f76860..829d4f5 100644 --- a/build.xml +++ b/build.xml @@ -28,6 +28,13 @@ + + + + + + + @@ -38,7 +45,7 @@ - + diff --git a/res/res/img/placeholder.jpg b/res/res/img/placeholder.jpg deleted file mode 100644 index a837f76..0000000 Binary files a/res/res/img/placeholder.jpg and /dev/null differ diff --git a/res/res/img/placeholder.svg b/res/res/img/placeholder.svg deleted file mode 100644 index 679edec..0000000 --- a/res/res/img/placeholder.svg +++ /dev/null @@ -1,725 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -