minor fixes

* jfoenix 9.0.1 -> 9.0.2
This commit is contained in:
Jannik 2018-03-11 15:49:56 +01:00
parent 81a79100fc
commit 6282c8ce98
2 changed files with 6 additions and 5 deletions

View File

@ -4,7 +4,7 @@
<groupId>org.kellerkinder</groupId> <groupId>org.kellerkinder</groupId>
<artifactId>Project-HomeFlix</artifactId> <artifactId>Project-HomeFlix</artifactId>
<version>0.5.2</version> <version>0.6.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Project-HomeFlix</name> <name>Project-HomeFlix</name>
@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>com.jfoenix</groupId> <groupId>com.jfoenix</groupId>
<artifactId>jfoenix</artifactId> <artifactId>jfoenix</artifactId>
<version>9.0.1</version> <version>9.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
@ -89,7 +89,7 @@
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.kellerkinder.Project_HomeFlix.Main</mainClass> <mainClass>kellerkinder.HomeFlix.application.Main</mainClass>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>

View File

@ -955,8 +955,9 @@ public class MainWindowController {
// try loading the omdbAPI key // try loading the omdbAPI key
try { try {
File file = new File(getClass().getClassLoader().getResource("apiKeys.json").getFile()); InputStream in = getClass().getClassLoader().getResourceAsStream("apiKeys.json");
JsonObject apiKeys = Json.parse(new FileReader(file)).asObject(); BufferedReader reader = new BufferedReader(new InputStreamReader(in));
JsonObject apiKeys = Json.parse(reader).asObject();
omdbAPIKey = apiKeys.getString("omdbAPIKey", ""); omdbAPIKey = apiKeys.getString("omdbAPIKey", "");
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Cloud not load the omdbAPI key. Please contact the developer!", e); LOGGER.error("Cloud not load the omdbAPI key. Please contact the developer!", e);