From e4767bccc7324d4b61a334bf6c0558d0080045e2 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Wed, 6 Jul 2022 12:33:33 +0200 Subject: remove NON-NLS comments, cleanup whitespace --- .../gui/composites/ConfigurationComposite.java | 58 +++++++++++----------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java') 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")); // } } -- cgit v1.2.3