Zakharov_Rostislav/PIbd-23_ZakharovR.A._Battleship_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-23. Zakharov R.A. Lab work 04 #5

Closed
Zakharov_Rostislav wants to merge 5 commits from Lab4 into Lab3
pull from: Lab4
merge into: Zakharov_Rostislav:Lab3
Conversation 1 Commits 5 Files Changed 7 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 234aa190c8 - Show all commits

5
src/frames/FrameShipsCollection.java
View File

@ -188,8 +188,7 @@ public class FrameShipsCollection extends JFrame {
pictureBoxCollection.repaint();
}
private void buttonTrashClick(){
DrawingShip ship = trashCollection.pop();
if(ship == null)
if (trashCollection.size() == 0)
return;
FrameBattleship form;
try {
@ -197,6 +196,6 @@ public class FrameShipsCollection extends JFrame {
} catch (IOException e) {
throw new RuntimeException(e);
}
form.setShip(ship);
form.setShip(trashCollection.pop());
}
}