standardize yes/no/cancel between different kinds of signature placeholders

2 files changed, 22 insertions, 18 deletions

diff --git a/installer/windows/PDF-Over.aip b/installer/windows/PDF-Over.aip
index 90cba94f..634870e5 100644
--- a/installer/windows/PDF-Over.aip
+++ b/installer/windows/PDF-Over.aip
@@ -45,7 +45,7 @@
     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>

     <ROW Component="SHORTCUTDIR" ComponentId="{E162254F-9CB5-4FE2-8CC5-7EE2580EB565}" Directory_="SHORTCUTDIR" Attributes="0"/>

     <ROW Component="Uninstaller.exe" ComponentId="{D9AFD5FA-FA0B-4CD1-B723-E566311229C5}" Directory_="Uninstaller_Dir" Attributes="0" KeyPath="Uninstaller.exe"/>

-    <ROW Component="activation1.1.1.jar" ComponentId="{41AA3DB3-F69D-4738-A9C4-2B8C11E04BE2}" Directory_="lib_Dir" Attributes="0" KeyPath="activation1.1.1.jar" Type="0"/>

+    <ROW Component="activation1.1.1.jar" ComponentId="{1CFF5734-D6F4-4EA2-AB96-58BBE33BBAFB}" Directory_="lib_Dir" Attributes="0" KeyPath="activation1.1.1.jar" Type="0"/>

     <ROW Component="icon.icns" ComponentId="{D667CCA8-F98F-4542-9CAC-E061B8A50C0B}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.icns" Type="0"/>

     <ROW Component="installationinformation" ComponentId="{6EE3B52A-F84A-41A4-A7EA-83F6AF751DCE}" Directory_="APPDIR" Attributes="0" KeyPath="installationinformation_1" Type="0"/>

     <ROW Component="pdfover_linux.sh" ComponentId="{44E99452-8560-4238-B26D-4E3E49F41D56}" Directory_="scripts_Dir" Attributes="0" KeyPath="pdfover_win.bat" Type="0"/>

@@ -101,8 +101,8 @@
     <ROW File="javax.jwsapi1.1.jar" Component_="activation1.1.1.jar" FileName="JAVAXJ~1.JAR|javax.jws-api-1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javax.jws-api-1.1.jar" SelfReg="false" NextFile="jaxbapi2.4.0b180830.0359.jar"/>

     <ROW File="jaxbapi2.4.0b180830.0359.jar" Component_="activation1.1.1.jar" FileName="JAXB-A~1.JAR|jaxb-api-2.4.0-b180830.0359.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-api-2.4.0-b180830.0359.jar" SelfReg="false" NextFile="jaxbruntime2.4.0b180830.0438.jar"/>

     <ROW File="jaxbruntime2.4.0b180830.0438.jar" Component_="activation1.1.1.jar" FileName="JAXB-R~1.JAR|jaxb-runtime-2.4.0-b180830.0438.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-runtime-2.4.0-b180830.0438.jar" SelfReg="false" NextFile="jbig21.0.jar"/>

-    <ROW File="jbig21.0.jar" Component_="activation1.1.1.jar" FileName="JBIG2-~1.JAR|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.30.jar"/>

-    <ROW File="jcloverslf4j1.7.30.jar" Component_="activation1.1.1.jar" FileName="JCL-OV~1.JAR|jcl-over-slf4j-1.7.30.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.30.jar" SelfReg="false" NextFile="jcommander1.78.jar"/>

+    <ROW File="jbig21.0.jar" Component_="activation1.1.1.jar" FileName="JBIG2-~1.JAR|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.32.jar"/>

+    <ROW File="jcloverslf4j1.7.32.jar" Component_="activation1.1.1.jar" FileName="JCL-OV~1.JAR|jcl-over-slf4j-1.7.32.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.32.jar" SelfReg="false" NextFile="jcommander1.78.jar"/>

     <ROW File="jcommander1.78.jar" Component_="activation1.1.1.jar" FileName="JCOMMA~1.JAR|jcommander-1.78.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcommander-1.78.jar" SelfReg="false" NextFile="jose4j0.7.6.jar"/>

     <ROW File="jose4j0.7.6.jar" Component_="activation1.1.1.jar" FileName="JOSE4J~1.JAR|jose4j-0.7.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jose4j-0.7.6.jar" SelfReg="false" NextFile="jsoup1.14.3.jar"/>

     <ROW File="jsoup1.14.3.jar" Component_="activation1.1.1.jar" FileName="JSOUP-~1.JAR|jsoup-1.14.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jsoup-1.14.3.jar" SelfReg="false" NextFile="levigojbig2imageio2.0.jar"/>

@@ -110,29 +110,29 @@
     <ROW File="logbackclassic1.2.10.jar" Component_="activation1.1.1.jar" FileName="LOGBAC~1.JAR|logback-classic-1.2.10.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\logback-classic-1.2.10.jar" SelfReg="false" NextFile="logbackcore1.2.10.jar"/>

     <ROW File="logbackcore1.2.10.jar" Component_="activation1.1.1.jar" FileName="LOGBAC~2.JAR|logback-core-1.2.10.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\logback-core-1.2.10.jar" SelfReg="false" NextFile="metadataextractor2.9.1.jar"/>

     <ROW File="metadataextractor2.9.1.jar" Component_="activation1.1.1.jar" FileName="METADA~1.JAR|metadata-extractor-2.9.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\metadata-extractor-2.9.1.jar" SelfReg="false" NextFile="ognl3.2.19.jar"/>

