YAGNI: GUIProvider

3 files changed, 7 insertions, 61 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/GUIProvider.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/GUIProvider.java
deleted file mode 100644
index a332d844..00000000
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/GUIProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://joinup.ec.europa.eu/software/page/eupl
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- */
-package at.asit.pdfover.gui.workflow;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-import at.asit.pdfover.gui.workflow.states.State;
-
-
-/**
- *
- */
-public interface GUIProvider {
-	/**
-	 * Create a new Composite
-	 * @param compositeClass The class of the Composite to create
-	 * @param style the SWT style
-	 * @param state the State this Composite belongs to
-	 * @return the new Composite
-	 */
-	public <T> T createComposite(Class<T> compositeClass, int style, State state);
-
-	/**
-	 * Display the composite as top most in main window
-	 * @param composite the composite
-	 */
-	public void display(final Composite composite);
-
-	/**
-	 * Gets the main window shell
-	 * @return the main window shell
-	 */
-	public Shell getMainShell();
-
-	/**
-	 * Reloads the resources on active gui components
-	 */
-	public void reloadResources();
-}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java
index 28f3a599..3cbf28f9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java
@@ -36,7 +36,7 @@ import at.asit.pdfover.gui.workflow.states.State;
  * Workflow holds logical state of signing process and updates the current
  * logical state
  */
-public class StateMachine implements GUIProvider {
+public class StateMachine {
 
 	private static final Logger log = LoggerFactory.getLogger(StateMachine.class);
 
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 df2a82fa..0d006e82 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
@@ -41,7 +41,6 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.utils.UpdateCheckManager;
 import at.asit.pdfover.gui.utils.VersionComparator;
 import at.asit.pdfover.gui.utils.Zipper;
-import at.asit.pdfover.gui.workflow.GUIProvider;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
@@ -195,7 +194,8 @@ public class PrepareConfigurationState extends State {
 						+ versionFile, ex);
 			} finally {
 				try {
-					versionReader.close();
+					if (versionReader != null)
+						versionReader.close();
 				} catch (IOException ex) {
 					// ignore
 				}
@@ -239,7 +239,6 @@ public class PrepareConfigurationState extends State {
 		try {
 			StateMachine stateMachine = getStateMachine();
 			ConfigurationManager config = stateMachine.configProvider;
-			final GUIProvider gui = stateMachine;
 			File configDir = new File(Constants.CONFIG_DIRECTORY);
 			File configFile = new File(configDir, Constants.DEFAULT_CONFIG_FILENAME);
 			if (!configDir.exists() || !configFile.exists()) {
@@ -260,7 +259,7 @@ public class PrepareConfigurationState extends State {
 				initializeFromArguments(stateMachine.cmdLineArgs, this.configFileHandler);
 			} catch (InitializationException e) {
 				log.error("Error in cmd line arguments: ", e);
-				ErrorDialog error = new ErrorDialog(gui.getMainShell(),
+				ErrorDialog error = new ErrorDialog(stateMachine.getMainShell(),
 						Messages.getString("error.CmdLineArgs") + "\n" +
 						e.getMessage(),
 						BUTTONS.OK);
@@ -279,13 +278,13 @@ public class PrepareConfigurationState extends State {
 				ErrorDialog error;
 
 				if (e.getCause() instanceof FileNotFoundException) {
-					error = new ErrorDialog(gui.getMainShell(),
+					error = new ErrorDialog(stateMachine.getMainShell(),
 						String.format(
 								Messages.getString("error.FileNotExist"),
 								e.getCause().getMessage()),
 						BUTTONS.OK);
 				} else {
-					error = new ErrorDialog(gui.getMainShell(),
+					error = new ErrorDialog(stateMachine.getMainShell(),
 							Messages.getString("error.CmdLineArgs") + "\n" +
 							e.getMessage(),
 							BUTTONS.OK);
@@ -296,7 +295,7 @@ public class PrepareConfigurationState extends State {
 
 			// Check for updates
 			if (config.getUpdateCheck())
-				UpdateCheckManager.checkNow(gui.getMainShell());
+				UpdateCheckManager.checkNow(stateMachine.getMainShell());
 
 			// Create PDF Signer
 			Status status = stateMachine.status;