diff --git a/spaceinvaders/GameProject/doc/playground/package-tree.html b/spaceinvaders/GameProject/doc/playground/package-tree.html
index d303814..d17f6f5 100644
--- a/spaceinvaders/GameProject/doc/playground/package-tree.html
+++ b/spaceinvaders/GameProject/doc/playground/package-tree.html
@@ -1,11 +1,11 @@
-
+
playground Class Hierarchy
-
+
diff --git a/spaceinvaders/GameProject/doc/playground/package-use.html b/spaceinvaders/GameProject/doc/playground/package-use.html
index d068aa5..7e7922b 100644
--- a/spaceinvaders/GameProject/doc/playground/package-use.html
+++ b/spaceinvaders/GameProject/doc/playground/package-use.html
@@ -1,11 +1,11 @@
-
+
Uses of Package playground
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/AnimationArtist.html b/spaceinvaders/GameProject/doc/rendering/AnimationArtist.html
index 21c7648..efd1a49 100644
--- a/spaceinvaders/GameProject/doc/rendering/AnimationArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/AnimationArtist.html
@@ -1,11 +1,11 @@
-
+
AnimationArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/Artist.html b/spaceinvaders/GameProject/doc/rendering/Artist.html
index 1332ca7..b8c725d 100644
--- a/spaceinvaders/GameProject/doc/rendering/Artist.html
+++ b/spaceinvaders/GameProject/doc/rendering/Artist.html
@@ -1,11 +1,11 @@
-
+
Artist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/CircleArtist.html b/spaceinvaders/GameProject/doc/rendering/CircleArtist.html
index f8427bd..ac2041f 100644
--- a/spaceinvaders/GameProject/doc/rendering/CircleArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/CircleArtist.html
@@ -1,11 +1,11 @@
-
+
CircleArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/RectArtist.html b/spaceinvaders/GameProject/doc/rendering/RectArtist.html
index 8f32711..872f92b 100644
--- a/spaceinvaders/GameProject/doc/rendering/RectArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/RectArtist.html
@@ -1,11 +1,11 @@
-
+
RectArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/TextArtist.html b/spaceinvaders/GameProject/doc/rendering/TextArtist.html
index fda55cb..2d40d0a 100644
--- a/spaceinvaders/GameProject/doc/rendering/TextArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/TextArtist.html
@@ -1,11 +1,11 @@
-
+
TextArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/class-use/AnimationArtist.html b/spaceinvaders/GameProject/doc/rendering/class-use/AnimationArtist.html
index 5842549..fdfca8f 100644
--- a/spaceinvaders/GameProject/doc/rendering/class-use/AnimationArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/class-use/AnimationArtist.html
@@ -1,11 +1,11 @@
-
+
Uses of Class rendering.AnimationArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/class-use/Artist.html b/spaceinvaders/GameProject/doc/rendering/class-use/Artist.html
index 1e5dc0c..a4a55a3 100644
--- a/spaceinvaders/GameProject/doc/rendering/class-use/Artist.html
+++ b/spaceinvaders/GameProject/doc/rendering/class-use/Artist.html
@@ -1,11 +1,11 @@
-
+
Uses of Class rendering.Artist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/class-use/CircleArtist.html b/spaceinvaders/GameProject/doc/rendering/class-use/CircleArtist.html
index 3e92ed1..a6971ed 100644
--- a/spaceinvaders/GameProject/doc/rendering/class-use/CircleArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/class-use/CircleArtist.html
@@ -1,11 +1,11 @@
-
+
Uses of Class rendering.CircleArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/class-use/RectArtist.html b/spaceinvaders/GameProject/doc/rendering/class-use/RectArtist.html
index 4f7cec5..90422a8 100644
--- a/spaceinvaders/GameProject/doc/rendering/class-use/RectArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/class-use/RectArtist.html
@@ -1,11 +1,11 @@
-
+
Uses of Class rendering.RectArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/class-use/TextArtist.html b/spaceinvaders/GameProject/doc/rendering/class-use/TextArtist.html
index d7c5986..61d41c8 100644
--- a/spaceinvaders/GameProject/doc/rendering/class-use/TextArtist.html
+++ b/spaceinvaders/GameProject/doc/rendering/class-use/TextArtist.html
@@ -1,11 +1,11 @@
-
+
Uses of Class rendering.TextArtist
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/package-summary.html b/spaceinvaders/GameProject/doc/rendering/package-summary.html
index 4060833..042148c 100644
--- a/spaceinvaders/GameProject/doc/rendering/package-summary.html
+++ b/spaceinvaders/GameProject/doc/rendering/package-summary.html
@@ -1,11 +1,11 @@
-
+
rendering
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/package-tree.html b/spaceinvaders/GameProject/doc/rendering/package-tree.html
index c0cc983..64b6b98 100644
--- a/spaceinvaders/GameProject/doc/rendering/package-tree.html
+++ b/spaceinvaders/GameProject/doc/rendering/package-tree.html
@@ -1,11 +1,11 @@
-
+
rendering Class Hierarchy
-
+
diff --git a/spaceinvaders/GameProject/doc/rendering/package-use.html b/spaceinvaders/GameProject/doc/rendering/package-use.html
index 2c635f5..6bca554 100644
--- a/spaceinvaders/GameProject/doc/rendering/package-use.html
+++ b/spaceinvaders/GameProject/doc/rendering/package-use.html
@@ -1,11 +1,11 @@
-
+
Uses of Package rendering
-
+
diff --git a/spaceinvaders/GameProject/doc/script.js b/spaceinvaders/GameProject/doc/script.js
index 864989c..0765364 100644
--- a/spaceinvaders/GameProject/doc/script.js
+++ b/spaceinvaders/GameProject/doc/script.js
@@ -1,26 +1,26 @@
/*
* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*/
var moduleSearchIndex;
diff --git a/spaceinvaders/GameProject/doc/search.js b/spaceinvaders/GameProject/doc/search.js
index 2246cdd..df0e6fb 100644
--- a/spaceinvaders/GameProject/doc/search.js
+++ b/spaceinvaders/GameProject/doc/search.js
@@ -1,26 +1,26 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
*
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
*
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
*
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
*/
var noResult = {l: "No results found"};
diff --git a/spaceinvaders/GameProject/doc/ui/GameUI.html b/spaceinvaders/GameProject/doc/ui/GameUI.html
index a46b47b..50aa073 100644
--- a/spaceinvaders/GameProject/doc/ui/GameUI.html
+++ b/spaceinvaders/GameProject/doc/ui/GameUI.html
@@ -1,11 +1,11 @@
-
+
GameUI
-
+
diff --git a/spaceinvaders/GameProject/doc/ui/class-use/GameUI.html b/spaceinvaders/GameProject/doc/ui/class-use/GameUI.html
index 66a2d57..41768ec 100644
--- a/spaceinvaders/GameProject/doc/ui/class-use/GameUI.html
+++ b/spaceinvaders/GameProject/doc/ui/class-use/GameUI.html
@@ -1,11 +1,11 @@
-
+
Uses of Class ui.GameUI
-
+
diff --git a/spaceinvaders/GameProject/doc/ui/package-summary.html b/spaceinvaders/GameProject/doc/ui/package-summary.html
index afe339f..0df25aa 100644
--- a/spaceinvaders/GameProject/doc/ui/package-summary.html
+++ b/spaceinvaders/GameProject/doc/ui/package-summary.html
@@ -1,11 +1,11 @@
-
+
ui
-
+
diff --git a/spaceinvaders/GameProject/doc/ui/package-tree.html b/spaceinvaders/GameProject/doc/ui/package-tree.html
index bdcc5b7..2948528 100644
--- a/spaceinvaders/GameProject/doc/ui/package-tree.html
+++ b/spaceinvaders/GameProject/doc/ui/package-tree.html
@@ -1,11 +1,11 @@
-
+
ui Class Hierarchy
-
+
diff --git a/spaceinvaders/GameProject/doc/ui/package-use.html b/spaceinvaders/GameProject/doc/ui/package-use.html
index e5c947a..5263c14 100644
--- a/spaceinvaders/GameProject/doc/ui/package-use.html
+++ b/spaceinvaders/GameProject/doc/ui/package-use.html
@@ -1,11 +1,11 @@
-
+
Uses of Package ui
-
+
diff --git a/spaceinvaders/GameProject/src/playground/LevelWithBox.java b/spaceinvaders/GameProject/src/playground/LevelWithBox.java
index 061e636..f575065 100644
--- a/spaceinvaders/GameProject/src/playground/LevelWithBox.java
+++ b/spaceinvaders/GameProject/src/playground/LevelWithBox.java
@@ -3,31 +3,28 @@ package playground;
import java.awt.Color;
import gameobjects.RectObject;
+
/**
* extends {@link SpaceInvadersLevel} with a red box.
+ *
*/
+
+
public class LevelWithBox extends SpaceInvadersLevel {
- /**
- * simply returns the text that should be displayed at level start.
- *
- * @return a string that is displayed at start. Should be not longer than 30 characters.
- */
+ /**
+ * simply returns the text that should be displayed at level start.
+ *
+ * @return a string that is displayed at start. Should be not longer than 30 characters.
+ */
@Override
protected String getStartupMessage() {
return "Box-Level!";
}
-
-<<<<<<< HEAD
- @Override
- public void prepareLevel(String id) {
- super.prepareLevel(id);
- RectObject RedBox = new RectObject("Obj", this, 350, 100, 0, 0, 700, 250, Color.RED);
- addObject(RedBox);
-=======
+
/**
* Method creates a new Object {@link gameobjects.RectObject} named RedBox.
- * calls method of {@link prepareLevel}.
+ * Calls method of {@link prepareLevel}.
* Object added to the level.
* @param String id to identify the level.
*/
@@ -36,6 +33,5 @@ public class LevelWithBox extends SpaceInvadersLevel {
super.prepareLevel(id);
RectObject redBox = new RectObject("RedBox", this, 350, 100, 0, 0, 700, 250, Color.RED);
this.addObject(redBox);
->>>>>>> 1415f47a9bab360cedb220372299f79d4f00380a
}
}