From c2602f46edd68e81cf66fffca3d0dccfdfab4ddc Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:28:04 +0000 Subject: Configuration overlay added * Commandline configuration will be stored in an overlay * This overlay won't be shown on the configuration page * This overlay won't be saved * Also slightly reworked CLI Argument creation git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@336 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../gui/workflow/states/ConfigurationUIState.java | 2 +- .../workflow/states/PrepareConfigurationState.java | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java index 57a7aa9b..47c21063 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java @@ -45,7 +45,7 @@ public class ConfigurationUIState extends State { this.configurationComposite = this.stateMachine.getGUIProvider().createComposite(ConfigurationComposite.class, SWT.RESIZE, this); this.configurationComposite.setConfigManipulator(this.stateMachine.getConfigManipulator()); - this.configurationComposite.setConfigProvider(this.stateMachine.getConfigProvider()); + this.configurationComposite.setConfigProvider(this.stateMachine.getPersistentConfigProvider()); this.configurationComposite.setSigner(this.stateMachine.getPDFSigner()); } 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 e726d7b4..955d125a 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 @@ -71,20 +71,20 @@ public class PrepareConfigurationState extends State { public PrepareConfigurationState(StateMachine stateMachine) { super(stateMachine); this.handler = new ArgumentHandler(this.stateMachine); - this.handler.addCLIArgument(new HelpArgument()); - this.handler.addCLIArgument(new BKUArgument()); - this.handler.addCLIArgument(new PhoneNumberArgument()); - this.handler.addCLIArgument(new EmblemArgument()); - this.handler.addCLIArgument(new PasswordArgument()); - this.handler.addCLIArgument(new ProxyHostArgument()); - this.handler.addCLIArgument(new ProxyPortArgument()); - this.handler.addCLIArgument(new OutputFolderArgument()); - this.handler.addCLIArgument(new InputDocumentArgument()); + this.handler.addCLIArgument(HelpArgument.class); + this.handler.addCLIArgument(BKUArgument.class); + this.handler.addCLIArgument(PhoneNumberArgument.class); + this.handler.addCLIArgument(EmblemArgument.class); + this.handler.addCLIArgument(PasswordArgument.class); + this.handler.addCLIArgument(ProxyHostArgument.class); + this.handler.addCLIArgument(ProxyPortArgument.class); + this.handler.addCLIArgument(OutputFolderArgument.class); + this.handler.addCLIArgument(InputDocumentArgument.class); // adding config file argument to this handler so it appears in help - this.handler.addCLIArgument(new ConfigFileArgument()); + this.handler.addCLIArgument(ConfigFileArgument.class); this.configFileHandler = new ArgumentHandler(this.stateMachine); - this.configFileHandler.addCLIArgument(new ConfigFileArgument()); + this.configFileHandler.addCLIArgument(ConfigFileArgument.class); } private void initializeFromConfigurationFile(String filename) -- cgit v1.2.3