Skip to content

Commit 183d3b9

Browse files
authored
[chore/fix] util v3.2 + CodeCharts image URL (#27)
* [fix] CodeCharts auf Util 3.1 changes angepasst * [style] Checkstyle fix
1 parent 6b1557d commit 183d3b9

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.github.weichware10</groupId>
101101
<artifactId>util</artifactId>
102-
<version>v3.0</version>
102+
<version>v3.2</version>
103103
</dependency>
104104
</dependencies>
105105

src/main/java/github/weichware10/toolbox/codecharts/CodeChartsCoordinator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.FileNotFoundException;
1010
import java.io.IOException;
1111
import java.net.MalformedURLException;
12+
import java.nio.file.Paths;
1213
import java.util.ArrayList;
1314
import java.util.Collections;
1415
import java.util.List;
@@ -59,23 +60,22 @@ public CodeChartsCoordinator(ConfigClient configClient, DataBaseClient dataBaseC
5960
this.imageView = imageView;
6061
this.codeCharts = codeCharts;
6162
codeChartsInput = new CodeChartsInput();
62-
6363
// BILD SETZEN
6464
String imageUrl = Files.saveImage(configClient.getConfig().getImageUrl());
65-
Image image = new Image(imageUrl);
65+
Image image = new Image(Paths.get(imageUrl).toUri().toString());
6666
imageViewPort = new Rectangle2D(0, 0, image.getWidth(), image.getHeight());
6767
imageView.setImage(image);
6868
imageView.setVisible(false);
6969

7070
// Konfiguration abspeichern
7171
CodeChartsConfiguration ccConfig = configClient.getConfig().getCodeChartsConfiguration();
72-
iterations = ccConfig.getInterations();
72+
iterations = ccConfig.getIterations();
7373
maxDepth = ccConfig.getMaxDepth();
7474
relativeSize = ccConfig.getRandomized();
7575
timings = ccConfig.getTimings();
7676

7777
// String-Listen initialisieren
78-
usableStrings = dataBaseClient.strings.get(ccConfig.getStringId());
78+
usableStrings = ccConfig.getStrings();
7979
if (usableStrings == null) {
8080
throw new IllegalArgumentException("no strings provided!");
8181
}

src/main/java/github/weichware10/toolbox/gui/App.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,8 @@ protected void createCodeChartsTestTrial(TextField trialIdInput) {
175175
return;
176176
}
177177

178-
if (dataBaseClient.strings.get("OBST") == null) {
179-
dataBaseClient.strings.set("OBST", CodeChartsListe.obst);
180-
}
181-
182178
CodeChartsConfiguration codeChartsConfiguration = new CodeChartsConfiguration(
183-
"OBST", new int[]{ 3, 5 }, new long[]{ 2000, 1000 },
179+
"OBST", CodeChartsListe.obst, new int[]{ 3, 5 }, new long[]{ 2000, 1000 },
184180
true, true, true, 5,
185181
15, -1, -1);
186182

0 commit comments

Comments
 (0)