cleanup-work #22

Merged
lgc merged 12 commits from cleanup-work into main 2024-12-22 23:06:00 +00:00
1 changed files with 45 additions and 37 deletions
Showing only changes of commit 6909b9417f - Show all commits

View File

@ -6,43 +6,51 @@ import java.util.List;
record ShipData (int size, String name){} record ShipData (int size, String name){}
public class Ship { public class Ship {
static List<List<ShipData>> semeterList = Arrays.asList(Arrays.asList( static List<List<ShipData>> semeterList =
Arrays.asList(
Arrays.asList(
new ShipData(2, "PRG 1"), new ShipData(2, "PRG 1"),
new ShipData(2, "GDI"), new ShipData(2, "GDI"),
new ShipData(2, "MAT 1"), new ShipData(2, "MAT 1"),
new ShipData(2, "THI"), new ShipData(2, "THI"),
new ShipData(4, "STP"), new ShipData(4, "STP"),
new ShipData(6, "ENG")), new ShipData(6, "ENG")
),
Arrays.asList( Arrays.asList(
new ShipData(2, "PRG 2"), new ShipData(2, "PRG 2"),
new ShipData(2, "DBS 1"), new ShipData(2, "DBS 1"),
new ShipData(2, "MAT 2"), new ShipData(2, "MAT 2"),
new ShipData(2, "STA"), new ShipData(2, "STA"),
new ShipData(2, "AUD")), new ShipData(2, "AUD")
),
Arrays.asList( Arrays.asList(
new ShipData(2, "PRG 3"), new ShipData(2, "PRG 3"),
new ShipData(2, "DBS 2"), new ShipData(2, "DBS 2"),
new ShipData(2, "MAT 3"), new ShipData(2, "MAT 3"),
new ShipData(2, "BSN 1"), new ShipData(2, "BSN 1"),
new ShipData(4, "PRP"), new ShipData(4, "PRP"),
new ShipData(6, "BWL")), new ShipData(6, "BWL")
),
Arrays.asList( Arrays.asList(
new ShipData(2, "WEB"), new ShipData(2, "WEB"),
new ShipData(2, "SE 1"), new ShipData(2, "SE 1"),
new ShipData(2, "CG 1"), new ShipData(2, "CG 1"),
new ShipData(2, "BSN 2"), new ShipData(2, "BSN 2"),
new ShipData(4, "SEM"), new ShipData(4, "SEM"),
new ShipData(6, "E BWL")), new ShipData(6, "E BWL")
),
Arrays.asList( Arrays.asList(
new ShipData(2, "WPF 1"), new ShipData(2, "WPF 1"),
new ShipData(2, "SE 2"), new ShipData(2, "SE 2"),
new ShipData(2, "CG 2"), new ShipData(2, "CG 2"),
new ShipData(2, "PXP 1"), new ShipData(2, "PXP 1"),
new ShipData(6, "EF 1")), new ShipData(6, "EF 1")
),
Arrays.asList( Arrays.asList(
new ShipData(2, "WPF 2"), new ShipData(2, "WPF 2"),
new ShipData(1, "PXP 2"), new ShipData(1, "PXP 2"),
new ShipData(8, "BAA")) new ShipData(8, "BAA")
)
); );
private int size; private int size;