diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java index 85bccd8e..3c957d40 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/MainWindow.java @@ -230,7 +230,7 @@ public class MainWindow { log.debug("Closing main window"); MainWindow.this.stateMachine.configProvider.setMainWindowSize(getShell().getSize()); try { - MainWindow.this.stateMachine.configProvider.saveCurrentConfiguration(); + MainWindow.this.stateMachine.configProvider.saveToDisk(); } catch (IOException e1) { log.error("Error saving configuration", e); } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java index 10d0541c..d977e665 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java @@ -437,7 +437,7 @@ public class ConfigurationComposite extends StateComposite { do { // Save current config to file try { - this.configProvider.saveCurrentConfiguration(); + this.configProvider.saveToDisk(); redo = false; status = true; } catch (IOException e) { diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java index 2e120b1d..7fc3c832 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java @@ -79,7 +79,7 @@ public class ConfigProviderImpl { } /* load from disk */ - public void loadConfiguration() throws IOException { + public void loadFromDisk() throws IOException { Properties config = new Properties(); @@ -297,7 +297,7 @@ public class ConfigProviderImpl { } /* save to file */ - public void saveCurrentConfiguration() throws IOException { + public void saveToDisk() throws IOException { String filename = this.getConfigurationFileName(); File configFile = new File(Constants.CONFIG_DIRECTORY + File.separator + filename); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java index 7b5cd98d..8480554e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java @@ -103,7 +103,7 @@ public class PrepareConfigurationState extends State { private void initializeFromConfigurationFile() throws InitializationException { try { - getStateMachine().configProvider.loadConfiguration(); + getStateMachine().configProvider.loadFromDisk(); } catch (IOException ex) { throw new InitializationException("Failed to read configuration from config file", ex); } @@ -278,7 +278,7 @@ public class PrepareConfigurationState extends State { // initialize from config file initializeFromConfigurationFile(); - + // Read cli arguments try { initializeFromArguments(stateMachine.cmdLineArgs, this.handler); |