zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Merge Local Database and Home Directory #44

Merged
kske merged 1 commits from refactor-local-db-home-dir into develop 2020-09-23 16:00:53 +02:00
Conversation 1 Commits 1 Files Changed 2 +2 -12
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25a9489708 - Show all commits

9
client/src/main/java/envoy/client/data/ClientConfig.java
View File

@@ -2,8 +2,6 @@ package envoy.client.data;
import static java.util.function.Function.identity; import static java.util.function.Function.identity;
import java.io.File;
import envoy.data.Config; import envoy.data.Config;
/** /**
@@ -34,7 +32,6 @@ public final class ClientConfig extends Config {
super(".envoy"); super(".envoy");
put("server", "s", identity()); put("server", "s", identity());
put("port", "p", Integer::parseInt); put("port", "p", Integer::parseInt);
put("localDB", "db", File::new);
put("localDBSaveInterval", "db-si", Integer::parseInt); put("localDBSaveInterval", "db-si", Integer::parseInt);
} }
@@ -50,12 +47,6 @@ public final class ClientConfig extends Config {
*/ */
public Integer getPort() { return (Integer) items.get("port").get(); } public Integer getPort() { return (Integer) items.get("port").get(); }
/**
* @return the local database specific to the client user
* @since Envoy Client v0.1-alpha
*/
public File getLocalDB() { return (File) items.get("localDB").get(); }
/** /**
* @return the amount of minutes after which the local database should be saved * @return the amount of minutes after which the local database should be saved
* @since Envoy Client v0.2-beta * @since Envoy Client v0.2-beta

5
client/src/main/java/envoy/client/ui/Startup.java
View File

@@ -70,9 +70,8 @@ public final class Startup extends Application {
// Initialize the local database // Initialize the local database
try { try {
final var localDBDir = new File(config.getHomeDirectory(), config.getLocalDB().getPath()); logger.info("Initializing LocalDB at " + config.getHomeDirectory());
logger.info("Initializing LocalDB at " + localDBDir); localDB = new LocalDB(config.getHomeDirectory());
localDB = new LocalDB(localDBDir);
} catch (IOException | EnvoyException e) { } catch (IOException | EnvoyException e) {
logger.log(Level.SEVERE, "Could not initialize local database: ", e); logger.log(Level.SEVERE, "Could not initialize local database: ", e);
new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e).showAndWait(); new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e).showAndWait();