-    <ROW File="ognl3.2.19.jar" Component_="activation1.1.1.jar" FileName="OGNL-3~1.JAR|ognl-3.2.19.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.2.19.jar" SelfReg="false" NextFile="pdfascommon4.2.1snapshot.jar"/>

-    <ROW File="pdfascommon4.2.1snapshot.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~1.JAR|pdf-as-common-4.2.1-snapshot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.2.1-snapshot.jar" SelfReg="false" NextFile="pdfaslib4.2.1snapshot.jar"/>

-    <ROW File="pdfaslib4.2.1snapshot.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~2.JAR|pdf-as-lib-4.2.1-snapshot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.2.1-snapshot.jar" SelfReg="false" NextFile="pdfaspdfbox24.2.1snapshot.jar"/>

-    <ROW File="pdfaspdfbox24.2.1snapshot.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~3.JAR|pdf-as-pdfbox-2-4.2.1-snapshot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-2-4.2.1-snapshot.jar" SelfReg="false" NextFile="pdfovercommons4.3.3.jar"/>

-    <ROW File="pdfbox2.0.24.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~1.JAR|pdfbox-2.0.24.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-2.0.24.jar" SelfReg="false" NextFile="pdfboxdebugger2.0.23.jar"/>

-    <ROW File="pdfboxdebugger2.0.23.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~2.JAR|pdfbox-debugger-2.0.23.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-debugger-2.0.23.jar" SelfReg="false" NextFile="pdfboxtools2.0.23.jar"/>

-    <ROW File="pdfboxtools2.0.23.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~3.JAR|pdfbox-tools-2.0.23.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-tools-2.0.23.jar" SelfReg="false" NextFile="pdfview1.0.5.1katjas.jar"/>

+    <ROW File="ognl3.2.19.jar" Component_="activation1.1.1.jar" FileName="OGNL-3~1.JAR|ognl-3.2.19.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.2.19.jar" SelfReg="false" NextFile="pdfascommon4.2.1SNAPSHOT.jar"/>

+    <ROW File="pdfascommon4.2.1SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~1.JAR|pdf-as-common-4.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.2.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfaslib4.2.1SNAPSHOT.jar"/>

+    <ROW File="pdfaslib4.2.1SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~2.JAR|pdf-as-lib-4.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.2.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfaspdfbox24.2.1SNAPSHOT.jar"/>

+    <ROW File="pdfaspdfbox24.2.1SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="PDF-AS~3.JAR|pdf-as-pdfbox-2-4.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-2-4.2.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfovercommons4.3.3.jar"/>

+    <ROW File="pdfbox2.0.24.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~1.JAR|pdfbox-2.0.24.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-2.0.24.jar" SelfReg="false" NextFile="pdfboxdebugger2.0.25.jar"/>

+    <ROW File="pdfboxdebugger2.0.25.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~2.JAR|pdfbox-debugger-2.0.25.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-debugger-2.0.25.jar" SelfReg="false" NextFile="pdfboxtools2.0.25.jar"/>

+    <ROW File="pdfboxtools2.0.25.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~3.JAR|pdfbox-tools-2.0.25.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-tools-2.0.25.jar" SelfReg="false" NextFile="pdfview1.0.5.1katjas.jar"/>

     <ROW File="pdfover_win.bat" Component_="pdfover_linux.sh" FileName="PDF-OV~2.BAT|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="uninstall_win.bat"/>

     <ROW File="pdfover_wincli.bat" Component_="pdfover_linux.sh" FileName="PDF-OV~1.BAT|pdf-over_win-cli.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win-cli.bat" SelfReg="false" NextFile="pdfover_win.bat"/>

     <ROW File="pdfovercommons4.3.3.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~1.JAR|pdf-over-commons-4.3.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-commons-4.3.3.jar" SelfReg="false" NextFile="pdfovergui4.3.3.jar"/>

     <ROW File="pdfovergui4.3.3.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~2.JAR|pdf-over-gui-4.3.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.3.3.jar" SelfReg="false" NextFile="pdfoversignator4.3.3.jar"/>

     <ROW File="pdfoversignator4.3.3.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~3.JAR|pdf-over-signator-4.3.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.3.3.jar" SelfReg="false" NextFile="pdfoversigpdfas44.3.3.jar"/>

     <ROW File="pdfoversigpdfas44.3.3.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~4.JAR|pdf-over-sigpdfas4-4.3.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.3.3.jar" SelfReg="false" NextFile="pdfbox2.0.24.jar"/>

-    <ROW File="pdfview1.0.5.1katjas.jar" Component_="activation1.1.1.jar" FileName="PDFVIE~1.JAR|pdfview-1.0.5.1-katjas.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-1.0.5.1-katjas.jar" SelfReg="false" NextFile="preflight2.0.23.jar"/>

