diff --git a/.idea/hellsgamers.iml b/.idea/hellsgamers.iml index 6aac235..33efe56 100644 --- a/.idea/hellsgamers.iml +++ b/.idea/hellsgamers.iml @@ -7,7 +7,7 @@ - + diff --git a/src/main/java/BattleShip/AIGridGUI.java b/src/main/java/BattleShip/AIGridGUI.java index e12948f..d9e5c4a 100644 --- a/src/main/java/BattleShip/AIGridGUI.java +++ b/src/main/java/BattleShip/AIGridGUI.java @@ -5,7 +5,7 @@ import javax.swing.border.*; import java.awt.*; import java.awt.event.*; import java.util.*; -//refractoring test + public class AIGridGUI extends JPanel { @@ -28,8 +28,8 @@ public class AIGridGUI extends JPanel { Border loweredBevel = BorderFactory.createLoweredBevelBorder(); //Border raisedbevel = BorderFactory.createRaisedBevelBorder(); Border defaultBorder; - //empty = BorderFactory.createEmptyBorder(4, 4, 4, 4); - Border compound = BorderFactory.createCompoundBorder(); + + Ship shipToPlace; boolean vertical = false; boolean clear; @@ -504,6 +504,14 @@ public class AIGridGUI extends JPanel { clear = false; } } + } else { + + for(int i = 0; i < shipToPlace.getLength(); i++) { + int testing = cell.getGridLocation() + i; + if((i > 0 && (testing % columns) == 0) || buttons.get(testing).getCellContents() != null) { + clear = false; + } + } } if(clear) { diff --git a/target/classes/BattleShip/AIGridGUI.class b/target/classes/BattleShip/AIGridGUI.class index 4ff415c..7274677 100644 Binary files a/target/classes/BattleShip/AIGridGUI.class and b/target/classes/BattleShip/AIGridGUI.class differ diff --git a/target/classes/PingPong/Paddle.class b/target/classes/PingPong/Paddle.class index 0594197..3acecb4 100644 Binary files a/target/classes/PingPong/Paddle.class and b/target/classes/PingPong/Paddle.class differ diff --git a/target/classes/PingPong/Score.class b/target/classes/PingPong/Score.class index 727ad84..2651833 100644 Binary files a/target/classes/PingPong/Score.class and b/target/classes/PingPong/Score.class differ