aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-06-01 19:27:12 +0200
committerPacien TRAN-GIRARD2014-06-01 19:27:12 +0200
commit5b7c510ce0751a696a309a60c4fc281ff523da32 (patch)
tree3d8fb155436d6ca8e825e9c3d33ee9e84464dd1e /src
parent5fb9aef73b75cfc2c60c6566789f9cfe7c370059 (diff)
downloadesieequest-5b7c510ce0751a696a309a60c4fc281ff523da32.tar.gz
Refactor UI components
Diffstat (limited to 'src')
-rwxr-xr-xsrc/esieequest/Main.java8
-rw-r--r--src/esieequest/engine/GameEngine.java14
-rw-r--r--src/esieequest/engine/audioplayer/AudioPlayer.java31
-rw-r--r--src/esieequest/engine/audioplayer/BrowserAudioPlayer.java46
-rw-r--r--src/esieequest/engine/audioplayer/SysAudioPlayer.java77
-rw-r--r--src/esieequest/engine/audioplayer/package-info.java6
-rw-r--r--src/esieequest/engine/commands/AleaCommand.java4
-rw-r--r--src/esieequest/engine/commands/BackCommand.java4
-rw-r--r--src/esieequest/engine/commands/Command.java8
-rw-r--r--src/esieequest/engine/commands/DoCommand.java4
-rw-r--r--src/esieequest/engine/commands/DropCommand.java4
-rw-r--r--src/esieequest/engine/commands/Executable.java4
-rw-r--r--src/esieequest/engine/commands/GoCommand.java4
-rw-r--r--src/esieequest/engine/commands/HelpCommand.java4
-rw-r--r--src/esieequest/engine/commands/InventoryCommand.java4
-rw-r--r--src/esieequest/engine/commands/LoadCommand.java6
-rw-r--r--src/esieequest/engine/commands/LookCommand.java4
-rw-r--r--src/esieequest/engine/commands/NewCommand.java6
-rw-r--r--src/esieequest/engine/commands/QuitCommand.java4
-rw-r--r--src/esieequest/engine/commands/SaveCommand.java6
-rw-r--r--src/esieequest/engine/commands/TakeCommand.java4
-rw-r--r--src/esieequest/engine/commands/TalkCommand.java4
-rw-r--r--src/esieequest/engine/commands/ToggleSoundCommand.java6
-rw-r--r--src/esieequest/engine/commands/TurnCommand.java4
-rw-r--r--src/esieequest/engine/commands/UseCommand.java4
-rw-r--r--src/esieequest/engine/datastore/BrowserDataStore.java37
-rw-r--r--src/esieequest/engine/datastore/DataStore.java33
-rw-r--r--src/esieequest/engine/datastore/FileDataStore.java39
-rw-r--r--src/esieequest/engine/datastore/package-info.java6
-rw-r--r--src/esieequest/engine/scheduler/Callback.java (renamed from src/esieequest/game/states/Callback.java)2
-rw-r--r--src/esieequest/engine/scheduler/JSScheduler.java52
-rw-r--r--src/esieequest/engine/scheduler/Scheduler.java36
-rw-r--r--src/esieequest/engine/scheduler/SysScheduler.java61
-rw-r--r--src/esieequest/engine/scheduler/package-info.java6
-rw-r--r--src/esieequest/esieequest.gwt.xml2
-rw-r--r--src/esieequest/game/characters/Athanase.java4
-rw-r--r--src/esieequest/game/characters/Character.java4
-rw-r--r--src/esieequest/game/characters/SimpleCharacter.java4
-rw-r--r--src/esieequest/game/characters/Sumobot.java6
-rw-r--r--src/esieequest/game/doors/Door.java4
-rw-r--r--src/esieequest/game/doors/LockedDoor.java4
-rw-r--r--src/esieequest/game/doors/TrapDoor.java4
-rw-r--r--src/esieequest/game/items/Banana.java4
-rw-r--r--src/esieequest/game/items/Beamer.java4
-rw-r--r--src/esieequest/game/items/Disk.java6
-rw-r--r--src/esieequest/game/items/Item.java4
-rw-r--r--src/esieequest/game/items/Note.java4
-rw-r--r--src/esieequest/game/items/PortableConsole.java4
-rw-r--r--src/esieequest/game/items/SimpleItem.java4
-rw-r--r--src/esieequest/ui/View.java (renamed from src/esieequest/ui/Viewable.java)71
-rw-r--r--src/esieequest/ui/rich/RichInterface.java85
-rw-r--r--src/esieequest/ui/rich/UserInterface.java707
-rw-r--r--src/esieequest/ui/rich/app/AppInterface.java244
-rw-r--r--src/esieequest/ui/rich/app/Applet.java (renamed from src/esieequest/ui/rich/Applet.java)7
-rw-r--r--src/esieequest/ui/rich/app/Layout.java371
-rw-r--r--src/esieequest/ui/rich/app/Window.java (renamed from src/esieequest/ui/rich/Window.java)6
-rw-r--r--src/esieequest/ui/rich/app/package-info.java5
-rw-r--r--src/esieequest/ui/rich/package-info.java7
-rw-r--r--src/esieequest/ui/rich/web/Layout.java238
-rw-r--r--src/esieequest/ui/rich/web/Layout.ui.xml (renamed from src/esieequest/ui/web/WebInterface.ui.xml)0
-rw-r--r--src/esieequest/ui/rich/web/Main.java (renamed from src/esieequest/ui/web/Main.java)2
-rw-r--r--src/esieequest/ui/rich/web/WebInterface.java164
-rw-r--r--src/esieequest/ui/rich/web/package-info.java (renamed from src/esieequest/ui/web/package-info.java)2
-rw-r--r--src/esieequest/ui/text/Console.java2
-rw-r--r--src/esieequest/ui/text/FileReader.java2
-rw-r--r--src/esieequest/ui/text/TextInterface.java60
-rw-r--r--src/esieequest/ui/web/WebInterface.java491
67 files changed, 1686 insertions, 1382 deletions
diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index c755741..dd548f1 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -6,9 +6,9 @@ import java.util.List;
6import javax.swing.JApplet; 6import javax.swing.JApplet;
7 7
8import esieequest.engine.GameEngine; 8import esieequest.engine.GameEngine;
9import esieequest.ui.Viewable; 9import esieequest.ui.View;
10import esieequest.ui.rich.Applet; 10import esieequest.ui.rich.app.Applet;
11import esieequest.ui.rich.Window; 11import esieequest.ui.rich.app.Window;
12import esieequest.ui.text.Console; 12import esieequest.ui.text.Console;
13import esieequest.ui.text.FileReader; 13import esieequest.ui.text.FileReader;
14 14
@@ -45,7 +45,7 @@ public class Main extends JApplet {
45 */ 45 */
46 public static void main(final String[] args) { 46 public static void main(final String[] args) {
47 final List<String> arguments = Arrays.asList(args); 47 final List<String> arguments = Arrays.asList(args);
48 Viewable view; 48 View view;
49 49
50 if (arguments.contains("--file")) { 50 if (arguments.contains("--file")) {
51 if (arguments.size() < 2) { 51 if (arguments.size() < 2) {
diff --git a/src/esieequest/engine/GameEngine.java b/src/esieequest/engine/GameEngine.java
index 573d3a8..9211eb0 100644
--- a/src/esieequest/engine/GameEngine.java
+++ b/src/esieequest/engine/GameEngine.java
@@ -1,15 +1,15 @@
1package esieequest.engine; 1package esieequest.engine;
2 2
3import esieequest.engine.commands.Command; 3import esieequest.engine.commands.Command;
4import esieequest.engine.scheduler.Callback;
4import esieequest.game.Game; 5import esieequest.game.Game;
5import esieequest.game.Text; 6import esieequest.game.Text;
6import esieequest.game.characters.MovingCharacter; 7import esieequest.game.characters.MovingCharacter;
7import esieequest.game.items.Beamer; 8import esieequest.game.items.Beamer;
8import esieequest.game.items.Item; 9import esieequest.game.items.Item;
9import esieequest.game.map.Room; 10import esieequest.game.map.Room;
10import esieequest.game.states.Callback;
11import esieequest.game.states.Scene; 11import esieequest.game.states.Scene;
12import esieequest.ui.Viewable; 12import esieequest.ui.View;
13 13
14/** 14/**
15 * The game main controller class. 15 * The game main controller class.
@@ -20,7 +20,7 @@ import esieequest.ui.Viewable;
20public class GameEngine { 20public class GameEngine {
21 21
22 private final Game game; 22 private final Game game;
23 private final Viewable view; 23 private final View view;
24 24
25 /** 25 /**
26 * Instantiates a game engine with the given model and view. 26 * Instantiates a game engine with the given model and view.
@@ -30,11 +30,11 @@ public class GameEngine {
30 * @param view 30 * @param view
31 * the view 31 * the view
32 */ 32 */
33 public GameEngine(final Viewable view, final Game game) { 33 public GameEngine(final View view, final Game game) {
34 this.game = game; 34 this.game = game;
35 this.view = view; 35 this.view = view;
36 36
37 this.view.setController(this); 37 this.view.setGameEngine(this);
38 38
39 this.view.show(); 39 this.view.show();
40 } 40 }
@@ -47,7 +47,7 @@ public class GameEngine {
47 * @param challengeMode 47 * @param challengeMode
48 * the mode 48 * the mode
49 */ 49 */
50 public GameEngine(final Viewable view, final boolean challengeMode) { 50 public GameEngine(final View view, final boolean challengeMode) {
51 this(view, new Game(challengeMode)); 51 this(view, new Game(challengeMode));
52 } 52 }
53 53
@@ -57,7 +57,7 @@ public class GameEngine {
57 * @param view 57 * @param view
58 * the view 58 * the view
59 */ 59 */
60 public GameEngine(final Viewable view) { 60 public GameEngine(final View view) {
61 this(view, false); 61 this(view, false);
62 } 62 }
63 63
diff --git a/src/esieequest/engine/audioplayer/AudioPlayer.java b/src/esieequest/engine/audioplayer/AudioPlayer.java
new file mode 100644
index 0000000..3b65ec5
--- /dev/null
+++ b/src/esieequest/engine/audioplayer/AudioPlayer.java
@@ -0,0 +1,31 @@
1package esieequest.engine.audioplayer;
2
3/**
4 * The audio player adapter interface.
5 *
6 * @author Pacien TRAN-GIRARD
7 */
8public interface AudioPlayer {
9