Add keystore signing

1 files changed, 48 insertions, 41 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
index d21afcaa..8eebe02d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
@@ -17,7 +17,7 @@ package at.asit.pdfover.gui.composites;
 
 // Imports
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Font;
@@ -84,6 +84,23 @@ public class BKUSelectionComposite extends StateComposite {
 	}
 
 	/**
+	 * Listener for keystore selection 
+	 */
+	private final class KSSelectionListener extends SelectionAdapter {
+		/**
+		 * Empty constructor
+		 */
+		public KSSelectionListener() {
+		}
+
+		@Override
+		public void widgetSelected(SelectionEvent e) {
+			log.debug("Setting BKU to KS"); //$NON-NLS-1$
+			setSelected(BKUs.KS);
+		}
+	}
+
+	/**
 	 * SLF4J Logger instance
 	 **/
 	static final Logger log = LoggerFactory
@@ -94,7 +111,9 @@ public class BKUSelectionComposite extends StateComposite {
 	private Button btnMobile;
 
 	private Button btnCard;
-	
+
+	private Button btnKS;
+
 	/**
 	 * Gets selected BKU type
 	 * @return BKUS enum
@@ -122,68 +141,46 @@ public class BKUSelectionComposite extends StateComposite {
 		super(parent, style, state);
 
 		this.setLayout(new FormLayout());
-		
+
 		ClickableCanvas cc_mobile = new ClickableCanvas(this, SWT.NATIVE | SWT.RESIZE);
 		FormData fd_cc_mobile = new FormData();
 		fd_cc_mobile.right = new FormAttachment(50, -5);
 		fd_cc_mobile.top = new FormAttachment(40, -20);
-		cc_mobile.addMouseListener(new MouseListener() {
-			
-			@Override
-			public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
-				// Nothing to do here
-			}
-			
+		cc_mobile.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseDown(org.eclipse.swt.events.MouseEvent e) {
 				setSelected(BKUs.MOBILE);
 			}
-			
-			@Override
-			public void mouseDoubleClick(org.eclipse.swt.events.MouseEvent e) {
-				// Nothing to do here
-			}
 		});
 		cc_mobile.setLayoutData(fd_cc_mobile);
-		
+
 		Image mobile = new Image(getDisplay(), new ImageData(this.getClass().getResourceAsStream(Constants.RES_IMG_MOBILE)));
 		cc_mobile.setImage(mobile);
 		FontData[] fD_cc_mobile = cc_mobile.getFont().getFontData();
 		fD_cc_mobile[0].setHeight(Constants.TEXT_SIZE_BUTTON);
 		cc_mobile.setFont(new Font(Display.getCurrent(), fD_cc_mobile[0]));
-		
+
 		ClickableCanvas cc_karte = new ClickableCanvas(this, SWT.NATIVE | SWT.RESIZE);
 		FormData fd_cc_karte = new FormData();
 		fd_cc_karte.left = new FormAttachment(50, 5);
 		fd_cc_karte.top = new FormAttachment(40, -20);
-		cc_karte.addMouseListener(new MouseListener() {
-			
-			@Override
-			public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
-				// Nothing to do here
-			}
-			
+		cc_karte.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseDown(org.eclipse.swt.events.MouseEvent e) {
 				setSelected(BKUs.LOCAL);
 			}
-			
-			@Override
-			public void mouseDoubleClick(org.eclipse.swt.events.MouseEvent e) {
-				// Nothing to do here
-			}
 		});
 		cc_karte.setLayoutData(fd_cc_karte);
-		
+
 		Image karte = new Image(getDisplay(), new ImageData(this.getClass().getResourceAsStream(Constants.RES_IMG_CARD)));
-		
+
 		cc_karte.setImage(karte);
 		FontData[] fD_cc_karte = cc_mobile.getFont().getFontData();
 		fD_cc_karte[0].setHeight(Constants.TEXT_SIZE_BUTTON);
 		cc_mobile.setFont(new Font(Display.getCurrent(), fD_cc_karte[0]));
-		
+
 		int mobilesize = cc_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		
+
 		this.btnMobile = new Button(this, SWT.NONE);
 		FormData fd_btnMobile = new FormData();
 		fd_btnMobile.top = new FormAttachment(cc_mobile, 10);
@@ -191,27 +188,36 @@ public class BKUSelectionComposite extends StateComposite {
 		fd_btnMobile.right = new FormAttachment(50, -5);
 		//fd_btnMobile.width = cc_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
 		this.btnMobile.setLayoutData(fd_btnMobile);
-		this.btnMobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$
 		this.btnMobile.addSelectionListener(new MobileSelectionListener());
-		
+
 		int btnmsize = this.btnMobile.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		
+
 		fd_btnMobile.width = (btnmsize > mobilesize) ? btnmsize : mobilesize;
-		
+
 		this.btnCard = new Button(this, SWT.NONE);
 		FormData fd_btnCard = new FormData();
 		fd_btnCard.top = new FormAttachment(cc_karte, 10);
 		//fd_btnMobile.left = new FormAttachment(btn_mobile, 0);
 		fd_btnCard.left = new FormAttachment(50, 5);
 		int cardsize = cc_karte.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		
+
 		this.btnCard.setLayoutData(fd_btnCard);
-		this.btnCard.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$
 		this.btnCard.addSelectionListener(new LocalSelectionListener());
-		
+
 		int btncsize = this.btnCard.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
-		
+
 		fd_btnCard.width = (btncsize > cardsize) ? btncsize : cardsize;
+
+		this.btnKS = new Button(this, SWT.NONE);
+		FormData fd_btnKS = new FormData();
+		fd_btnKS.top = new FormAttachment(this.btnCard, 10);
+		fd_btnKS.left = new FormAttachment(this.btnMobile, 0, SWT.LEFT);
+		fd_btnKS.right = new FormAttachment(this.btnCard, 0, SWT.RIGHT);
+
+		this.btnKS.setLayoutData(fd_btnKS);
+		this.btnKS.addSelectionListener(new KSSelectionListener());
+
+		reloadResources();
 		//this.pack();
 	}
 
@@ -235,5 +241,6 @@ public class BKUSelectionComposite extends StateComposite {
 	public void reloadResources() {
 		this.btnMobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$
 		this.btnCard.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$
+		this.btnKS.setText(Messages.getString("bku_selection.ks")); //$NON-NLS-1$
 	}
 }