Minecon724/crossword-generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Minecon724 2024-10-04 18:40:01 +02:00
parent 48a9fa11e4
commit 0745a04b8e
Signed by: Minecon724
GPG key ID: 3CCC4D267742C8E8
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/eu/m724/CrosswordBuilder.java
View file

@ -9,10 +9,10 @@ import java.util.Set;
* TODO bad javadoc * TODO bad javadoc
*/ */
public class CrosswordBuilder { public class CrosswordBuilder {
private int width, height; private final int width, height;
private String solution; private final String solution;
private Set<Word> words = new HashSet<>(); private final Set<Word> words = new HashSet<>();
private Set<PlacedWord> placedWords = new HashSet<>(); private final Set<PlacedWord> placedWords = new HashSet<>();
/** /**
* Creates a new {@link CrosswordBuilder} * Creates a new {@link CrosswordBuilder}
@ -65,7 +65,8 @@ public class CrosswordBuilder {
public CrosswordBuilder generate() { public CrosswordBuilder generate() {
System.out.println("Generator invoked"); System.out.println("Generator invoked");
placedWords = Generator.generate(width, height, solution, words.toArray(Word[]::new)); // TODO perhaps making this an assignment and making placedWords not final is better
placedWords.addAll(Generator.generate(width, height, solution, words.toArray(Word[]::new)));
System.out.println("Generator done"); System.out.println("Generator done");
return this; return this;
} }

14
src/main/java/eu/m724/Generator.java
View file

@ -1,20 +1,18 @@
package eu.m724; package eu.m724;
import java.time.Duration;
import java.time.LocalTime;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
public class Generator { public class Generator {
private int width, height; private final int width, height;
private String solution; private final String solution;
private Word[] words; private final Word[] words;
private char[][] charArray; private final char[][] charArray;
private Set<PlacedWord> placedWords; private final Set<PlacedWord> placedWords;
private ThreadLocalRandom random = ThreadLocalRandom.current(); private final ThreadLocalRandom random = ThreadLocalRandom.current();
private Generator(int width, int height, String solution, Word[] words) { private Generator(int width, int height, String solution, Word[] words) {
this.width = width; this.width = width;

3
src/main/java/eu/m724/Renderer.java
View file

@ -13,9 +13,6 @@ public class Renderer {
SVGGraphics2D g2 = new SVGGraphics2D(crossword.width() * TILE_SIZE, crossword.height() * TILE_SIZE); SVGGraphics2D g2 = new SVGGraphics2D(crossword.width() * TILE_SIZE, crossword.height() * TILE_SIZE);
g2.setPaint(Color.BLACK); g2.setPaint(Color.BLACK);
FontRenderContext frc = g2.getFontRenderContext();
Font font = g2.getFont();
for (PlacedWord word : crossword.words()) { for (PlacedWord word : crossword.words()) {
int x = word.x(); int x = word.x();
int y = word.y(); int y = word.y();