diff --git a/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
new file mode 100644
index 000000000..5fefc844f
--- /dev/null
+++ b/puzzles files/starbattle/5x5 Star Battle 1 star Normal/5x5 Star Battle 1 star Normal 1.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ |
+ |
+ |
+
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+ |
+ |
+ |
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
index f7a094397..9566a3f52 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleController.java
@@ -14,22 +14,18 @@ public void changeCell(MouseEvent e, PuzzleElement data) {
this.boardView.getSelectionPopupMenu().show(boardView, this.boardView.getCanvas().getX() + e.getX(), this.boardView.getCanvas().getY() + e.getY());
}
else {
- if (cell.getData() == 0) {
+ data.setData(cell.getData() + 1);
+ if (cell.getData() >= 0) {
data.setData(-3);
}
- else {
- data.setData(cell.getData() + 1);
- }
}
}
else {
if (e.getButton() == MouseEvent.BUTTON3) {
+ data.setData(cell.getData() - 1);
if (cell.getData() == -3) {
data.setData(0);
}
- else {
- data.setData(cell.getData() - 1);
- }
}
}
}
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
index e0914215a..ceb0eec19 100644
--- a/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
+++ b/src/main/java/edu/rpi/legup/puzzle/starbattle/StarBattleView.java
@@ -14,16 +14,14 @@
import java.awt.*;
public class StarBattleView extends GridBoardView {
- private static final Logger LOGGER = LogManager.getLogger(StarBattleView.class.getName());
-
static Image STAR;
static {
try {
- STAR = ImageIO.read(ClassLoader.getSystemResourceAsStream("edu/rpi/legup/images/starbattle/star.png"));
+ STAR = ImageIO.read(ClassLoader.getSystemClassLoader().getResource("edu/rpi/legup/images/starbattle/star.gif"));
}
catch (IOException e) {
- LOGGER.error("Failed to open starbattle image.");
+ // pass
}
}
diff --git a/src/main/java/edu/rpi/legup/utility/LegupUtils.java b/src/main/java/edu/rpi/legup/utility/LegupUtils.java
index dbdd24e7f..317fb787e 100644
--- a/src/main/java/edu/rpi/legup/utility/LegupUtils.java
+++ b/src/main/java/edu/rpi/legup/utility/LegupUtils.java
@@ -85,7 +85,14 @@ private static List findClassesZip(String path, String packageName) throw
for (ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry()) {
if (!entry.isDirectory() && entry.getName().endsWith(".class") && entry.getName().startsWith(packageName)) {
String className = entry.getName().replace('/', '.');
- classes.add(Class.forName(className.substring(0, className.length() - ".class".length())));
+ String substr = className.substring(0, className.length() - ".class".length());
+ try {
+ Class c = Class.forName(substr);
+ classes.add(c);
+ }
+ catch (LinkageError | ClassNotFoundException e) {
+ System.out.println("Failed on " + substr);
+ }
}
}
return classes;