Browse code

fix gwt build

devnewton authored on 23/07/2014 at 14:56:01
Showing 11 changed files
... ...
@@ -40,9 +40,10 @@ import im.bci.jnuit.widgets.Widget;
40 40
  * @author devnewton
41 41
  */
42 42
 public class CutScenesMenu extends Stack {
43
-    
44
-     final Container menu;
45
-    CutScenesMenu(final NuitToolkit toolkit, final Root root, final Widget extrasMenu, final IAssets assets, final CutScenes cutScenes) {
43
+
44
+    private final Container menu;
45
+
46
+    public CutScenesMenu(final NuitToolkit toolkit, final Root root, final Widget extrasMenu, final IAssets assets, final CutScenes cutScenes) {
46 47
         menu = new Container();
47 48
         menu.setBackground(new TexturedBackground(assets.getAnimations("background.png").getFirst().start(PlayMode.LOOP)));
48 49
         IAnimation buttonBackgroundAnimation = assets.getAnimations("menu_buttons.json").getAnimationByName("1_normal");
... ...
@@ -66,7 +67,7 @@ public class CutScenesMenu extends Stack {
66 66
         cutscenesButton.setFocusedBackground(new TexturedBackground(buttonFocusedBackgroundAnimation.start(PlayMode.LOOP)));
67 67
         cutscenesButton.setFocusCursor(NullFocusCursor.INSTANCE);
68 68
         menu.add(cutscenesButton);
69
-        
69
+
70 70
         final Button creditsButton = new Button(toolkit, "cutscenes.menu.button.credits") {
71 71
             @Override
72 72
             public void onOK() {
... ...
@@ -102,7 +103,7 @@ public class CutScenesMenu extends Stack {
102 102
         menu.add(backButton);
103 103
         show(menu);
104 104
     }
105
-    
105
+
106 106
     class CutScenesMenuDialog extends NedDialogue {
107 107
 
108 108
         public CutScenesMenuDialog(NuitToolkit toolkit, IAssets assets) {
... ...
@@ -114,7 +115,7 @@ public class CutScenesMenu extends Stack {
114 114
             CutScenesMenu.this.remove(this);
115 115
             CutScenesMenu.this.show(menu);
116 116
         }
117
-        
117
+
118 118
     }
119 119
 
120 120
 }
... ...
@@ -31,7 +31,6 @@ import com.artemis.utils.Bag;
31 31
 import com.artemis.utils.ImmutableBag;
32 32
 import im.bci.jnuit.animation.IAnimationFrame;
33 33
 import im.bci.jnuit.animation.IPlay;
34
-import im.bci.jnuit.artemis.sprite.Sprite;
35 34
 import im.bci.jnuit.playn.animation.PlaynAnimationImage;
36 35
 import org.geekygoblin.nedetlesmaki.core.components.LevelBackground;
37 36
 import playn.core.ImmediateLayer;
... ...
@@ -115,6 +115,13 @@
115 115
                 <groupId>org.codehaus.mojo</groupId>
116 116
                 <artifactId>gwt-maven-plugin</artifactId>
117 117
                 <version>${gwt.version}</version>
118
+                <configuration>
119
+                    <failOnError>true</failOnError>
120
+                    <enableClosureCompiler>true</enableClosureCompiler>
121
+                    <disableClassMetadata>false</disableClassMetadata>
122
+                    <disableCastChecking>true</disableCastChecking>
123
+                    <style>PRETTY</style>
124
+                </configuration>
118 125
                 <executions>
119 126
                     <execution>
120 127
                         <phase>prepare-package</phase>
... ...
@@ -127,20 +134,19 @@
127 127
 
128 128
             <!-- allows testing of HTML backend via: mvn integration-test -Phtml -->
129 129
             <plugin>
130
-                <groupId>org.mortbay.jetty</groupId>
131
-                <artifactId>jetty-maven-plugin</artifactId>
132
-                <version>8.0.0.v20110901</version>
130
+                <groupId>org.apache.tomcat.maven</groupId>
131
+                <artifactId>tomcat7-maven-plugin</artifactId>
132
+                <version>2.2</version>
133 133
                 <configuration>
134
-                    <webApp>
135
-                        ${project.basedir}/target/${project.artifactId}-${project.version}
136
-                    </webApp>
134
+                    <port>9090</port>
135
+                    <path>/</path>
137 136
                 </configuration>
138 137
                 <executions>
139 138
                     <execution>
140 139
                         <id>test-html</id>
141 140
                         <phase>integration-test</phase>
142 141
                         <goals>
143
-                            <goal>run-exploded</goal>
142
+                            <goal>run-war</goal>
144 143
                         </goals>
145 144
                     </execution>
146 145
                 </executions>
147 146
deleted file mode 100644
... ...
@@ -1,3 +0,0 @@
1
-<module>
2
-    <source path='tablelayout'/>
3
-</module>
4 1
deleted file mode 100644
... ...
@@ -1,4 +0,0 @@
1
-<module>
2
-    <inherits name='com.esotericsoftware.Tablelayout'/>
3
-    <source path='jnuit'/>
4
-</module>
... ...
@@ -1,7 +1,16 @@
1 1
 <module>
2 2
     <inherits name='im.bci.TmxLoader'/>
3 3
     <inherits name='im.bci.Jnuit'/>
4
-    <inherits name='com.artemis.backends.artemis_backends_gwt'/>
4
+    <inherits name='im.bci.jnuit.Artemis'/>
5 5
     <inherits name='javax.Inject'/>
6
+
7
+    <inherits name='com.artemis.backends.artemis_backends_gwt'/>
8
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.core.components" />
9
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.core.systems" />
10
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.core.manager" />
11
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.playn.core.components" />
12
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.playn.core.systems" />
13
+    <extend-configuration-property name="artemis.reflect.include" value="org.geekygoblin.nedetlesmaki.playn.core.manager" />
14
+
6 15
     <source path='core'/>
7 16
 </module>
... ...
@@ -5,6 +5,7 @@
5 5
 
6 6
   <source path='core'/>
7 7
   <source path='html'/>
8
+  <super-source path='emu'/>
8 9
 
9 10
   <public path="resources" />
10 11
 
11 12
new file mode 100644
... ...
@@ -0,0 +1,56 @@
0
+/*
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2014 devnewton <devnewton@bci.im>
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
+ THE SOFTWARE.
22
+ */
23
+
24
+package java.lang;
25
+
26
+/**
27
+ *
28
+ * @author devnewton
29
+ */
30
+public class ClassNotFoundException extends Exception {
31
+
32
+	private Throwable t;
33
+
34
+	public ClassNotFoundException () {
35
+		super((Throwable)null);
36
+	}
37
+
38
+	public ClassNotFoundException (String s) {
39
+		super(s, null);
40
+	}
41
+
42
+	public ClassNotFoundException (String s, Throwable t) {
43
+		super(s, null);
44
+		this.t = t;
45
+	}
46
+
47
+	public Throwable getException () {
48
+		return t;
49
+	}
50
+
51
+        @Override
52
+	public Throwable getCause () {
53
+		return t;
54
+	}
55
+}
0 56
new file mode 100644
... ...
@@ -0,0 +1,39 @@
0
+/*
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2014 devnewton <devnewton@bci.im>
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
+ THE SOFTWARE.
22
+ */
23
+package java.lang;
24
+
25
+/**
26
+ *
27
+ * @author devnewton
28
+ */
29
+public class IllegalAccessException extends Exception {
30
+
31
+    public IllegalAccessException(String message) {
32
+        super(message);
33
+    }
34
+
35
+    public IllegalAccessException() {
36
+        super();
37
+    }
38
+}
0 39
new file mode 100644
... ...
@@ -0,0 +1,47 @@
0
+/*
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2014 devnewton <devnewton@bci.im>
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21
+ THE SOFTWARE.
22
+ */
23
+package java.lang;
24
+
25
+/**
26
+ *
27
+ * @author devnewton
28
+ */
29
+public class SecurityException extends RuntimeException {
30
+
31
+    public SecurityException(String message, Throwable cause) {
32
+        super(message, cause);
33
+    }
34
+
35
+    public SecurityException(String message) {
36
+        this(message, null);
37
+    }
38
+
39
+    public SecurityException(Throwable cause) {
40
+        this(null, cause);
41
+    }
42
+
43
+    public SecurityException() {
44
+        this(null, null);
45
+    }
46
+}
... ...
@@ -9,7 +9,7 @@
9 9
     <properties>
10 10
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11 11
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12
-        <jnuit.version>0.11</jnuit.version>
12
+        <jnuit.version>0.12-SNAPSHOT</jnuit.version>
13 13
         <lwjgl.version>2.9.1</lwjgl.version>
14 14
         <playn.version>1.8.5</playn.version>
15 15
         <gwt.version>2.6.1</gwt.version>