-    <ROW File="preflight2.0.23.jar" Component_="activation1.1.1.jar" FileName="PREFLI~1.JAR|preflight-2.0.23.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\preflight-2.0.23.jar" SelfReg="false" NextFile="sigspades4.2.1snapshot.jar"/>

-    <ROW File="sigspades4.2.1snapshot.jar" Component_="activation1.1.1.jar" FileName="SIGS-P~1.JAR|sigs-pades-4.2.1-snapshot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.2.1-snapshot.jar" SelfReg="false" NextFile="slf4japi1.7.32.jar"/>

+    <ROW File="pdfview1.0.5.1katjas.jar" Component_="activation1.1.1.jar" FileName="PDFVIE~1.JAR|pdfview-1.0.5.1-katjas.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-1.0.5.1-katjas.jar" SelfReg="false" NextFile="preflight2.0.25.jar"/>

+    <ROW File="preflight2.0.25.jar" Component_="activation1.1.1.jar" FileName="PREFLI~1.JAR|preflight-2.0.25.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\preflight-2.0.25.jar" SelfReg="false" NextFile="sigspades4.2.1SNAPSHOT.jar"/>

+    <ROW File="sigspades4.2.1SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="SIGS-P~1.JAR|sigs-pades-4.2.1-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.2.1-SNAPSHOT.jar" SelfReg="false" NextFile="slf4japi1.7.32.jar"/>

     <ROW File="slf4japi1.7.32.jar" Component_="activation1.1.1.jar" FileName="SLF4J-~1.JAR|slf4j-api-1.7.32.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.7.32.jar" SelfReg="false" NextFile="staxex1.8.jar"/>

     <ROW File="staxex1.8.jar" Component_="activation1.1.1.jar" FileName="STAX-E~1.JAR|stax-ex-1.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\stax-ex-1.8.jar" SelfReg="false" NextFile="swt.jar"/>

     <ROW File="swt.jar" Component_="activation1.1.1.jar" FileName="swt.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\swt.jar" SelfReg="false" NextFile="txw22.4.0b180830.0438.jar"/>

-    <ROW File="txw22.4.0b180830.0438.jar" Component_="activation1.1.1.jar" FileName="TXW2-2~1.JAR|txw2-2.4.0-b180830.0438.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.4.0-b180830.0438.jar" SelfReg="false" NextFile="xmpbox2.0.23.jar"/>

+    <ROW File="txw22.4.0b180830.0438.jar" Component_="activation1.1.1.jar" FileName="TXW2-2~1.JAR|txw2-2.4.0-b180830.0438.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.4.0-b180830.0438.jar" SelfReg="false" NextFile="xmpbox2.0.25.jar"/>

     <ROW File="uninstall_win.bat" Component_="pdfover_linux.sh" FileName="UNINST~1.BAT|uninstall_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\uninstall_win.bat" SelfReg="false" NextFile="Uninstaller.exe"/>

     <ROW File="uninstaller.jar" Component_="uninstaller.jar" FileName="UNINST~1.JAR|uninstaller.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\Uninstaller\uninstaller.jar" SelfReg="false" NextFile="activation1.1.1.jar"/>

-    <ROW File="xmpbox2.0.23.jar" Component_="activation1.1.1.jar" FileName="XMPBOX~1.JAR|xmpbox-2.0.23.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpbox-2.0.23.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>

+    <ROW File="xmpbox2.0.25.jar" Component_="activation1.1.1.jar" FileName="XMPBOX~1.JAR|xmpbox-2.0.25.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpbox-2.0.25.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>

     <ROW File="xmpcore5.1.2.jar" Component_="activation1.1.1.jar" FileName="XMPCOR~1.JAR|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index fdbc2580..dab181af 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -170,12 +170,13 @@ public class OpenState extends State {
 
 						// create a dialog with ok and cancel buttons and a question icon
 						MessageBox dialog = new MessageBox(getStateMachine().getGUIProvider().getMainShell(),
-								SWT.ICON_QUESTION | SWT.YES | SWT.NO);
+								SWT.ICON_QUESTION | SWT.YES | SWT.NO | SWT.CANCEL);
 						dialog.setText(Messages.getString("dataSourceSelection.usePlaceholderTitle")); //$NON-NLS-1$
 						dialog.setMessage(Messages.getString("dataSourceSelection.usePlaceholderText")); //$NON-NLS-1$
 
 						// open dialog and await user selection
-						if (SWT.YES == dialog.open()) {
+						int result = dialog.open();
+						if (result == SWT.YES) {
 
 							// if the user chooses to use the signature placeholder
 							// - fill the position information so that we skip to
@@ -189,8 +190,11 @@ public class OpenState extends State {
 
 							getStateMachine().getStatus().setSearchForPlaceholderSignature(true);
 
-						} else {
+						} else if (result == SWT.NO) {
 							getStateMachine().getStatus().setSearchForPlaceholderSignature(false);
+						} else {
+							status.setDocument(null);
+							return;
 						}
 						// TODO: why does this use a different logic (via PositioningState) than the signature placeholders?
 					}