diff options
| author | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-07-06 12:33:33 +0200 |
|---|---|---|
| committer | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-07-06 12:33:33 +0200 |
| commit | e4767bccc7324d4b61a334bf6c0558d0080045e2 (patch) | |
| tree | 728a5df44f02ca10f760b979873c990cd4c0d265 /pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites | |
| parent | 3422e5eb2819f5de304f25dc622f5284813bb9b4 (diff) | |
| download | pdf-over-e4767bccc7324d4b61a334bf6c0558d0080045e2.tar.gz pdf-over-e4767bccc7324d4b61a334bf6c0558d0080045e2.tar.bz2 pdf-over-e4767bccc7324d4b61a334bf6c0558d0080045e2.zip | |
remove NON-NLS comments, cleanup whitespace
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites')
18 files changed, 479 insertions, 479 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 01d6c41c..7bba2860 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 @@ -40,14 +40,14 @@ import at.asit.pdfover.signator.BKUs; * Composite for BKU selection */ public class BKUSelectionComposite extends StateComposite { - + /** * Margin for button */ public static final int btnMargin = 2; - + /** - * Listener for local bku selection + * Listener for local bku selection */ private final class LocalSelectionListener extends SelectionAdapter { /** @@ -58,13 +58,13 @@ public class BKUSelectionComposite extends StateComposite { @Override public void widgetSelected(SelectionEvent e) { - log.debug("Setting BKU to LOCAL"); //$NON-NLS-1$ + log.debug("Setting BKU to LOCAL"); // setSelected(BKUs.LOCAL); } } - + /** - * Listener for mobile bku selection + * Listener for mobile bku selection */ private final class MobileSelectionListener extends SelectionAdapter { /** @@ -75,13 +75,13 @@ public class BKUSelectionComposite extends StateComposite { @Override public void widgetSelected(SelectionEvent e) { - log.debug("Setting BKU to MOBILE"); //$NON-NLS-1$ + log.debug("Setting BKU to MOBILE"); // setSelected(BKUs.MOBILE); } } /** - * Listener for keystore selection + * Listener for keystore selection */ private final class KSSelectionListener extends SelectionAdapter { /** @@ -92,7 +92,7 @@ public class BKUSelectionComposite extends StateComposite { @Override public void widgetSelected(SelectionEvent e) { - log.debug("Setting BKU to KS"); //$NON-NLS-1$ + log.debug("Setting BKU to KS"); // setSelected(BKUs.KS); } } @@ -149,7 +149,7 @@ public class BKUSelectionComposite extends StateComposite { * Create the composite. * @param parent * @param style - * @param state + * @param state */ public BKUSelectionComposite(Composite parent, int style, State state) { super(parent, style, state); @@ -229,9 +229,9 @@ public class BKUSelectionComposite extends StateComposite { */ @Override 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.btnMobile.setText(Messages.getString("bku_selection.mobile")); // + this.btnCard.setText(Messages.getString("bku_selection.card")); // if (this.btnKS != null) - this.btnKS.setText(Messages.getString("bku_selection.ks")); //$NON-NLS-1$ + this.btnKS.setText(Messages.getString("bku_selection.ks")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java index f2e10726..10a2a2f4 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java @@ -140,7 +140,7 @@ public class ConfigurationComposite extends StateComposite { /** * Create the composite. - * + * * @param parent * @param style * @param state @@ -166,7 +166,7 @@ public class ConfigurationComposite extends StateComposite { this.tabFolder.setFont(new Font(Display.getCurrent(), fD_tabFolder[0])); this.simpleTabItem = new TabItem(this.tabFolder, SWT.NONE); - this.simpleTabItem.setText(Messages.getString("config.Simple")); //$NON-NLS-1$ + this.simpleTabItem.setText(Messages.getString("config.Simple")); // ScrolledComposite simpleCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL)); this.simpleTabItem.setControl(simpleCompositeScr); @@ -177,7 +177,7 @@ public class ConfigurationComposite extends StateComposite { simpleCompositeScr.setMinSize(simpleConfigComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT)); this.advancedTabItem = new TabItem(this.tabFolder, SWT.NONE); - this.advancedTabItem.setText(Messages.getString("config.Advanced")); //$NON-NLS-1$ + this.advancedTabItem.setText(Messages.getString("config.Advanced")); // ScrolledComposite advancedCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL)); this.advancedTabItem.setControl(advancedCompositeScr); @@ -188,7 +188,7 @@ public class ConfigurationComposite extends StateComposite { advancedCompositeScr.setMinSize(advancedConfigComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT)); this.aboutTabItem = new TabItem(this.tabFolder, SWT.NONE); - this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); //$NON-NLS-1$ + this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); // ScrolledComposite aboutCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL)); this.aboutTabItem.setControl(aboutCompositeScr); @@ -219,7 +219,7 @@ public class ConfigurationComposite extends StateComposite { } } }); - this.btnSpeichern.setText(Messages.getString("common.Save")); //$NON-NLS-1$ + this.btnSpeichern.setText(Messages.getString("common.Save")); // getShell().setDefaultButton(this.btnSpeichern); FontData[] fD_btnSpeichern = this.btnSpeichern.getFont().getFontData(); @@ -231,7 +231,7 @@ public class ConfigurationComposite extends StateComposite { fd_btnAbrechen.right = new FormAttachment(this.btnSpeichern, -10); fd_btnAbrechen.bottom = new FormAttachment(this.btnSpeichern, 0, SWT.BOTTOM); this.btnAbbrechen.setLayoutData(fd_btnAbrechen); - this.btnAbbrechen.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$ + this.btnAbbrechen.setText(Messages.getString("common.Cancel")); // this.btnAbbrechen.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -287,8 +287,8 @@ public class ConfigurationComposite extends StateComposite { public void keystoreEnabled(boolean enabled) { if (enabled && this.keystoreConfigComposite == null) { this.keystoreTabItem = new TabItem(this.tabFolder, SWT.NONE, 2); - this.keystoreTabItem.setText(Messages.getString("config.Keystore")); //$NON-NLS-1$ - + this.keystoreTabItem.setText(Messages.getString("config.Keystore")); // + ScrolledComposite keystoreCompositeScr = new ScrolledComposite( this.tabFolder, SWT.H_SCROLL | SWT.V_SCROLL); this.keystoreTabItem.setControl(keystoreCompositeScr); @@ -313,7 +313,7 @@ public class ConfigurationComposite extends StateComposite { /** * Sets the configuration manipulator - * + * * @param manipulator */ public void setConfigManipulator(ConfigManipulator manipulator) { @@ -322,7 +322,7 @@ public class ConfigurationComposite extends StateComposite { /** * Sets the configuration provider - * + * * @param provider */ public void setConfigProvider(PersistentConfigProvider provider) { @@ -351,7 +351,7 @@ public class ConfigurationComposite extends StateComposite { redo = false; status = true; } catch (ResumableException e) { - log.error("Settings validation failed!", e); //$NON-NLS-1$ + log.error("Settings validation failed!", e); // ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE); int rc = dialog.open(); @@ -380,7 +380,7 @@ public class ConfigurationComposite extends StateComposite { redo = false; status = true; } catch (ResumableException e) { - log.error("Settings validation failed!", e); //$NON-NLS-1$ + log.error("Settings validation failed!", e); // ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE); int rc = dialog.open(); @@ -402,19 +402,19 @@ public class ConfigurationComposite extends StateComposite { status = false; redo = false; resumeIndex = 0; - + do { try { this.keystoreConfigComposite.validateSettings(resumeIndex); - + redo = false; status = true; } catch (ResumableException e) { - log.error("Settings validation failed!", e); //$NON-NLS-1$ + log.error("Settings validation failed!", e); // ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE); int rc = dialog.open(); - + redo = (rc == SWT.RETRY); if (rc == SWT.IGNORE) { @@ -423,16 +423,16 @@ public class ConfigurationComposite extends StateComposite { } } } while (redo); - + if (!status) { return false; } } } catch (Exception e) { - log.error("Settings validation failed!", e); //$NON-NLS-1$ + log.error("Settings validation failed!", e); // String message = e.getMessage(); if (message == null) - message = Messages.getString("error.Unexpected"); //$NON-NLS-1$ + message = Messages.getString("error.Unexpected"); // ErrorDialog dialog = new ErrorDialog(getShell(), message, BUTTONS.OK); dialog.open(); @@ -461,21 +461,21 @@ public class ConfigurationComposite extends StateComposite { redo = false; status = true; } catch (IOException e) { - log.error("Failed to save configuration to file!", e); //$NON-NLS-1$ + log.error("Failed to save configuration to file!", e); // ErrorDialog dialog = new ErrorDialog(getShell(), - Messages.getString("error.FailedToSaveSettings"), BUTTONS.RETRY_CANCEL); //$NON-NLS-1$ + Messages.getString("error.FailedToSaveSettings"), BUTTONS.RETRY_CANCEL); // redo = (dialog.open() == SWT.RETRY); // return false; } } while (redo); - + return status; } /** * Checks if the user has finished working with the configuration composite - * + * * @return if the user is done */ public boolean isUserDone() { @@ -489,7 +489,7 @@ public class ConfigurationComposite extends StateComposite { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ @Override @@ -509,10 +509,10 @@ public class ConfigurationComposite extends StateComposite { */ @Override public void reloadResources() { - this.simpleTabItem.setText(Messages.getString("config.Simple")); //$NON-NLS-1$ - this.advancedTabItem.setText(Messages.getString("config.Advanced")); //$NON-NLS-1$ - this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); //$NON-NLS-1$ - this.btnSpeichern.setText(Messages.getString("common.Save")); //$NON-NLS-1$ - this.btnAbbrechen.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$ + this.simpleTabItem.setText(Messages.getString("config.Simple")); // + this.advancedTabItem.setText(Messages.getString("config.Advanced")); // + this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); // + this.btnSpeichern.setText(Messages.getString("common.Save")); // + this.btnAbbrechen.setText(Messages.getString("common.Cancel")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java index 51b8441c..dda55a47 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java @@ -59,10 +59,10 @@ public class DataSourceSelectComposite extends StateComposite { public void openFileDialog() { FileDialog dialog = new FileDialog( DataSourceSelectComposite.this.getShell(), SWT.OPEN); - dialog.setFilterExtensions(new String[] { "*.pdf", "*" }); //$NON-NLS-1$ //$NON-NLS-2$ + dialog.setFilterExtensions(new String[] { "*.pdf", "*" }); // // dialog.setFilterNames(new String[] { - Messages.getString("common.PDFExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.AllExtension_Description") }); //$NON-NLS-1$ + Messages.getString("common.PDFExtension_Description"), // + Messages.getString("common.AllExtension_Description") }); // String fileName = dialog.open(); File file = null; if (fileName != null) { @@ -102,7 +102,7 @@ public class DataSourceSelectComposite extends StateComposite { /** * Sets the selected file and calls update to the workflow - * + * * @param selected */ protected void setSelected(File selected) { @@ -112,7 +112,7 @@ public class DataSourceSelectComposite extends StateComposite { /** * Gets the selected file - * + * * @return the selected file */ public File getSelected() { @@ -124,13 +124,13 @@ public class DataSourceSelectComposite extends StateComposite { this.borderColor = this.activeBorder; this.redrawDrop(); } - + void MarkDragLeave() { this.backgroundColor = this.inactiveBackground; this.borderColor = this.inactiveBorder; this.redrawDrop(); } - + void redrawDrop() { this.lbl_drag.setBackground(this.backgroundColor); this.lbl_drag2.setBackground(this.backgroundColor); @@ -138,17 +138,17 @@ public class DataSourceSelectComposite extends StateComposite { this.drop_area.redraw(); this.drop_area.layout(true, true); } - + Color activeBackground; Color inactiveBackground; Color inactiveBorder; Color activeBorder; Color borderColor; Color backgroundColor; - + /** * Create the composite. - * + * * @param parent * @param style * @param state @@ -162,7 +162,7 @@ public class DataSourceSelectComposite extends StateComposite { this.activeBorder = Constants.MAINBAR_ACTIVE_BACK_DARK; this.backgroundColor = this.inactiveBackground; this.borderColor = Constants.DROP_BORDER_COLOR; - + this.setLayout(new FormLayout()); // Color back = new Color(Display.getCurrent(), 77, 190, 250); @@ -175,28 +175,28 @@ public class DataSourceSelectComposite extends StateComposite { fd_drop_area.bottom = new FormAttachment(100, -30); this.drop_area.setLayoutData(fd_drop_area); this.drop_area.setLayout(new FormLayout()); - + this.drop_area.addPaintListener(new PaintListener() { - + @Override public void paintControl(PaintEvent e) { Rectangle clientArea = DataSourceSelectComposite.this .drop_area.getClientArea(); - + //e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9)); e.gc.setForeground(DataSourceSelectComposite.this.borderColor); e.gc.setLineWidth(3); e.gc.setLineStyle(SWT.LINE_DASH); e.gc.setBackground(DataSourceSelectComposite.this.backgroundColor); - e.gc.fillRoundRectangle(clientArea.x, - clientArea.y, clientArea.width - 2, clientArea.height - 2, + e.gc.fillRoundRectangle(clientArea.x, + clientArea.y, clientArea.width - 2, clientArea.height - 2, 10, 10); - e.gc.drawRoundRectangle(clientArea.x, - clientArea.y, clientArea.width - 2, clientArea.height - 2, + e.gc.drawRoundRectangle(clientArea.x, + clientArea.y, clientArea.width - 2, clientArea.height - 2, 10, 10); } }); - + DropTarget dnd_target = new DropTarget(this.drop_area, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK); final FileTransfer fileTransfer = FileTransfer.getInstance(); Transfer[] types = new Transfer[] { fileTransfer }; @@ -207,7 +207,7 @@ public class DataSourceSelectComposite extends StateComposite { public void drop(DropTargetEvent event) { if (fileTransfer.isSupportedType(event.currentDataType)) { if (event.data == null) { - log.error("Dropped file name was null"); //$NON-NLS-1$ + log.error("Dropped file name was null"); // return; } String[] files = (String[]) event.data; @@ -215,7 +215,7 @@ public class DataSourceSelectComposite extends StateComposite { // Only taking first file ... File file = new File(files[0]); if (!file.exists()) { - log.error(String.format(Messages.getString("error.FileNotExist"), files[0])); //$NON-NLS-1$ + log.error(String.format(Messages.getString("error.FileNotExist"), files[0])); // return; } DataSourceSelectComposite.this.setSelected(file); @@ -253,7 +253,7 @@ public class DataSourceSelectComposite extends StateComposite { }); this.lbl_drag2 = new Label(this.drop_area, SWT.NONE | SWT.RESIZE ); - + this.lbl_drag = new Label(this.drop_area, SWT.NONE | SWT.RESIZE ); this.fd_lbl_drag = new FormData(); this.fd_lbl_drag.left = new FormAttachment(0, 10); @@ -264,10 +264,10 @@ public class DataSourceSelectComposite extends StateComposite { FontData[] fD = this.lbl_drag.getFont().getFontData(); fD[0].setHeight(Constants.TEXT_SIZE_BIG); this.lbl_drag.setFont(new Font(Display.getCurrent(), fD[0])); - this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //$NON-NLS-1$ + this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); // this.lbl_drag.setAlignment(SWT.CENTER); - - + + this.fd_lbl_drag2 = new FormData(); this.fd_lbl_drag2.left = new FormAttachment(0, 10); this.fd_lbl_drag2.right = new FormAttachment(100, -10); @@ -278,16 +278,16 @@ public class DataSourceSelectComposite extends StateComposite { fD2[0].setHeight(Constants.TEXT_SIZE_NORMAL); this.lbl_drag2.setFont(new Font(Display.getCurrent(), fD2[0])); this.lbl_drag2.setText(Messages - .getString("dataSourceSelection.DropLabel2")); //$NON-NLS-1$ + .getString("dataSourceSelection.DropLabel2")); // this.lbl_drag2.setAlignment(SWT.CENTER); - + this.btn_open = new Button(this.drop_area, SWT.NATIVE | SWT.RESIZE); - this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); //$NON-NLS-1$ - + this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); // + FontData[] fD_open = this.btn_open.getFont().getFontData(); fD_open[0].setHeight(Constants.TEXT_SIZE_BUTTON); this.btn_open.setFont(new Font(Display.getCurrent(), fD_open[0])); - + /* lbl_drag.addListener(SWT.Resize, new Listener() { @@ -297,7 +297,7 @@ public class DataSourceSelectComposite extends StateComposite { 50, -1 * (lbl_drag.getSize().y / 2)); DataSourceSelectComposite.this.fd_lbl_drag.left = new FormAttachment( 50, -1 * (lbl_drag.getSize().x / 2)); - + Point size = btn_open.computeSize(SWT.DEFAULT, SWT.DEFAULT); DataSourceSelectComposite.this.fd_btn_open.top = new FormAttachment( 50, (lbl_drag.getSize().y / 2) + 10); @@ -343,7 +343,7 @@ public class DataSourceSelectComposite extends StateComposite { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.components.StateComposite#doLayout() */ @Override @@ -357,8 +357,8 @@ public class DataSourceSelectComposite extends StateComposite { */ @Override public void reloadResources() { - this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //$NON-NLS-1$ - this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); //$NON-NLS-1$ - this.lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2")); //$NON-NLS-1$ + this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); // + this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); // + this.lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java index cf722d35..197d2bcc 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java @@ -50,7 +50,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { .getLogger(MobileBKUEnterNumberComposite.class);
/**
- *
+ *
*/
private final SelectionListener okListener = new SelectionAdapter() {
@Override
@@ -58,13 +58,13 @@ public class MobileBKUEnterNumberComposite extends StateComposite { if(!MobileBKUEnterNumberComposite.this.btn_ok.isEnabled()) {
return;
}
-
+
try {
String number = MobileBKUEnterNumberComposite.this.txt_number
.getText();
number = number.replaceAll("\\s","");
-
+
MobileBKUEnterNumberComposite.this.setMobileNumber(number);
MobileBKUEnterNumberComposite.this.mobileNumber = number;
@@ -78,17 +78,17 @@ public class MobileBKUEnterNumberComposite extends StateComposite { MobileBKUEnterNumberComposite.this.userAck = true;
MobileBKUEnterNumberComposite.this.btn_ok.setEnabled(false);
-
+
} catch(InvalidPasswordException ex) {
- log.error("Validating input for Mobile BKU failed!", ex); //$NON-NLS-1$
+ log.error("Validating input for Mobile BKU failed!", ex); //
MobileBKUEnterNumberComposite.this
.setErrorMessage(ex.getMessage());
MobileBKUEnterNumberComposite.this.txt_password.setFocus();
}
catch (Exception ex) {
- log.error("Validating input for Mobile BKU failed!", ex); //$NON-NLS-1$
+ log.error("Validating input for Mobile BKU failed!", ex); //
MobileBKUEnterNumberComposite.this
- .setErrorMessage(Messages.getString("error.InvalidPhoneNumber")); //$NON-NLS-1$
+ .setErrorMessage(Messages.getString("error.InvalidPhoneNumber")); //
MobileBKUEnterNumberComposite.this.txt_number.setFocus();
return;
}
@@ -96,7 +96,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { };
/**
- *
+ *
*/
private final SelectionListener cancelListener = new SelectionAdapter() {
@Override
@@ -144,13 +144,13 @@ public class MobileBKUEnterNumberComposite extends StateComposite { if (this.errorMessage != null) {
this.lbl_error.setText(this.errorMessage);
} else {
- this.lbl_error.setText(""); //$NON-NLS-1$
+ this.lbl_error.setText(""); //
}
}
/**
* Create the composite.
- *
+ *
* @param parent
* @param style
* @param state
@@ -179,8 +179,8 @@ public class MobileBKUEnterNumberComposite extends StateComposite { fd_containerComposite.left = new FormAttachment(50, -200);
fd_containerComposite.right = new FormAttachment(50, 200);
containerComposite.setLayoutData(fd_containerComposite);
-
-
+
+
this.txt_number = new Text(containerComposite, SWT.SINGLE | SWT.NATIVE | SWT.BORDER);
FormData fd_number = new FormData();
fd_number.bottom = new FormAttachment(50, -10);
@@ -189,20 +189,20 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.txt_number.setLayoutData(fd_number);
this.txt_number.setEditable(true);
-
+
this.lbl_number = new Label(containerComposite, SWT.NATIVE);
this.lbl_number.setAlignment(SWT.RIGHT);
- this.lbl_number.setText(Messages.getString("mobileBKU.number")); //$NON-NLS-1$
+ this.lbl_number.setText(Messages.getString("mobileBKU.number")); //
FormData fd_lbl_number = new FormData();
fd_lbl_number.bottom = new FormAttachment(50, -10);
fd_lbl_number.right = new FormAttachment(50, -10);
this.lbl_number.setLayoutData(fd_lbl_number);
Label lbl_image = new Label(containerComposite, SWT.NATIVE);
-
+
ImageData data = new ImageData(this.getClass().getResourceAsStream(Constants.RES_IMG_MOBILE));
- Image mobile = new Image(getDisplay(), data);
-
+ Image mobile = new Image(getDisplay(), data);
+
FormData fd_lbl_image = new FormData();
fd_lbl_image.top = new FormAttachment(20, -1 * (data.width / 2));
fd_lbl_image.bottom = new FormAttachment(20, data.width / 2);
@@ -210,8 +210,8 @@ public class MobileBKUEnterNumberComposite extends StateComposite { fd_lbl_image.width = data.width;
lbl_image.setLayoutData(fd_lbl_image);
lbl_image.setImage(mobile);
-
-
+
+
this.txt_password = new Text(containerComposite, SWT.SINGLE | SWT.PASSWORD
| SWT.BORDER | SWT.NATIVE);
FormData fd_password = new FormData();
@@ -223,14 +223,14 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.lbl_password = new Label(containerComposite, SWT.NATIVE);
this.lbl_password.setAlignment(SWT.RIGHT);
- this.lbl_password.setText(Messages.getString("mobileBKU.password")); //$NON-NLS-1$
+ this.lbl_password.setText(Messages.getString("mobileBKU.password")); //
FormData fd_lbl_password = new FormData();
fd_lbl_password.top = new FormAttachment(50, 10);
fd_lbl_password.right = new FormAttachment(50, -10);
this.lbl_password.setLayoutData(fd_lbl_password);
this.btn_ok = new Button(containerComposite, SWT.NATIVE);
- this.btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$
+ this.btn_ok.setText(Messages.getString("common.Ok")); //
FormData fd_btn_ok = new FormData();
fd_btn_ok.bottom = new FormAttachment(100, -20);
fd_btn_ok.right = new FormAttachment(100, -20);
@@ -238,19 +238,19 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.btn_ok.addSelectionListener(this.okListener);
this.btn_cancel = new Button(containerComposite, SWT.NATIVE);
- this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$
+ this.btn_cancel.setText(Messages.getString("common.Cancel")); //
FormData fd_btn_cancel = new FormData();
fd_btn_cancel.bottom = new FormAttachment(100, -20);
fd_btn_cancel.right = new FormAttachment(this.btn_ok, -10);
this.btn_cancel.setLayoutData(fd_btn_cancel);
this.btn_cancel.addSelectionListener(this.cancelListener);
- this.lbl_error = new Label(containerComposite, SWT.WRAP | SWT.NATIVE );
+ this.lbl_error = new Label(containerComposite, SWT.WRAP | SWT.NATIVE );
FormData fd_lbl_error = new FormData();
- fd_lbl_error.top = new FormAttachment(87, -15);
- fd_lbl_error.bottom = new FormAttachment(103, -20);
+ fd_lbl_error.top = new FormAttachment(87, -15);
+ fd_lbl_error.bottom = new FormAttachment(103, -20);
fd_lbl_error.left = new FormAttachment(5, 0);
- fd_lbl_error.right = new FormAttachment(this.btn_cancel, -10);
+ fd_lbl_error.right = new FormAttachment(this.btn_cancel, -10);
this.lbl_error.setLayoutData(fd_lbl_error);
}
@@ -266,10 +266,10 @@ public class MobileBKUEnterNumberComposite extends StateComposite { public void enableButton() {
this.btn_ok.setEnabled(true);
}
-
+
/**
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#doLayout()
*/
@Override
@@ -295,7 +295,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.txt_number.setText(this.mobileNumber);
this.txt_password.setFocus();
} else {
- this.txt_number.setText(""); //$NON-NLS-1$
+ this.txt_number.setText(""); //
}
}
@@ -305,7 +305,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { public String getMobilePassword() {
return this.mobilePassword;
}
-
+
/**
@@ -318,7 +318,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { if (this.mobilePassword != null) {
this.txt_password.setText(this.mobilePassword);
} else {
- this.txt_password.setText(""); //$NON-NLS-1$
+ this.txt_password.setText(""); //
}
}
@@ -327,9 +327,9 @@ public class MobileBKUEnterNumberComposite extends StateComposite { */
@Override
public void reloadResources() {
- this.lbl_number.setText(Messages.getString("mobileBKU.number")); //$NON-NLS-1$
- this.lbl_password.setText(Messages.getString("mobileBKU.password")); //$NON-NLS-1$
- this.btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$
+ this.lbl_number.setText(Messages.getString("mobileBKU.number")); //
+ this.lbl_password.setText(Messages.getString("mobileBKU.password")); //
+ this.btn_ok.setText(Messages.getString("common.Ok")); //
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java index 8120d269..1e754e9a 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java @@ -53,7 +53,7 @@ import at.asit.pdfover.gui.workflow.states.State; public class MobileBKUEnterTANComposite extends StateComposite {
/**
- *
+ *
*/
private final class OkSelectionListener extends SelectionAdapter {
/**
@@ -74,19 +74,19 @@ public class MobileBKUEnterTANComposite extends StateComposite { if (tan.isEmpty()) {
MobileBKUEnterTANComposite.this.setMessage(Messages
- .getString("error.NoTan")); //$NON-NLS-1$
+ .getString("error.NoTan")); //
return;
}
if (MobileBKUEnterTANComposite.this.refVal.startsWith(tan)) {
MobileBKUEnterTANComposite.this.setMessage(Messages
- .getString("error.EnteredReferenceValue")); //$NON-NLS-1$
+ .getString("error.EnteredReferenceValue")); //
return;
}
if (tan.length() > 6) {
MobileBKUEnterTANComposite.this.setMessage(Messages
- .getString("error.TanTooLong")); //$NON-NLS-1$
+ .getString("error.TanTooLong")); //
return;
}
@@ -99,7 +99,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { }
/**
- *
+ *
*/
private final class CancelSelectionListener extends SelectionAdapter {
/**
@@ -171,12 +171,12 @@ public class MobileBKUEnterTANComposite extends StateComposite { /**
* Set how many tries are left
- *
+ *
* @param tries
*/
public void setTries(int tries) {
- this.lblTries.setText(tries == 1 ? Messages.getString("tanEnter.try") : //$NON-NLS-1$
- String.format(Messages.getString("tanEnter.tries"), tries)); //$NON-NLS-1$
+ this.lblTries.setText(tries == 1 ? Messages.getString("tanEnter.try") : //
+ String.format(Messages.getString("tanEnter.tries"), tries)); //
}
/**
@@ -185,16 +185,16 @@ public class MobileBKUEnterTANComposite extends StateComposite { */
public void setErrorMessage(String errorMessage) {
if (errorMessage == null)
- this.lblTries.setText(""); //$NON-NLS-1$
+ this.lblTries.setText(""); //
else
this.lblTries.setText(
- Messages.getString("error.Title") + ": " + errorMessage); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.getString("error.Title") + ": " + errorMessage); // //
}
/**
* Sets the message
- *
+ *
* @param msg
*/
public void setMessage(String msg) {
@@ -225,7 +225,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { public String getRefVal() {
return this.refVal;
}
-
+
/**
* Enables the submit button
*/
@@ -243,7 +243,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { if (this.refVal != null) {
this.lblRefVal.setText(this.refVal);
} else {
- this.lblRefVal.setText(""); //$NON-NLS-1$
+ this.lblRefVal.setText(""); //
}
}
@@ -263,7 +263,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { this.tan = tan;
if (this.tan == null) {
- this.txt_tan.setText(""); //$NON-NLS-1$
+ this.txt_tan.setText(""); //
} else {
this.txt_tan.setText(this.tan);
}
@@ -284,24 +284,24 @@ public class MobileBKUEnterTANComposite extends StateComposite { try {
String signatureData = MobileBKUEnterTANComposite.this
.getSignatureData();
- if (signatureData != null && !signatureData.equals("")) { //$NON-NLS-1$
- log.debug("Trying to open " + signatureData); //$NON-NLS-1$
+ if (signatureData != null && !signatureData.equals("")) { //
+ log.debug("Trying to open " + signatureData); //
if (Desktop.isDesktopSupported()) {
Desktop.getDesktop().browse(new URI(signatureData));
} else {
- log.info("SWT Desktop is not supported on this platform"); //$NON-NLS-1$
+ log.info("SWT Desktop is not supported on this platform"); //
Program.launch(signatureData);
}
}
} catch (Exception ex) {
- log.error("OpenSelectionListener: ", ex); //$NON-NLS-1$
+ log.error("OpenSelectionListener: ", ex); //
}
}
}
/**
* Create the composite.
- *
+ *
* @param parent
* @param style
* @param state
@@ -341,7 +341,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { fd_lblRefValLabel.bottom = new FormAttachment(50, -10);
this.lblRefValLabel.setLayoutData(fd_lblRefValLabel);
this.lblRefValLabel.setText(Messages
- .getString("tanEnter.ReferenceValue")); //$NON-NLS-1$
+ .getString("tanEnter.ReferenceValue")); //
Label lbl_image = new Label(containerComposite, SWT.NATIVE);
@@ -364,7 +364,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { // fd_lblRefVal.top = new FormAttachment(30, -15);
fd_lblRefVal.bottom = new FormAttachment(50, -10);
this.lblRefVal.setLayoutData(fd_lblRefVal);
- this.lblRefVal.setText(""); //$NON-NLS-1$
+ this.lblRefVal.setText(""); //
this.lblTan = new Label(containerComposite, SWT.NATIVE);
this.lblTan.setAlignment(SWT.RIGHT);
@@ -374,7 +374,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { fd_lblTan.top = new FormAttachment(50, 10);
// fd_lblTan.bottom = new FormAttachment(50, 15);
this.lblTan.setLayoutData(fd_lblTan);
- this.lblTan.setText(Messages.getString("tanEnter.TAN")); //$NON-NLS-1$
+ this.lblTan.setText(Messages.getString("tanEnter.TAN")); //
this.txt_tan = new Text(containerComposite, SWT.BORDER | SWT.NATIVE);
FormData fd_text = new FormData();
@@ -402,12 +402,12 @@ public class MobileBKUEnterTANComposite extends StateComposite { public void modifyText(ModifyEvent e) {
String text = MobileBKUEnterTANComposite.this.txt_tan.getText();
- //log.debug("Current TAN: " + text); //$NON-NLS-1$
+ //log.debug("Current TAN: " + text); //
if (text.length() > 3
&& MobileBKUEnterTANComposite.this.getRefVal()
.startsWith(text.trim())) {
MobileBKUEnterTANComposite.this.setMessage(Messages
- .getString("error.EnteredReferenceValue")); //$NON-NLS-1$
+ .getString("error.EnteredReferenceValue")); //
}
}
});
@@ -420,8 +420,8 @@ public class MobileBKUEnterTANComposite extends StateComposite { lnk_sig_data.setEnabled(true);
lnk_sig_data.setLayoutData(fd_lnk_data);
lnk_sig_data.addSelectionListener(new ShowSignatureDataListener());
- lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //$NON-NLS-1$
- lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //$NON-NLS-1$
+ lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //
+ lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //
this.btn_ok = new Button(containerComposite, SWT.NATIVE);
this.btn_cancel = new Button(containerComposite, SWT.NATIVE);
@@ -441,7 +441,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { fd_btn_ok.bottom = new FormAttachment(100, -20);
this.btn_ok.setLayoutData(fd_btn_ok);
- this.btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$
+ this.btn_ok.setText(Messages.getString("common.Ok")); //
this.btn_ok.addSelectionListener(new OkSelectionListener());
FormData fd_btn_cancel = new FormData();
@@ -451,7 +451,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { fd_btn_cancel.bottom = new FormAttachment(100, -20);
this.btn_cancel.setLayoutData(fd_btn_cancel);
- this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$
+ this.btn_cancel.setText(Messages.getString("common.Cancel")); //
this.btn_cancel.addSelectionListener(new CancelSelectionListener());
}
@@ -462,7 +462,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#doLayout()
*/
@Override
@@ -472,13 +472,13 @@ public class MobileBKUEnterTANComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#reloadResources()
*/
@Override
public void reloadResources() {
this.lblRefValLabel.setText(Messages
- .getString("tanEnter.ReferenceValue")); //$NON-NLS-1$
- this.lblTan.setText(Messages.getString("tanEnter.TAN")); //$NON-NLS-1$
+ .getString("tanEnter.ReferenceValue")); //
+ this.lblTan.setText(Messages.getString("tanEnter.TAN")); //
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java index 7d477f62..02c0b9b3 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java @@ -48,7 +48,7 @@ import at.asit.pdfover.gui.workflow.states.State; public class MobileBKUFingerprintComposite extends StateComposite {
/**
- *
+ *
*/
private final class SMSSelectionListener extends SelectionAdapter {
/**
@@ -69,7 +69,7 @@ public class MobileBKUFingerprintComposite extends StateComposite { }
/**
- *
+ *
*/
private final class CancelSelectionListener extends SelectionAdapter {
/**
@@ -151,10 +151,10 @@ public class MobileBKUFingerprintComposite extends StateComposite { */
public void setErrorMessage(String errorMessage) {
if (errorMessage == null)
- this.lblError.setText(""); //$NON-NLS-1$
+ this.lblError.setText(""); //
else
this.lblError.setText(
- Messages.getString("error.Title") + ": " + errorMessage); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.getString("error.Title") + ": " + errorMessage); // //
}
/**
@@ -198,7 +198,7 @@ public class MobileBKUFingerprintComposite extends StateComposite { if (this.refVal != null) {
this.lblRefVal.setText(this.refVal);
} else {
- this.lblRefVal.setText(""); //$NON-NLS-1$
+ this.lblRefVal.setText(""); //
}
}
@@ -219,24 +219,24 @@ public class MobileBKUFingerprintComposite extends StateComposite { try {
String signatureData = MobileBKUFingerprintComposite.this
.getSignatureData();
- if (signatureData != null && !signatureData.equals("")) { //$NON-NLS-1$
- log.debug("Trying to open " + signatureData); //$NON-NLS-1$
+ if (signatureData != null && !signatureData.equals("")) { //
+ log.debug("Trying to open " + signatureData); //
if (Desktop.isDesktopSupported()) {
Desktop.getDesktop().browse(new URI(signatureData));
} else {
- log.info("SWT Desktop is not supported on this platform"); //$NON-NLS-1$
+ log.info("SWT Desktop is not supported on this platform"); //
Program.launch(signatureData);
}
}
} catch (Exception ex) {
- log.error("OpenSelectionListener: ", ex); //$NON-NLS-1$
+ log.error("OpenSelectionListener: ", ex); //
}
}
}
/**
* Create the composite.
- *
+ *
* @param parent
* @param style
* @param state
@@ -297,7 +297,7 @@ public class MobileBKUFingerprintComposite extends StateComposite { fd_lblRefVal.top = new FormAttachment(30, -10);
//fd_lblRefVal.bottom = new FormAttachment(50, -10);
this.lblRefVal.setLayoutData(fd_lblRefVal);
- this.lblRefVal.setText("test"); //$NON-NLS-1$
+ this.lblRefVal.setText("test"); //
this.lblFPLabel = new Label(containerComposite, SWT.NATIVE);
this.lblFPLabel.setAlignment(SWT.LEFT);
@@ -355,7 +355,7 @@ public class MobileBKUFingerprintComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#doLayout()
*/
@Override
@@ -365,17 +365,17 @@ public class MobileBKUFingerprintComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#reloadResources()
*/
@Override
public void reloadResources() {
this.lblRefValLabel.setText(Messages
- .getString("tanEnter.ReferenceValue")); //$NON-NLS-1$
- this.lblFPLabel.setText(Messages.getString("tanEnter.FP")); //$NON-NLS-1$
- this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //$NON-NLS-1$
- this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //$NON-NLS-1$
- this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$
- this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //$NON-NLS-1$
+ .getString("tanEnter.ReferenceValue")); //
+ this.lblFPLabel.setText(Messages.getString("tanEnter.FP")); //
+ this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //
+ this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //
+ this.btn_cancel.setText(Messages.getString("common.Cancel")); //
+ this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java index 0303ae09..303415a1 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java @@ -50,7 +50,7 @@ import at.asit.pdfover.gui.workflow.states.State; public class MobileBKUQRComposite extends StateComposite {
/**
- *
+ *
*/
private final class SMSSelectionListener extends SelectionAdapter {
/**
@@ -71,7 +71,7 @@ public class MobileBKUQRComposite extends StateComposite { }
/**
- *
+ *
*/
private final class CancelSelectionListener extends SelectionAdapter {
/**
@@ -155,10 +155,10 @@ public class MobileBKUQRComposite extends StateComposite { */
public void setErrorMessage(String errorMessage) {
if (errorMessage == null)
- this.lblError.setText(""); //$NON-NLS-1$
+ this.lblError.setText(""); //
else
this.lblError.setText(
- Messages.getString("error.Title") + ": " + errorMessage); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.getString("error.Title") + ": " + errorMessage); // //
}
/**
@@ -202,7 +202,7 @@ public class MobileBKUQRComposite extends StateComposite { if (this.refVal != null) {
this.lblRefVal.setText(this.refVal);
} else {
- this.lblRefVal.setText(""); //$NON-NLS-1$
+ this.lblRefVal.setText(""); //
}
}
@@ -213,7 +213,7 @@ public class MobileBKUQRComposite extends StateComposite { */
public void setQR(InputStream qrcode) {
if (qrcode == null) {
- setErrorMessage(Messages.getString("error.FailedToLoadQRCode")); //$NON-NLS-1$
+ setErrorMessage(Messages.getString("error.FailedToLoadQRCode")); //
return;
}
Image qr = new Image(Display.getCurrent(), qrcode);
@@ -235,24 +235,24 @@ public class MobileBKUQRComposite extends StateComposite { try {
String signatureData = MobileBKUQRComposite.this
.getSignatureData();
- if (signatureData != null && !signatureData.equals("")) { //$NON-NLS-1$
- log.debug("Trying to open " + signatureData); //$NON-NLS-1$
+ if (signatureData != null && !signatureData.equals("")) { //
+ log.debug("Trying to open " + signatureData); //
if (Desktop.isDesktopSupported()) {
Desktop.getDesktop().browse(new URI(signatureData));
} else {
- log.info("SWT Desktop is not supported on this platform"); //$NON-NLS-1$
+ log.info("SWT Desktop is not supported on this platform"); //
Program.launch(signatureData);
}
}
} catch (Exception ex) {
- log.error("OpenSelectionListener: ", ex); //$NON-NLS-1$
+ log.error("OpenSelectionListener: ", ex); //
}
}
}
/**
* Create the composite.
- *
+ *
* @param parent
* @param style
* @param state
@@ -313,7 +313,7 @@ public class MobileBKUQRComposite extends StateComposite { fd_lblRefVal.top = new FormAttachment(30, -10);
//fd_lblRefVal.bottom = new FormAttachment(50, -10);
this.lblRefVal.setLayoutData(fd_lblRefVal);
- this.lblRefVal.setText(""); //$NON-NLS-1$
+ this.lblRefVal.setText(""); //
this.lblQRLabel = new Label(containerComposite, SWT.NATIVE);
this.lblQRLabel.setAlignment(SWT.RIGHT);
@@ -379,7 +379,7 @@ public class MobileBKUQRComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#doLayout()
*/
@Override
@@ -389,17 +389,17 @@ public class MobileBKUQRComposite extends StateComposite { /*
* (non-Javadoc)
- *
+ *
* @see at.asit.pdfover.gui.composites.StateComposite#reloadResources()
*/
@Override
public void reloadResources() {
this.lblRefValLabel.setText(Messages
- .getString("tanEnter.ReferenceValue")); //$NON-NLS-1$
- this.lblQRLabel.setText(Messages.getString("tanEnter.QR")); //$NON-NLS-1$
- this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //$NON-NLS-1$
- this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //$NON-NLS-1$
- this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$
- this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //$NON-NLS-1$
+ .getString("tanEnter.ReferenceValue")); //
+ this.lblQRLabel.setText(Messages.getString("tanEnter.QR")); //
+ this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //
+ this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //
+ this.btn_cancel.setText(Messages.getString("common.Cancel")); //
+ this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java index 84ef58d3..a9315b4c 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java @@ -82,7 +82,7 @@ public class OutputComposite extends StateComposite { /** * Create the composite. - * + * * @param parent * The parent composite * @param style @@ -156,7 +156,7 @@ public class OutputComposite extends StateComposite { /** * Sets the input file - * + * * @param inputFile * the input file */ @@ -166,7 +166,7 @@ public class OutputComposite extends StateComposite { /** * Gets the input file - * + * * @return the input file */ public File getInputFile() { @@ -182,7 +182,7 @@ public class OutputComposite extends StateComposite { /** * Gets the signed document - * + * * @return the signed document */ public DocumentSource getSignedDocument() { @@ -191,7 +191,7 @@ public class OutputComposite extends StateComposite { /** * Sets the signed document - * + * * @param signedDocument * the signed document */ @@ -226,7 +226,7 @@ public class OutputComposite extends StateComposite { /** * Saves the signed document. - * + * * If user has a default output directory set, try to save there. * If not (or if directory unavailable), ask user for location. */ @@ -254,17 +254,17 @@ public class OutputComposite extends StateComposite { FileDialog save = new FileDialog(this.getShell(), SWT.SAVE | SWT.NATIVE); - save.setFilterExtensions(new String[] { "*.pdf", "*" }); //$NON-NLS-1$ //$NON-NLS-2$ - save.setFilterNames(new String[] { - Messages.getString("common.PDFExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.AllExtension_Description")}); //$NON-NLS-1$ + save.setFilterExtensions(new String[] { "*.pdf", "*" }); // // + save.setFilterNames(new String[] { + Messages.getString("common.PDFExtension_Description"), // + Messages.getString("common.AllExtension_Description")}); // save.setFilterPath(inputFolder.getAbsolutePath()); save.setFileName(proposedName); outputFileName = save.open(); inputFolder = null; } - log.debug("Trying to save to '" + outputFileName + "'"); //$NON-NLS-1$ //$NON-NLS-2$ + log.debug("Trying to save to '" + outputFileName + "'"); // // this.outputFile = saveResultAsFile(inputFolder, outputFileName); this.saveFailed = (this.outputFile == null); @@ -279,7 +279,7 @@ public class OutputComposite extends StateComposite { * Save the signed document under the given filename * @param inputFolder the Folder the original document is located at * @param target the filename to save the document as - * + * * @return saved File (or null if unsuccessful) * @throws FileNotFoundException * @throws IOException @@ -293,8 +293,8 @@ public class OutputComposite extends StateComposite { targetFile = new File(inputFolder, target); if (targetFile.exists()) { - Dialog dialog = new Dialog(getShell(), Messages.getString("common.warning"), //$NON-NLS-1$ - String.format(Messages.getString("output.file_ask_overwrite"), targetFile.getName()), //$NON-NLS-1$ + Dialog dialog = new Dialog(getShell(), Messages.getString("common.warning"), // + String.format(Messages.getString("output.file_ask_overwrite"), targetFile.getName()), // BUTTONS.OK_CANCEL, ICON.QUESTION); if (dialog.open() == SWT.CANCEL) { @@ -313,18 +313,18 @@ public class OutputComposite extends StateComposite { source.getByteArray().length); outstream.close(); } catch (FileNotFoundException e) { - log.warn("Failed to open output file", e); //$NON-NLS-1$ + log.warn("Failed to open output file", e); // ErrorDialog dialog = new ErrorDialog(getShell(), - String.format(Messages.getString("output.save_failed"), //$NON-NLS-1$ + String.format(Messages.getString("output.save_failed"), // targetFile.getName(), e.getLocalizedMessage()), BUTTONS.RETRY_CANCEL); if (dialog.open() == SWT.CANCEL) return null; retry = true; } catch (IOException e) { - log.error("I/O Error", e); //$NON-NLS-1$ + log.error("I/O Error", e); // ErrorDialog dialog = new ErrorDialog(getShell(), - String.format(Messages.getString("output.save_failed"), //$NON-NLS-1$ + String.format(Messages.getString("output.save_failed"), // targetFile.getName(), e.getLocalizedMessage()), BUTTONS.RETRY_CANCEL); if (dialog.open() == SWT.CANCEL) @@ -335,8 +335,8 @@ public class OutputComposite extends StateComposite { if (!targetFile.exists()) { - log.error("Tried to save file " + targetFile.getName() + //$NON-NLS-1$ - ", but it doesn't exist"); //$NON-NLS-1$ + log.error("Tried to save file " + targetFile.getName() + // + ", but it doesn't exist"); // return null; } return targetFile; @@ -369,7 +369,7 @@ public class OutputComposite extends StateComposite { try { OutputComposite.this.saveDocument(); } catch (Exception ex) { - log.error("SaveSelectionListener: ", ex); //$NON-NLS-1$ + log.error("SaveSelectionListener: ", ex); // } } } @@ -396,22 +396,22 @@ public class OutputComposite extends StateComposite { // Normalize filename File f = new File(FilenameUtils.normalize( OutputComposite.this.outputFile.getAbsolutePath())); - log.debug("Trying to open " + f.toString()); //$NON-NLS-1$ - // work around for the case of Linux and Java version 8 + log.debug("Trying to open " + f.toString()); // + // work around for the case of Linux and Java version 8 if (isSpecialCase()) { - reReloadResources(f.toString()); + reReloadResources(f.toString()); return; } else if (Desktop.isDesktopSupported()) { Desktop.getDesktop().open(f); } else { - log.info("AWT Desktop is not supported on this platform"); //$NON-NLS-1$ + log.info("AWT Desktop is not supported on this platform"); // Program.launch(f.getAbsolutePath()); } } catch (IOException ex) { - log.error("OpenSelectionListener: ", ex); //$NON-NLS-1$ + log.error("OpenSelectionListener: ", ex); // ErrorDialog error = new ErrorDialog(getShell(), - String.format(Messages.getString("error.FailedToOpenDocument"), //$NON-NLS-1$ + String.format(Messages.getString("error.FailedToOpenDocument"), // ex.getLocalizedMessage()), BUTTONS.RETRY_CANCEL); if (error.open() == SWT.RETRY) widgetSelected(e); @@ -426,7 +426,7 @@ public class OutputComposite extends StateComposite { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ @Override @@ -437,63 +437,63 @@ public class OutputComposite extends StateComposite { /** * @return true when linux and java version <= 8 - * + * */ public boolean isSpecialCase() { boolean isSCase = false; try { - String os = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ - if (os.contains("linux")) { //$NON-NLS-1$ - String version = System.getProperty("java.version"); //$NON-NLS-1$ - if (version.contains(".")) { //$NON-NLS-1$ - String[] parts = version.split("\\."); //$NON-NLS-1$ + String os = System.getProperty("os.name").toLowerCase(); // + if (os.contains("linux")) { // + String version = System.getProperty("java.version"); // + if (version.contains(".")) { // + String[] parts = version.split("\\."); // isSCase = Integer.valueOf(parts[0]) <= 8 ? true : false; } else { isSCase = Integer.valueOf(version) <= 8 ? true : false; } } } catch (Exception e) { - log.debug("Error: " + e.getMessage()); //$NON-NLS-1$ + log.debug("Error: " + e.getMessage()); // isSCase = false; } return isSCase; } - + /* (non-Javadoc) * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ @Override public void reloadResources() { this.lbl_success_message.setText(Messages - .getString("output.success_message")); //$NON-NLS-1$ + .getString("output.success_message")); // if (this.outputFile == null) { this.lnk_saved_file.setText(Messages - .getString("output.link_save_message")); //$NON-NLS-1$ + .getString("output.link_save_message")); // } else { this.lnk_saved_file.setText(Messages - .getString("output.link_open_message")); //$NON-NLS-1$ + .getString("output.link_open_message")); // } - this.btn_save.setText(Messages.getString("common.Save")); //$NON-NLS-1$ + this.btn_save.setText(Messages.getString("common.Save")); // } - + /** * @param str */ public void reReloadResources(String str) { - this.lbl_success_message.setText(Messages.getString("output.success_message")); //$NON-NLS-1$ + this.lbl_success_message.setText(Messages.getString("output.success_message")); // if (this.outputFile == null) { this.lnk_saved_file.setText(Messages - .getString("output.link_save_message")); //$NON-NLS-1$ + .getString("output.link_save_message")); // } else { - String str2 = "File location: " + str; //$NON-NLS-1$ + String str2 = "File location: " + str; // this.lbl_success_message.setText(str2); - this.lnk_saved_file.setText(""); //$NON-NLS-1$ + this.lnk_saved_file.setText(""); // } - this.btn_save.setText(Messages.getString("common.Save")); //$NON-NLS-1$ + this.btn_save.setText(Messages.getString("common.Save")); // } - - - + + + } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java index c38a9427..a98cdf9e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java @@ -73,7 +73,7 @@ public class PositioningComposite extends StateComposite { /** * Create the composite. - * + * * @param parent * @param style * @param state @@ -91,7 +91,7 @@ public class PositioningComposite extends StateComposite { this.bottomBar.setLayout(new FormLayout()); this.btnSign = new Button(this.bottomBar, SWT.PUSH); - this.btnSign.setText(Messages.getString("positioning.sign")); //$NON-NLS-1$ + this.btnSign.setText(Messages.getString("positioning.sign")); // FormData fd_btnSign = new FormData(); fd_btnSign.right = new FormAttachment(100); fd_btnSign.top = new FormAttachment(0); @@ -105,7 +105,7 @@ public class PositioningComposite extends StateComposite { }); this.btnNewPage = new Button(this.bottomBar, SWT.TOGGLE); - this.btnNewPage.setText(Messages.getString("positioning.newPage")); //$NON-NLS-1$ + this.btnNewPage.setText(Messages.getString("positioning.newPage")); // FormData fd_btnNewPage = new FormData(); fd_btnNewPage.right = new FormAttachment(this.btnSign); fd_btnNewPage.top = new FormAttachment(0); @@ -157,7 +157,7 @@ public class PositioningComposite extends StateComposite { /** * Set the PDF Document to display - * + * * @param document * document to display */ @@ -224,7 +224,7 @@ public class PositioningComposite extends StateComposite { /** * Set the signature placeholder image Must be called _after_ * displayDocument - * + * * @param placeholder * signature placeholder * @param width @@ -350,21 +350,21 @@ public class PositioningComposite extends StateComposite { if ((previousPage > numPages) && (currentPage <= numPages)) { // Was on new page PositioningComposite.this.btnNewPage.setText( - Messages.getString("positioning.newPage")); //$NON-NLS-1$ + Messages.getString("positioning.newPage")); // PositioningComposite.this.btnNewPage.setSelection(false); PositioningComposite.this.bottomBar.layout(); PositioningComposite.this.scrollbar.setMaximum(numPages + 1); } else if ((previousPage <= numPages) && (currentPage > numPages)) { // Go to new page PositioningComposite.this.btnNewPage.setText( - Messages.getString("positioning.removeNewPage")); //$NON-NLS-1$ + Messages.getString("positioning.removeNewPage")); // PositioningComposite.this.btnNewPage.setSelection(true); PositioningComposite.this.bottomBar.layout(); PositioningComposite.this.scrollbar.setMaximum(numPages + 2); } PositioningComposite.this.scrollbar.setSelection(currentPage); PositioningComposite.this.lblPage.setText(String.format( - Messages.getString("positioning.page"), currentPage, numPages)); //$NON-NLS-1$ + Messages.getString("positioning.page"), currentPage, numPages)); // } }); EventQueue.invokeLater(new Runnable() { @@ -382,7 +382,7 @@ public class PositioningComposite extends StateComposite { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.components.StateComposite#doLayout() */ @Override @@ -393,7 +393,7 @@ public class PositioningComposite extends StateComposite { /** * Translate the signature placeholder position - * + * * @param sigXOffset * signature placeholder horizontal position offset * @param sigYOffset @@ -411,7 +411,7 @@ public class PositioningComposite extends StateComposite { /** * Set the signature position and continue to the next state - * + * * @param position * the signature position */ @@ -427,7 +427,7 @@ public class PositioningComposite extends StateComposite { /** * Set the signature position - * + * * @param x * the horizontal signature position * @param y @@ -443,7 +443,7 @@ public class PositioningComposite extends StateComposite { /** * Get the signature position - * + * * @return the signature position */ public SignaturePosition getPosition() { @@ -456,11 +456,11 @@ public class PositioningComposite extends StateComposite { @Override public void reloadResources() { if (this.currentPage <= this.numPages) - this.btnNewPage.setText(Messages.getString("positioning.newPage")); //$NON-NLS-1$ + this.btnNewPage.setText(Messages.getString("positioning.newPage")); // else - this.btnNewPage.setText(Messages.getString("positioning.removeNewPage")); //$NON-NLS-1$ - this.btnSign.setText(Messages.getString("positioning.sign")); //$NON-NLS-1$ - this.lblPage.setText(String.format(Messages.getString("positioning.page"), //$NON-NLS-1$ + this.btnNewPage.setText(Messages.getString("positioning.removeNewPage")); // + this.btnSign.setText(Messages.getString("positioning.sign")); // + this.lblPage.setText(String.format(Messages.getString("positioning.page"), // this.currentPage, this.numPages)); } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java index 1911ac67..408bfa5e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java @@ -42,7 +42,7 @@ import com.sun.pdfview.PDFFile; import com.sun.pdfview.PDFPage;
/**
- *
+ *
*/
public class SignaturePanel extends JPanel {
/**
@@ -146,7 +146,7 @@ public class SignaturePanel extends JPanel { * Set the signature placeholder image
* @param placeholder signature placeholder
* @param width width of the placeholder in page space
- * @param height height of the placeholder in page space
+ * @param height height of the placeholder in page space
* @param transparency transparency of the signature placeholder (0 - 255)
*/
public void setSignaturePlaceholder(Image placeholder, int width, int height, int transparency) {
@@ -175,7 +175,7 @@ public class SignaturePanel extends JPanel { /**
* Add and display a new page at the end of the document
- *
+ *
* This page has the same dimensions as the old last page
*/
public void addNewLastPage() {
@@ -224,7 +224,7 @@ public class SignaturePanel extends JPanel { /**
* Stop the generation of any previous page, and draw the new one.
- *
+ *
* @param page the PDFPage to draw.
*/
private synchronized void showPage(PDFPage page) {
@@ -290,7 +290,7 @@ public class SignaturePanel extends JPanel { try {
this.currentXform = this.currentXform.createInverse();
} catch (NoninvertibleTransformException nte) {
- log.error("Error inverting page transform!", nte); //$NON-NLS-1$
+ log.error("Error inverting page transform!", nte); //
}
if (this.sigPagePos == null)
@@ -319,7 +319,7 @@ public class SignaturePanel extends JPanel { g.fillRect(0, 0, getWidth(), getHeight());
if (this.currentImage == null) {
g.setColor(Color.black);
- g.drawString(Messages.getString("error.SignaturePanel.NoPage"), getWidth() / 2 - 30, //$NON-NLS-1$
+ g.drawString(Messages.getString("error.SignaturePanel.NoPage"), getWidth() / 2 - 30, //
getHeight() / 2);
if (this.currentPage != null) {
showPage(this.currentPage);
@@ -366,7 +366,7 @@ public class SignaturePanel extends JPanel { g_phs.drawImage(placeholder, 0, 0, null);
// Draw grey "Signature" overlay
- String overlay = Messages.getString("positioning.signature"); //$NON-NLS-1$
+ String overlay = Messages.getString("positioning.signature"); //
// Voodoo to get overlay font scale
float scale = (((float) this.sigScreenWidth) / this.sigPlaceholder.getWidth(null)) * 150;
g_phs.setFont(getFont().deriveFont(scale));
@@ -399,7 +399,7 @@ public class SignaturePanel extends JPanel { showPage(this.currentPage);
}
g.setColor(Color.black);
- g.drawString(Messages.getString("error.SignaturePanel.NoRender"), getWidth() / 2 - 30, //$NON-NLS-1$
+ g.drawString(Messages.getString("error.SignaturePanel.NoRender"), getWidth() / 2 - 30, //
getHeight() / 2);
}
}
@@ -408,7 +408,7 @@ public class SignaturePanel extends JPanel { /**
* Handles notification of the fact that some part of the image changed.
* Repaints that portion.
- *
+ *
* @return true if more updates are desired.
*/
@Override
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java index 119c1607..5fc5dc55 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java @@ -37,7 +37,7 @@ public abstract class StateComposite extends Composite { /** * The base class for state composites - * + * * @param parent The parent Composite * @param style The Composite style * @param state The current State @@ -49,10 +49,10 @@ public abstract class StateComposite extends Composite { /** * Performs layout for all children in composite - * (SWT layout(...) only layouts children no grandchildren!) + * (SWT layout(...) only layouts children no grandchildren!) */ public abstract void doLayout(); - + /** * Reloads the localizeable resources */ @@ -79,32 +79,32 @@ public abstract class StateComposite extends Composite { private final Control c; private final FormData fd = new FormData(); public AnchorSetter(Control c) { this.c = c; } - + public void set() { this.c.setLayoutData(this.fd); } - + public AnchorSetter height(int h) { fd.height = h; return this; } public AnchorSetter width(int w) { fd.width = w; return this; } - + public AnchorSetter top(FormAttachment a) { fd.top = a; return this; } public AnchorSetter left(FormAttachment a) { fd.left = a; return this; } public AnchorSetter right(FormAttachment a) { fd.right = a; return this; } public AnchorSetter bottom(FormAttachment a) { fd.bottom = a; return this; } - + public AnchorSetter top(Control control, int offset, int alignment) { return top(new FormAttachment(control, offset, alignment)); } public AnchorSetter top(Control control, int offset) { return top(new FormAttachment(control, offset)); } public AnchorSetter top(int num, int offset) { return top(new FormAttachment(num, offset)); } public AnchorSetter top(int num) { return top(new FormAttachment(num)); } - + public AnchorSetter left(Control control, int offset, int alignment) { return left(new FormAttachment(control, offset, alignment)); } public AnchorSetter left(Control control, int offset) { return left(new FormAttachment(control, offset)); } public AnchorSetter left(int num, int offset) { return left(new FormAttachment(num, offset)); } public AnchorSetter left(int num) { return left(new FormAttachment(num)); } - + public AnchorSetter right(Control control, int offset, int alignment) { return right(new FormAttachment(control, offset, alignment)); } public AnchorSetter right(Control control, int offset) { return right(new FormAttachment(control, offset)); } public AnchorSetter right(int num, int offset) { return right(new FormAttachment(num, offset)); } public AnchorSetter right(int num) { return right(new FormAttachment(num)); } - + public AnchorSetter bottom(Control control, int offset, int alignment) { return bottom(new FormAttachment(control, offset, alignment)); } public AnchorSetter bottom(Control control, int offset) { return bottom(new FormAttachment(control, offset)); } public AnchorSetter bottom(int num, int offset) { return bottom(new FormAttachment(num, offset)); } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java index deecb09d..1bfb33c3 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java @@ -28,7 +28,7 @@ import at.asit.pdfover.commons.Messages; import at.asit.pdfover.gui.workflow.states.State; /** - * + * */ public class WaitingComposite extends StateComposite { private Label lbl_description; @@ -37,12 +37,12 @@ public class WaitingComposite extends StateComposite { * Create the composite. * @param parent * @param style - * @param state + * @param state */ public WaitingComposite(Composite parent, int style, State state) { super(parent, style, state); setLayout(new FormLayout()); - + this.lbl_description = new Label(this, SWT.NATIVE); FormData fd_lbl_description = new FormData(); fd_lbl_description.bottom = new FormAttachment(50, -10); @@ -50,8 +50,8 @@ public class WaitingComposite extends StateComposite { fd_lbl_description.right = new FormAttachment(100, -10); this.lbl_description.setLayoutData(fd_lbl_description); this.lbl_description.setAlignment(SWT.CENTER); - this.lbl_description.setText(Messages.getString("waiting.message")); //$NON-NLS-1$ - + this.lbl_description.setText(Messages.getString("waiting.message")); // + ProgressBar progressBar = new ProgressBar(this, SWT.HORIZONTAL | SWT.INDETERMINATE); FormData fd_progressBar = new FormData(); fd_progressBar.top = new FormAttachment(50, +10); @@ -79,6 +79,6 @@ public class WaitingComposite extends StateComposite { */ @Override public void reloadResources() { - this.lbl_description.setText(Messages.getString("waiting.message")); //$NON-NLS-1$ + this.lbl_description.setText(Messages.getString("waiting.message")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java index 310a38e9..ca865df9 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java @@ -31,15 +31,15 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent;
/**
- *
+ *
*/
public class WaitingForAppComposite extends StateComposite {
private Label lbl_description;
- private Button btn_sms;
+ private Button btn_sms;
private Button btn_cancel;
- private Boolean isUserSMS = false;
- private Boolean userCancel = false;
- private Boolean isDone = false;
+ private Boolean isUserSMS = false;
+ private Boolean userCancel = false;
+ private Boolean isDone = false;
/**
* @return the isDone
@@ -59,12 +59,12 @@ public class WaitingForAppComposite extends StateComposite { * Create the composite.
* @param parent
* @param style
- * @param state
+ * @param state
*/
public WaitingForAppComposite(Composite parent, int style, State state) {
super(parent, style, state);
setLayout(new FormLayout());
-
+
this.lbl_description = new Label(this, SWT.NATIVE);
FormData fd_lbl_description = new FormData();
fd_lbl_description.bottom = new FormAttachment(50, -10);
@@ -72,8 +72,8 @@ public class WaitingForAppComposite extends StateComposite { fd_lbl_description.right = new FormAttachment(100, -10);
this.lbl_description.setLayoutData(fd_lbl_description);
this.lbl_description.setAlignment(SWT.CENTER);
- this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //$NON-NLS-1$
-
+ this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //
+
ProgressBar progressBar = new ProgressBar(this, SWT.HORIZONTAL | SWT.INDETERMINATE);
FormData fd_progressBar = new FormData();
fd_progressBar.top = new FormAttachment(50, +10);
@@ -81,30 +81,30 @@ public class WaitingForAppComposite extends StateComposite { fd_progressBar.left = new FormAttachment(50, -100);
fd_progressBar.right = new FormAttachment(50, +100);
progressBar.setLayoutData(fd_progressBar);
-
+
this.btn_sms = new Button(this, SWT.NONE);
this.btn_sms.addSelectionListener(new SMSSelectionListener());
-
+
FormData fd_btnSMS = new FormData();
fd_btnSMS.top = new FormAttachment(progressBar, 24);
fd_btnSMS.right = new FormAttachment(progressBar, 0, SWT.RIGHT);
this.btn_sms.setLayoutData(fd_btnSMS);
- this.btn_sms.setText(Messages.getString("SMS tan")); //$NON-NLS-1$
-
+ this.btn_sms.setText(Messages.getString("SMS tan")); //
+
this.btn_cancel = new Button(this, SWT.NONE);
this.btn_cancel.addSelectionListener(new CancelSelectionListener());
FormData fd_btnCancel = new FormData();
fd_btnCancel.top = new FormAttachment(btn_sms, 0, SWT.TOP);
fd_btnCancel.right = new FormAttachment(btn_sms, -6);
this.btn_cancel.setLayoutData(fd_btnCancel);
- this.btn_cancel.setText(Messages.getString("WaitingForAppComposite.btnCancel.text")); //$NON-NLS-1$
-
+ this.btn_cancel.setText(Messages.getString("WaitingForAppComposite.btnCancel.text")); //
+
reloadResources();
}
-
+
/**
- *
+ *
*/
private final class CancelSelectionListener extends SelectionAdapter {
/**
@@ -120,7 +120,7 @@ public class WaitingForAppComposite extends StateComposite { WaitingForAppComposite.this.btn_sms.setEnabled(false);
}
}
-
+
private final class SMSSelectionListener extends SelectionAdapter {
/**
* Empty constructor
@@ -139,9 +139,9 @@ public class WaitingForAppComposite extends StateComposite { WaitingForAppComposite.this.btn_cancel.setEnabled(false);
}
}
-
+
public void setUserSMS(boolean b) {
- this.isUserSMS = b;
+ this.isUserSMS = b;
}
@Override
@@ -162,10 +162,10 @@ public class WaitingForAppComposite extends StateComposite { */
@Override
public void reloadResources() {
- this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //$NON-NLS-1$
- this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //$NON-NLS-1$
- this.btn_cancel.setText(Messages.getString("common.Cancel")); //$NON-NLS-1$
- this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //$NON-NLS-1$
+ this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //
+ this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //
+ this.btn_cancel.setText(Messages.getString("common.Cancel")); //
+ this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //
}
/**
@@ -179,8 +179,8 @@ public class WaitingForAppComposite extends StateComposite { * @param b
*/
public void setUserCancel(boolean b) {
- this.userCancel = b;
-
+ this.userCancel = b;
+
}
/**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java index a0a423c4..2779727f 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java @@ -127,7 +127,7 @@ public class AboutComposite extends ConfigurationCompositeBase { */ @Override public void reloadResources() { - this.lnkAbout.setText(Messages.getString("config.AboutText")); //$NON-NLS-1$ + this.lnkAbout.setText(Messages.getString("config.AboutText")); // this.lblDataProtection.setText(Messages.getString("config.DataProtection")); this.lnkDataProtection.setText(Messages.getString("config.DataProtectionStatement")); this.btnOpenLogDirectory.setText(Messages.getString("config.ShowLogDirectory")); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java index 1c894e5c..6f8561e3 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java @@ -62,7 +62,7 @@ import at.asit.pdfover.signator.SignaturePosition; /** * Composite for advanced configuration - * + * * Contains the simple configuration composite */ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { @@ -301,10 +301,10 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { dlg.setFilterPath(AdvancedConfigurationComposite.this.txtOutputFolder.getText()); // Change the title bar text - dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title")); //$NON-NLS-1$ + dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title")); // // Customizable message displayed in the dialog - dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog")); //$NON-NLS-1$ + dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog")); // // Calling open() will open and run the dialog. // It will return the selected directory, or @@ -393,12 +393,12 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { Composite compProxyHostContainer = new Composite(this.grpProxy, SWT.NONE); compProxyHostContainer.setLayout(new FormLayout()); compProxyHostContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); - + this.txtProxyHost = new Text(compProxyHostContainer, SWT.BORDER); StateComposite.anchor(txtProxyHost).right(100,-42).top(0).left(0,5).set(); StateComposite.setFontHeight(txtProxyHost, Constants.TEXT_SIZE_NORMAL); - this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, ""); //$NON-NLS-1$ + this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, ""); // StateComposite.anchor(proxyHostErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set(); this.proxyHostErrorMarker.setVisible(false); @@ -433,7 +433,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { } }); - this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, ""); //$NON-NLS-1$ + this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, ""); // StateComposite.anchor(txtProxyPortErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set(); this.txtProxyPortErrorMarker.setVisible(false); @@ -449,14 +449,14 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { private void performPostFixChanged(String postfix) { - log.debug("Save file postfix changed to : {}", postfix); //$NON-NLS-1$ + log.debug("Save file postfix changed to : {}", postfix); // this.configurationContainer.setSaveFilePostFix(postfix); AdvancedConfigurationComposite.this.txtSaveFilePostFix.setText(postfix); } /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#signerChanged() */ @@ -466,25 +466,25 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { } void performOutputFolderChanged(String foldername) { - log.debug("Selected Output folder: {}", foldername); //$NON-NLS-1$ + log.debug("Selected Output folder: {}", foldername); // this.configurationContainer.setOutputFolder(foldername); AdvancedConfigurationComposite.this.txtOutputFolder.setText(foldername); } int getBKUElementIndex(BKUs bku) { - String lookup = "BKU." + bku.toString(); //$NON-NLS-1$ + String lookup = "BKU." + bku.toString(); // String bkuName = Messages.getString(lookup); int i = this.bkuStrings.indexOf(bkuName); if (i == -1) { - log.warn("NO BKU match for {}", bkuName); //$NON-NLS-1$ + log.warn("NO BKU match for {}", bkuName); // return 0; } return i; } void performBKUSelectionChanged(BKUs selected) { - log.debug("Selected BKU: {}", selected); //$NON-NLS-1$ + log.debug("Selected BKU: {}", selected); // this.configurationContainer.setDefaultBKU(selected); this.cmbBKUAuswahl.select(this.getBKUElementIndex(selected)); } @@ -494,8 +494,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { BKUs bkuvalue = resolveBKU(selected); this.performBKUSelectionChanged(bkuvalue); } catch (Exception ex) { - log.error("Failed to parse BKU value: {} {}", selected, ex); //$NON-NLS-1$ - ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK); //$NON-NLS-1$ + log.error("Failed to parse BKU value: {} {}", selected, ex); // + ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK); // dialog.open(); } } @@ -504,7 +504,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { int blen = BKUs.values().length; for (int i = 0; i < blen; i++) { - String lookup = "BKU." + BKUs.values()[i].toString(); //$NON-NLS-1$ + String lookup = "BKU." + BKUs.values()[i].toString(); // if (Messages.getString(lookup).equals(localizedBKU)) { return BKUs.values()[i]; } @@ -516,23 +516,23 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { int getLocaleElementIndex(Locale locale) { for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) { if (Constants.SUPPORTED_LOCALES[i].equals(locale)) { - log.debug("Locale: {} IDX: {}", locale, i); //$NON-NLS-1$ //$NON-NLS-2$ + log.debug("Locale: {} IDX: {}", locale, i); // // return i; } } - log.warn("NO Locale match for {}", locale); //$NON-NLS-1$ + log.warn("NO Locale match for {}", locale); // return 0; } void performLocaleSelectionChanged(Locale selected) { - log.debug("Selected Locale: {}", selected); //$NON-NLS-1$ + log.debug("Selected Locale: {}", selected); // this.configurationContainer.setLocale(selected); this.cmbLocaleAuswahl.select(this.getLocaleElementIndex(selected)); } void performPositionSelection(boolean automatic) { - log.debug("Selected Position: {}", automatic); //$NON-NLS-1$ + log.debug("Selected Position: {}", automatic); // SignaturePosition pos = automatic ? new SignaturePosition() : null; this.configurationContainer.setDefaultSignaturePosition(pos); this.btnAutomatischePositionierung.setSelection(automatic); @@ -596,7 +596,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { } catch (Exception ex) { this.proxyHostErrorMarker.setVisible(true); this.proxyHostErrorMarker.setToolTipText(ex.getMessage()); - log.error("processProxyHost: ", ex); //$NON-NLS-1$ + log.error("processProxyHost: ", ex); // } } @@ -615,7 +615,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { } catch (Exception ex) { this.txtProxyPortErrorMarker.setVisible(true); this.txtProxyPortErrorMarker.setToolTipText(ex.getMessage()); - log.error("processProxyPort: ", ex); //$NON-NLS-1$ + log.error("processProxyPort: ", ex); // } } @@ -639,7 +639,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ @Override @@ -649,7 +649,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#initConfiguration( * at.asit.pdfover.gui.workflow.config.PersistentConfigProvider) @@ -677,7 +677,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { try { this.configurationContainer.setProxyPort(provider.getProxyPortPersistent()); } catch (InvalidPortException e) { - log.error("Failed to set proxy port!", e); //$NON-NLS-1$ + log.error("Failed to set proxy port!", e); // } this.configurationContainer.setProxyUser(provider.getProxyUserPersistent()); this.configurationContainer.setProxyPass(provider.getProxyPassPersistent()); @@ -686,7 +686,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#loadConfiguration() */ @@ -730,7 +730,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /** * @param profile - * + * */ public void performSetSignatureProfile(Profile profile) { switch (profile) { @@ -748,7 +748,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#storeConfiguration( * at.asit.pdfover.gui.workflow.config.ConfigManipulator, @@ -779,8 +779,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { if (hostOld != null && !hostOld.isEmpty() && (hostNew == null || hostNew.isEmpty())) { // Proxy has been removed, let's clear the system properties // Otherwise, the proxy settings wouldn't get removed - System.clearProperty("http.proxyHost"); //$NON-NLS-1$ - System.clearProperty("https.proxyHost"); //$NON-NLS-1$ + System.clearProperty("http.proxyHost"); // + System.clearProperty("https.proxyHost"); // } store.setProxyHost(hostNew); @@ -788,8 +788,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { int portNew = this.configurationContainer.getProxyPort(); if (portOld != -1 && portNew == -1) { // cf. above - System.clearProperty("http.proxyPort"); //$NON-NLS-1$ - System.clearProperty("https.proxyPort"); //$NON-NLS-1$ + System.clearProperty("http.proxyPort"); // + System.clearProperty("https.proxyPort"); // } store.setProxyPort(portNew); @@ -797,8 +797,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { String userNew = this.configurationContainer.getProxyUser(); if (userOld != null && !userOld.isEmpty() && (userNew == null || userNew.isEmpty())) { // cf. above - System.clearProperty("http.proxyUser"); //$NON-NLS-1$ - System.clearProperty("https.proxyUser"); //$NON-NLS-1$ + System.clearProperty("http.proxyUser"); // + System.clearProperty("https.proxyUser"); // } store.setProxyUser(userNew); @@ -806,15 +806,15 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { String passNew = this.configurationContainer.getProxyPass(); if (passOld != null && passNew == null) { // cf. above - System.clearProperty("http.proxyPassword"); //$NON-NLS-1$ - System.clearProperty("https.proxyPassword"); //$NON-NLS-1$ + System.clearProperty("http.proxyPassword"); // + System.clearProperty("https.proxyPassword"); // } store.setProxyPass(passNew); } /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#validateSettings() */ @@ -851,62 +851,62 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ @Override public void reloadResources() { - this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title")); //$NON-NLS-1$ - this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition")); //$NON-NLS-1$ - this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip")); //$NON-NLS-1$ - this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title")); //$NON-NLS-1$ - this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker")); //$NON-NLS-1$ - this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip")); //$NON-NLS-1$ - this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields")); //$NON-NLS-1$ - this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip")); //$NON-NLS-1$ + this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title")); // + this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition")); // + this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip")); // + this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title")); // + this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker")); // + this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip")); // + this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields")); // + this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip")); // this.btnEnablePlaceholderUsage.setText(Messages.getString("advanced_config.Placeholder_Enabled")); - this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat")); //$NON-NLS-1$ - this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip")); //$NON-NLS-1$ - this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency")); //$NON-NLS-1$ - this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin")); //$NON-NLS-1$ - this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax")); //$NON-NLS-1$ - this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip")); //$NON-NLS-1$ - - this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title")); //$NON-NLS-1$ - this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip")); //$NON-NLS-1$ - this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled")); //$NON-NLS-1$ - this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip")); //$NON-NLS-1$ - - this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title")); //$NON-NLS-1$ - this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder")); //$NON-NLS-1$ - this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip")); //$NON-NLS-1$ - this.btnBrowse.setText(Messages.getString("common.browse")); //$NON-NLS-1$ - - this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title")); //$NON-NLS-1$ - this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip")); //$NON-NLS-1$ - - this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title")); //$NON-NLS-1$ - this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck")); //$NON-NLS-1$ - this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip")); //$NON-NLS-1$ - - this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title")); //$NON-NLS-1$ - this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost")); //$NON-NLS-1$ - this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip")); //$NON-NLS-1$ - this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template")); //$NON-NLS-1$ - this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort")); //$NON-NLS-1$ - this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip")); //$NON-NLS-1$ - this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template")); //$NON-NLS-1$ + this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat")); // + this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip")); // + this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency")); // + this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin")); // + this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax")); // + this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip")); // + + this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title")); // + this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip")); // + this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled")); // + this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip")); // + + this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title")); // + this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder")); // + this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip")); // + this.btnBrowse.setText(Messages.getString("common.browse")); // + + this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title")); // + this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip")); // + + this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title")); // + this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck")); // + this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip")); // + + this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title")); // + this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost")); // + this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip")); // + this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template")); // + this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort")); // + this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip")); // + this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template")); // // this.lblProxyUser.setText(Messages.getString("advanced_config.ProxyUser")); - // //$NON-NLS-1$ + // // // this.txtProxyUser.setToolTipText(Messages - // .getString("advanced_config.ProxyUser_ToolTip")); //$NON-NLS-1$ + // .getString("advanced_config.ProxyUser_ToolTip")); // // this.txtProxyUser.setMessage(Messages - // .getString("advanced_config.ProxyUser_Template")); //$NON-NLS-1$ + // .getString("advanced_config.ProxyUser_Template")); // // this.lblProxyPass.setText(Messages.getString("advanced_config.ProxyPass")); - // //$NON-NLS-1$ + // // // this.txtProxyPass.setToolTipText(Messages - // .getString("advanced_config.ProxyPass_ToolTip")); //$NON-NLS-1$ + // .getString("advanced_config.ProxyPass_ToolTip")); // // this.txtProxyPass.setMessage(Messages - // .getString("advanced_config.ProxyPass_Template")); //$NON-NLS-1$ + // .getString("advanced_config.ProxyPass_Template")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/ConfigurationCompositeBase.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/ConfigurationCompositeBase.java index 81011f5e..5dfee07b 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/ConfigurationCompositeBase.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/ConfigurationCompositeBase.java @@ -29,17 +29,17 @@ import at.asit.pdfover.gui.workflow.states.State; * Base class for configuration composites */ public abstract class ConfigurationCompositeBase extends StateComposite { - + /** * the configuration container */ protected ConfigurationContainer configurationContainer; - + /** * The PDF Signer used to produce signature block preview */ protected PDFSigner signer; - + /** * @return the signer */ @@ -64,7 +64,7 @@ public abstract class ConfigurationCompositeBase extends StateComposite { * @param parent * @param style * @param state - * @param configuration + * @param configuration */ public ConfigurationCompositeBase(Composite parent, int style, State state, ConfigurationContainer configuration) { super(parent, style, state); @@ -92,12 +92,12 @@ public abstract class ConfigurationCompositeBase extends StateComposite { /** * Called before exit. * The method validates every setting in the configuration before exit - * + * * There might be settings when the user can decide to ignore a validation exception * (for example the Outputfolder validation) * In this case, the validator throws a ResumableException, which includes the * validator index to resume from (should the user choose to ignore the error) - * + * * @param resumeFrom Resume from this validator index (initially 0) * @throws Exception */ diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java index afcca6ac..2400ac7e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java @@ -62,7 +62,7 @@ import at.asit.pdfover.gui.workflow.states.State; import iaik.security.provider.IAIK; /** - * + * */ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { @@ -174,12 +174,12 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { FileDialog dialog = new FileDialog( KeystoreConfigurationComposite.this.getShell(), SWT.OPEN); dialog.setFilterExtensions(new String[] { - "*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" }); // // // // dialog.setFilterNames(new String[] { - Messages.getString("common.KeystoreExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.PKCS12Extension_Description"), //$NON-NLS-1$ - Messages.getString("common.KSExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.AllExtension_Description") }); //$NON-NLS-1$ + Messages.getString("common.KeystoreExtension_Description"), // + Messages.getString("common.PKCS12Extension_Description"), // + Messages.getString("common.KSExtension_Description"), // + Messages.getString("common.AllExtension_Description") }); // String fileName = dialog.open(); File file = null; if (fileName != null) { @@ -217,24 +217,24 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { try { loadKeystore(); } catch (KeyStoreException ex) { - log.error("Error loading keystore", ex); //$NON-NLS-1$ - showErrorDialog(Messages.getString("error.KeyStore")); //$NON-NLS-1$ + log.error("Error loading keystore", ex); // + showErrorDialog(Messages.getString("error.KeyStore")); // } catch (FileNotFoundException ex) { - log.error("Error loading keystore", ex); //$NON-NLS-1$ + log.error("Error loading keystore", ex); // showErrorDialog(String.format(Messages.getString( - "error.KeyStoreFileNotExist"), f.getName())); //$NON-NLS-1$ + "error.KeyStoreFileNotExist"), f.getName())); // } catch (NoSuchAlgorithmException ex) { - log.error("Error loading keystore", ex); //$NON-NLS-1$ - showErrorDialog(Messages.getString("error.KeyStore")); //$NON-NLS-1$ + log.error("Error loading keystore", ex); // + showErrorDialog(Messages.getString("error.KeyStore")); // } catch (CertificateException ex) { - log.error("Error loading keystore", ex); //$NON-NLS-1$ - showErrorDialog(Messages.getString("error.KeyStore")); //$NON-NLS-1$ + log.error("Error loading keystore", ex); // + showErrorDialog(Messages.getString("error.KeyStore")); // } catch (IOException ex) { - log.error("Error loading keystore", ex); //$NON-NLS-1$ - showErrorDialog(Messages.getString("error.KeyStore")); //$NON-NLS-1$ + log.error("Error loading keystore", ex); // + showErrorDialog(Messages.getString("error.KeyStore")); // } catch (NullPointerException ex) { - log.error("Error loading keystore - NPE?", ex); //$NON-NLS-1$ - showErrorDialog(Messages.getString("error.KeyStore")); //$NON-NLS-1$ + log.error("Error loading keystore - NPE?", ex); // + showErrorDialog(Messages.getString("error.KeyStore")); // } } }); @@ -278,7 +278,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { } void loadKeystore() throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException { - ConfigurationContainer config = + ConfigurationContainer config = KeystoreConfigurationComposite.this.configurationContainer; File f = new File(config.getKeyStoreFile()); this.ks = KeyStore.getInstance(config.getKeyStoreType()); @@ -292,37 +292,37 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { private void initKeystoreTypes() { this.keystoreTypes = new HashMap<String, String>(); - this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12"); //$NON-NLS-1$ //$NON-NLS-2$ - this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS"); //$NON-NLS-1$ //$NON-NLS-2$ + this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12"); // // + this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS"); // // } /** - * @param fileName + * @param fileName */ protected void performKeystoreFileChanged(String fileName) { - log.debug("Selected keystore file: " + fileName); //$NON-NLS-1$ + log.debug("Selected keystore file: " + fileName); // this.configurationContainer.setKeyStoreFile(fileName); KeystoreConfigurationComposite.this.txtKeystoreFile.setText(fileName); int i = fileName.lastIndexOf('.'); if (i > 0) { String ext = fileName.substring(i+1); if ( - ext.equalsIgnoreCase("p12") || //$NON-NLS-1$ - ext.equalsIgnoreCase("pkcs12") || //$NON-NLS-1$ - ext.equalsIgnoreCase("pfx")) //$NON-NLS-1$ - performKeystoreTypeChanged("PKCS12"); //$NON-NLS-1$ + ext.equalsIgnoreCase("p12") || // + ext.equalsIgnoreCase("pkcs12") || // + ext.equalsIgnoreCase("pfx")) // + performKeystoreTypeChanged("PKCS12"); // else if ( - ext.equalsIgnoreCase("ks") || //$NON-NLS-1$ - ext.equalsIgnoreCase("jks")) //$NON-NLS-1$ - performKeystoreTypeChanged("JCEKS"); //$NON-NLS-1$ + ext.equalsIgnoreCase("ks") || // + ext.equalsIgnoreCase("jks")) // + performKeystoreTypeChanged("JCEKS"); // } } /** - * @param type + * @param type */ protected void performKeystoreTypeChanged(String type) { - log.debug("Selected keystore type: " + type); //$NON-NLS-1$ + log.debug("Selected keystore type: " + type); // this.configurationContainer.setKeyStoreType(type); for (int i = 0; i < this.cmbKeystoreType.getItemCount(); ++i) { if (this.keystoreTypes.get(this.cmbKeystoreType.getItem(i)).equals(type)) { @@ -333,10 +333,10 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { } /** - * @param storepass + * @param storepass */ protected void performKeystoreStorePassChanged(String storepass) { - log.debug("Changed keystore store password"); //$NON-NLS-1$ + log.debug("Changed keystore store password"); // this.configurationContainer.setKeyStoreStorePass(storepass); this.txtKeystoreStorePass.setText(storepass); } @@ -345,23 +345,23 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { * @param alias */ protected void performKeystoreAliasChanged(String alias) { - log.debug("Selected keystore alias: " + alias); //$NON-NLS-1$ + log.debug("Selected keystore alias: " + alias); // this.configurationContainer.setKeyStoreAlias(alias); this.cmbKeystoreAlias.setText(alias); } /** - * @param keypass + * @param keypass */ protected void performKeystoreKeyPassChanged(String keypass) { - log.debug("Changed keystore key password"); //$NON-NLS-1$ + log.debug("Changed keystore key password"); // this.configurationContainer.setKeyStoreKeyPass(keypass); this.txtKeystoreKeyPass.setText(keypass); } /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#signerChanged() */ @@ -372,7 +372,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ @Override @@ -412,7 +412,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { if (ksf.exists()) loadKeystore(); } catch (Exception e) { - log.error("Error loading keystore", e); //$NON-NLS-1$ + log.error("Error loading keystore", e); // } performKeystoreAliasChanged(config.getKeyStoreAlias()); performKeystoreKeyPassChanged(config.getKeyStoreKeyPass()); @@ -434,7 +434,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#validateSettings * () @@ -478,24 +478,24 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ @Override public void reloadResources() { - this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title")); //$NON-NLS-1$ - this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile")); //$NON-NLS-1$ - this.btnBrowse.setText(Messages.getString("common.browse")); //$NON-NLS-1$ - this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip")); //$NON-NLS-1$ - this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType")); //$NON-NLS-1$ + this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title")); // + this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile")); // + this.btnBrowse.setText(Messages.getString("common.browse")); // + this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip")); // + this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType")); // initKeystoreTypes(); this.cmbKeystoreType.setItems(this.keystoreTypes.keySet().toArray(new String[0])); - this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass")); //$NON-NLS-1$ - this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip")); //$NON-NLS-1$ - this.btnLoad.setText(Messages.getString("keystore_config.Load")); //$NON-NLS-1$ - this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip")); //$NON-NLS-1$ - this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias")); //$NON-NLS-1$ - this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass")); //$NON-NLS-1$ - this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip")); //$NON-NLS-1$ + this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass")); // + this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip")); // + this.btnLoad.setText(Messages.getString("keystore_config.Load")); // + this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip")); // + this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias")); // + this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass")); // + this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip")); // } } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java index a2973c3d..edf7894f 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java @@ -72,7 +72,7 @@ import at.asit.pdfover.signator.SignatureParameter; import at.asit.pdfover.signator.SignaturePosition; /** - * + * */ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { @@ -105,12 +105,12 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { protected String logoFile = null; protected Image sigPreview = null; protected Image logo = null; - + protected final Group grpSignatureProfile; protected final Combo cmbSignatureProfiles; - + /** * @param parent @@ -162,7 +162,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { StateComposite.anchor(grpSignatureProfile).right(100,-5).left(0,5).top(grpHandySignatur, 5).set(); this.grpSignatureProfile.setLayout(new FormLayout()); StateComposite.setFontHeight(grpSignatureProfile, Constants.TEXT_SIZE_NORMAL); - + this.cmbSignatureProfiles = new Combo(this.grpSignatureProfile, SWT.READ_ONLY); StateComposite.anchor(cmbSignatureProfiles).left(0,10).right(100,-10).top(0,10).bottom(100,-10).set(); StateComposite.setFontHeight(cmbSignatureProfiles, Constants.TEXT_SIZE_NORMAL); @@ -233,7 +233,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { // Only taking first file ... File file = new File(files[0]); if (!file.exists()) { - log.error("File: {} does not exist!", files[0]); //$NON-NLS-1$//$NON-NLS-2$ + log.error("File: {} does not exist!", files[0]); //// return; } processEmblemChanged(file.getAbsolutePath()); @@ -392,11 +392,11 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { } /** - * + * */ private final class ImageFileBrowser extends SelectionAdapter { /** - * + * */ public ImageFileBrowser() { // Nothing to do @@ -407,13 +407,13 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { FileDialog dialog = new FileDialog( SimpleConfigurationComposite.this.getShell(), SWT.OPEN); dialog.setFilterExtensions(new String[] { - "*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + "*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" }); // // // // // dialog.setFilterNames(new String[] { - Messages.getString("common.ImageExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.JPGExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.PNGExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.GIFExtension_Description"), //$NON-NLS-1$ - Messages.getString("common.AllExtension_Description") }); //$NON-NLS-1$ + Messages.getString("common.ImageExtension_Description"), // + Messages.getString("common.JPGExtension_Description"), // + Messages.getString("common.PNGExtension_Description"), // + Messages.getString("common.GIFExtension_Description"), // + Messages.getString("common.AllExtension_Description") }); // String fileName = dialog.open(); File file = null; if (fileName != null) { @@ -447,9 +447,9 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { if (this.signer != null) { SignatureParameter param = this.signer.getPDFSigner().newParameter(); if(this.configurationContainer.getSignatureNote() != null && !this.configurationContainer.getSignatureNote().isEmpty()) { - param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote()); //$NON-NLS-1$ + param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote()); // } - + param.setSignatureLanguage(this.configurationContainer.getSignatureLocale().getLanguage()); param.setSignaturePdfACompat(this.configurationContainer.getSignaturePdfACompat()); if (image != null && !image.trim().isEmpty()) { @@ -461,7 +461,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { //img = SignaturePlaceholderCache.getSWTPlaceholder(param); } } catch (Exception e) { - log.error("Failed to load image for display...", e); //$NON-NLS-1 + log.error("Failed to load image for display...", e); } if (img != null) { @@ -477,7 +477,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { ImageConverter.convertToSWT(CachedFileNameEmblem.fixImage( ImageIO.read(imgFile), imgFile))); } catch (IOException e) { - log.error("Error reading image", e); //$NON-NLS-1$ + log.error("Error reading image", e); // } } else { this.logo = null; @@ -491,10 +491,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { try { setEmblemFileInternal(filename, false); } catch (Exception ex) { - log.error("processEmblemChanged: ", ex); //$NON-NLS-1$ + log.error("processEmblemChanged: ", ex); // ErrorDialog dialog = new ErrorDialog( getShell(), - Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //$NON-NLS-1$ + Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); // dialog.open(); } } @@ -506,8 +506,8 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { } catch (Exception ex) { this.txtMobileNumberErrorMarker.setVisible(true); this.txtMobileNumberErrorMarker.setToolTipText(Messages - .getString("error.InvalidPhoneNumber")); //$NON-NLS-1$ - log.error("processNumberChanged: ", ex); //$NON-NLS-1$ + .getString("error.InvalidPhoneNumber")); // + log.error("processNumberChanged: ", ex); // this.redraw(); this.doLayout(); } @@ -516,17 +516,17 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { int getLocaleElementIndex(Locale locale) { for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) { if (Constants.SUPPORTED_LOCALES[i].equals(locale)) { - log.debug("Locale: {} IDX: {}",locale, i); //$NON-NLS-1$ //$NON-NLS-2$ + log.debug("Locale: {} IDX: {}",locale, i); // // return i; } } - log.warn("NO Locale match for {}", locale); //$NON-NLS-1$ + log.warn("NO Locale match for {}", locale); // return 0; } void performSignatureLangSelectionChanged(Locale selected, Locale previous) { - log.debug("Selected Sign Locale: {}", selected); //$NON-NLS-1$ + log.debug("Selected Sign Locale: {}", selected); // this.configurationContainer.setSignatureLocale(selected); this.cmbSignatureLang.select(this.getLocaleElementIndex(selected)); @@ -535,9 +535,9 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { } - + void preformProfileSelectionChanged(Profile newProfile) { - log.debug("Signature Profile {} was selected", newProfile.name()); //$NON-NLS-1$ + log.debug("Signature Profile {} was selected", newProfile.name()); // Profile oldProfile = this.configurationContainer.getSignatureProfile(); this.configurationContainer.setSignatureProfile(newProfile); this.cmbSignatureProfiles.select(newProfile.ordinal()); @@ -574,7 +574,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#signerChanged() */ @@ -589,7 +589,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { this.configurationContainer.setMobileNumber(number); number = this.configurationContainer.getMobileNumber(); if (number == null) { - this.txtMobileNumber.setText(""); //$NON-NLS-1$ + this.txtMobileNumber.setText(""); // return; } this.txtMobileNumber.setText(number); @@ -602,7 +602,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ @Override @@ -623,7 +623,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { this.configurationContainer.setEmblem( provider.getDefaultEmblemPersistent()); } catch (InvalidEmblemFile e) { - log.error("Failed to set emblem!", e); //$NON-NLS-1$ + log.error("Failed to set emblem!", e); // } this.configurationContainer.setSignatureLocale( @@ -653,10 +653,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { setEmblemFileInternal(emblemFile, true); this.btnClearImage.setSelection(true); } catch (Exception e1) { - log.error("Failed to load emblem: ", e1); //$NON-NLS-1$ + log.error("Failed to load emblem: ", e1); // ErrorDialog dialog = new ErrorDialog( getShell(), - Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //$NON-NLS-1$ + Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); // dialog.open(); } } @@ -670,9 +670,9 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { this.setVisibleImage(); this.performSignatureLangSelectionChanged(this.configurationContainer.getSignatureLocale(), null); - + this.preformProfileSelectionChanged(this.configurationContainer.getSignatureProfile()); - + } /* (non-Javadoc) @@ -688,7 +688,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { store.setSignatureLocale(this.configurationContainer.getSignatureLocale()); store.setSignatureNote(this.configurationContainer.getSignatureNote()); - + store.setSignatureProfile(this.configurationContainer.getSignatureProfile().name()); @@ -696,7 +696,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see * at.asit.pdfover.gui.composites.BaseConfigurationComposite#validateSettings * () @@ -717,7 +717,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase { /* * (non-Javadoc) - * + * * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ @Override |