From 74ff027ae135c9280912009d23cbd9945121b088 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 23 Oct 2012 17:00:12 +0200 Subject: + fixed Warnings --- .../gui/composites/BKUSelectionComposite.java | 31 +++- .../pdfover/gui/workflow/states/OpenState.java | 3 - .../workflow/states/PrepareConfigurationState.java | 4 +- .../at/asit/pdfover/gui/messages.properties | 188 +++++++++------------ .../asit/pdfover/signator/SignatureParameter.java | 1 + .../at/asit/pdfover/signer/pdfas/PDFASHelper.java | 4 + .../at/asit/pdfover/signer/pdfas/PDFASSigner.java | 14 +- .../signer/pdfas/PdfAsSignatureParameter.java | 20 ++- 8 files changed, 135 insertions(+), 130 deletions(-) (limited to 'trunk') diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index a7a1b6aa..522b3bad 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java @@ -41,6 +41,9 @@ import at.asit.pdfover.signator.BKUs; */ public class BKUSelectionComposite extends StateComposite { + /** + * Margin for button + */ public static final int btnMargin = 2; /** @@ -115,12 +118,12 @@ public class BKUSelectionComposite extends StateComposite { Button btn_mobile = new Button(this, SWT.NATIVE | SWT.RESIZE); - btn_mobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ + //btn_mobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ //Point mobile_size = btn_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT); FormData fd_btn_mobile = new FormData(); //fd_btn_mobile.left = new FormAttachment(40, 0); fd_btn_mobile.right = new FormAttachment(50, -5); - fd_btn_mobile.top = new FormAttachment(40, 0); + fd_btn_mobile.top = new FormAttachment(40, -20); //fd_btn_mobile.bottom = new FormAttachment(55, 0); btn_mobile.setLayoutData(fd_btn_mobile); btn_mobile.addSelectionListener(new MobileSelectionListener()); @@ -134,12 +137,12 @@ public class BKUSelectionComposite extends StateComposite { btn_mobile.setFont(new Font(Display.getCurrent(), fD_btn_mobile[0])); Button btn_card = new Button(this, SWT.NATIVE | SWT.RESIZE); - btn_card.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ + //btn_card.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ //Point card_size = btn_card.computeSize(SWT.DEFAULT, SWT.DEFAULT); FormData fd_btn_card = new FormData(); fd_btn_card.left = new FormAttachment(50, 5); //fd_btn_card.right = new FormAttachment(60, 0); - fd_btn_card.top = new FormAttachment(40, 0); + fd_btn_card.top = new FormAttachment(40, -20); //fd_btn_card.bottom = new FormAttachment(55, 0); btn_card.setLayoutData(fd_btn_card); btn_card.addSelectionListener(new LocalSelectionListener()); @@ -152,6 +155,25 @@ public class BKUSelectionComposite extends StateComposite { btn_card.setImage(karte); + Button btnMobile = new Button(this, SWT.NONE); + FormData fd_btnMobile = new FormData(); + fd_btnMobile.top = new FormAttachment(btn_mobile, 10); + //fd_btnMobile.left = new FormAttachment(btn_mobile, 0); + fd_btnMobile.right = new FormAttachment(50, -5); + fd_btnMobile.width = btn_mobile.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; + btnMobile.setLayoutData(fd_btnMobile); + btnMobile.setText(Messages.getString("bku_selection.mobile")); //$NON-NLS-1$ + btnMobile.addSelectionListener(new MobileSelectionListener()); + + Button btnCard = new Button(this, SWT.NONE); + FormData fd_btnCard = new FormData(); + fd_btnCard.top = new FormAttachment(btn_card, 10); + //fd_btnMobile.left = new FormAttachment(btn_mobile, 0); + fd_btnCard.left = new FormAttachment(50, 5); + fd_btnCard.width = btn_card.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; + btnCard.setLayoutData(fd_btnCard); + btnCard.setText(Messages.getString("bku_selection.card")); //$NON-NLS-1$ + btnCard.addSelectionListener(new LocalSelectionListener()); //this.pack(); } @@ -167,5 +189,4 @@ public class BKUSelectionComposite extends StateComposite { public void doLayout() { this.layout(true, true); } - } diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java index a158d7ca..cafcc64e 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java @@ -26,9 +26,6 @@ import at.asit.pdfover.gui.composites.DataSourceSelectComposite; import at.asit.pdfover.gui.workflow.ConfigProvider; import at.asit.pdfover.gui.workflow.StateMachine; import at.asit.pdfover.gui.workflow.Status; -import at.asit.pdfover.signator.FileNameEmlbem; -import at.asit.pdfover.signator.SignatureException; -import at.asit.pdfover.signator.SignatureParameter; /** * Selects the data source for the signature process. diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java index 92cdb774..b4398581 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java +++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java @@ -170,7 +170,7 @@ public class PrepareConfigurationState extends State { log.error( "Failed to write PDF Over config file to config directory", e); //$NON-NLS-1$ throw new InitializationException( - "Failed to write PDF Over config file to config directory", + "Failed to write PDF Over config file to config directory", //$NON-NLS-1$ e); } finally { if (pdfOverConfig != null) { @@ -201,7 +201,7 @@ public class PrepareConfigurationState extends State { log.error( "Failed to create local configuration directory!", e); //$NON-NLS-1$ throw new InitializationException( - "Failed to create local configuration directory!", + "Failed to create local configuration directory!", //$NON-NLS-1$ e); } allOK = true; diff --git a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index 7f7e8590..643d3cff 100644 --- a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -1,117 +1,97 @@ +#Eclipse messages class +#Tue Oct 23 16:04:42 CEST 2012 +BKU.LOCAL=Local BKU +BKU.MOBILE=Mobile BKU +BKU.NONE=no default +BKUSelectionComposite.btnMobile.text=MOBILE TrustedSocketFactory.FailedToCreateSecureConnection=Failed to create secure network connection - -main.title=PDF-Over -main.configuration=Configuration -main.position=Positioning -main.signature=Signing -main.done=Finish - -common.browse=browse +advanced_config.AutoPosition=Automatic positioning +advanced_config.AutoPosition_Title=Positioning +advanced_config.BKUSelection_Title=BKU Selection +advanced_config.OutputFolder=Default output folder\: +advanced_config.OutputFolder.Dialog=Select a folder +advanced_config.OutputFolder.Dialog_Title=Select Output folder +advanced_config.OutputFolder_Title=Output location +argument.error.output=is not a directory +argument.help.bku=Select the BKU to use values are\: LOCAL, MOBILE (example\: -b