From a2e7931a88fad04611afae01f0940bd00988b9cb Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 19 Dec 2006 21:18:48 +0000 Subject: [PATCH] removing warnings --- .../rse/dstore/security/ImageRegistry.java | 4 +- .../security/UniversalKeystoreProvider.java | 2 - .../security/UniversalSecurityPlugin.java | 4 +- .../preference/CertTableLabelProvider.java | 2 +- .../security/preference/CertTableSorter.java | 4 +- .../security/preference/NewCertDialog.java | 10 +-- .../UniversalSecurityPreferencePage.java | 69 +++++++++---------- .../preference/X509CertificateElement.java | 6 +- .../security/widgets/CertificateForm.java | 6 +- .../widgets/CertificatePropertiesForm.java | 12 ++-- .../wizards/NewCertTableLabelProvider.java | 2 +- .../wizards/SystemImportCertAction.java | 2 - .../wizards/SystemImportCertWizard.java | 15 ++-- .../SystemImportCertWizardAliasPage.java | 4 +- .../SystemImportCertWizardMainPage.java | 4 +- 15 files changed, 70 insertions(+), 76 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java index b4b9daa4fec..6f4d63ba5ea 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/ImageRegistry.java @@ -45,7 +45,7 @@ public class ImageRegistry { public static final String T_OBJ = "obj16"; //$NON-NLS-1$ public static final String T_WIZBAN = "wizban"; //$NON-NLS-1$ - public static final String IMG_CERTIF_FILE = "certif_file.gif"; + public static final String IMG_CERTIF_FILE = "certif_file.gif"; //$NON-NLS-1$ public static final String IMG_WZ_IMPORT_CERTIF = "import_cert_wiz.gif";//"newjprj_wiz.gif";//$NON-NLS-1$ public static final ImageDescriptor DESC_IMG_CERTIF_FILE = createManaged(T_OBJ,IMG_CERTIF_FILE); @@ -96,7 +96,7 @@ public class ImageRegistry { String relPath) { try { ImageDescriptor id = - ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); + ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); //$NON-NLS-1$ //$NON-NLS-1$ if (id != null) { action.setDisabledImageDescriptor(id); diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java index 4a671a68c1d..b7085576159 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalKeystoreProvider.java @@ -22,7 +22,6 @@ import java.util.List; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; import org.eclipse.rse.dstore.security.wizards.SystemImportCertAction; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; public class UniversalKeystoreProvider implements ISystemKeystoreProvider @@ -48,7 +47,6 @@ public class UniversalKeystoreProvider implements ISystemKeystoreProvider public void run() { - Shell shell = Display.getDefault().getActiveShell(); SystemImportCertAction importAction = new SystemImportCertAction(_provider, _certificates, _systemName); importAction.run(); _wasCancelled = importAction.wasCancelled(); diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java index 0277b6530e1..376c5d6776f 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityPlugin.java @@ -32,7 +32,7 @@ import org.osgi.framework.BundleContext; public class UniversalSecurityPlugin extends AbstractUIPlugin { - private final static String KEYSTORE = "dstorekeystore.dat"; + private final static String KEYSTORE = "dstorekeystore.dat"; //$NON-NLS-1$ private static UniversalSecurityPlugin inst; private static ResourceBundle aResourceBundle; public static final String PLUGIN_ID = "org.eclipse.rse.dstore.security"; //$NON-NLS-1$ @@ -80,7 +80,7 @@ public class UniversalSecurityPlugin extends AbstractUIPlugin public static String getKeyStorePassword() { - return "dstore"; + return "dstore"; //$NON-NLS-1$ } public static String getWorkspaceName(){ diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java index 4c186f9dc94..3ed93c68712 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableLabelProvider.java @@ -87,7 +87,7 @@ public class CertTableLabelProvider break; } } - return ""; + return ""; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java index ee3b6bab443..a081f06141a 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java @@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.TableColumn; public class CertTableSorter extends ViewerSorter { - private final static String ASC_SYMBOL = "^"; - private final static String DESC_SYMBOL = "."; + private final static String ASC_SYMBOL = "^"; //$NON-NLS-1$ + private final static String DESC_SYMBOL = "."; //$NON-NLS-1$ private TableViewer tableViewer; private int currentColumn; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java index f15c6b1ec7c..a9410975a0b 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/NewCertDialog.java @@ -97,7 +97,7 @@ public class NewCertDialog extends SystemPromptDialog implements Listener catch(FileNotFoundException e){ String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_KEY_IO_ERROR_); - text = StringModifier.change(text, "%1", _certForm.getPath()); + text = StringModifier.change(text, "%1", _certForm.getPath()); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_LOAD_EXC_); Status err = new Status(IStatus.ERROR,ResourcesPlugin.PI_RESOURCES,IStatus.ERROR,text,e); @@ -108,9 +108,9 @@ public class NewCertDialog extends SystemPromptDialog implements Listener catch(IOException e){ String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_LOAD_IO_EXC_); - text = StringModifier.change(text, "%1", _certForm.getPath()); + text = StringModifier.change(text, "%1", _certForm.getPath()); //$NON-NLS-1$ - text = StringModifier.change(text, "%1", UniversalSecurityPlugin.getKeyStoreLocation()); + text = StringModifier.change(text, "%1", UniversalSecurityPlugin.getKeyStoreLocation()); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_LOAD_EXC_); Status err = new Status(IStatus.ERROR,ResourcesPlugin.PI_RESOURCES,IStatus.ERROR,text,e); @@ -121,7 +121,7 @@ public class NewCertDialog extends SystemPromptDialog implements Listener catch(CertificateException exc){ String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_EXC_); - text = StringModifier.change(text, "%1", _certForm.getPath()); + text = StringModifier.change(text, "%1", _certForm.getPath()); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_LOAD_EXC_); @@ -132,7 +132,7 @@ public class NewCertDialog extends SystemPromptDialog implements Listener } catch(KeyStoreException exc){ String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_KEY_STORE_ERROR_); - text = StringModifier.change(text, "%1", UniversalSecurityPlugin.getKeyStoreLocation()); + text = StringModifier.change(text, "%1", UniversalSecurityPlugin.getKeyStoreLocation()); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_LOAD_EXC_); Status err = new Status(IStatus.ERROR,ResourcesPlugin.PI_RESOURCES,IStatus.ERROR,text,exc); diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java index 2b2b5ecb78a..14a8d41ffb4 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/UniversalSecurityPreferencePage.java @@ -57,7 +57,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; @@ -119,7 +118,7 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements createButtons(buttons); initializeValues(); - SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "ssls0000"); + SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "ssls0000"); //$NON-NLS-1$ return composite; } @@ -159,7 +158,7 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements table.setLayout(tableLayout); // Adjust the table viewer. - String[] properties = new String[] {"STRING", "STRING", "STRING", "NUMBER"}; + String[] properties = new String[] {"STRING", "STRING", "STRING", "NUMBER"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ _viewer.setColumnProperties(properties); _viewer.setContentProvider(new CertTableContentProvider()); _viewer.setLabelProvider(new CertTableLabelProvider()); @@ -220,16 +219,16 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements { String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_IO_SAVE_ERROR_); - text = StringModifier.change(text, "%1", storePath); + text = StringModifier.change(text, "%1", storePath); //$NON-NLS-1$ - text = StringModifier.change(text, "%1", storePath); + text = StringModifier.change(text, "%1", storePath); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_KEYSTORE_SAVE_ERROR_); Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, e); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ return false; } @@ -237,7 +236,7 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements { String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_STORE_ERROR_); - text = StringModifier.change(text, "%1", storePath); + text = StringModifier.change(text, "%1", storePath); //$NON-NLS-1$ String msg = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_KEYSTORE_SAVE_ERROR_); Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, @@ -250,33 +249,33 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements catch (KeyStoreException exc) { String text = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_UNINIT_KEYSTORE_ERROR_); - text = StringModifier.change(text, "%1", UniversalSecurityPlugin + text = StringModifier.change(text, "%1", UniversalSecurityPlugin //$NON-NLS-1$ .getKeyStoreLocation()); String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_KEYSTORE_SAVE_ERROR_"); + .getString("RESID_SECURITY_KEYSTORE_SAVE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ return false; } catch (NoSuchAlgorithmException exc2) { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_ALGORITHM_ERROR_"); - text = StringModifier.change(text, "%1", UniversalSecurityPlugin + .getString("RESID_SECURITY_ALGORITHM_ERROR_"); //$NON-NLS-1$ + text = StringModifier.change(text, "%1", UniversalSecurityPlugin //$NON-NLS-1$ .getKeyStoreLocation()); String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_KEYSTORE_SAVE_ERROR_"); + .getString("RESID_SECURITY_KEYSTORE_SAVE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc2); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ return false; } @@ -324,7 +323,7 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements Key key = _keyStore.getKey(alias, passw.toCharArray()); KeyElement elem = new KeyElement(alias, UniversalSecurityPlugin - .getString("RESID_SECURITY_KEY_ENTRY"), + .getString("RESID_SECURITY_KEY_ENTRY"), //$NON-NLS-1$ key); _tableItems.add(elem); } @@ -340,81 +339,81 @@ public class UniversalSecurityPreferencePage extends PreferencePage implements { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_LOAD_IO_EXC_"); - text = StringModifier.change(text, "%1", storePath); + .getString("RESID_SECURITY_LOAD_IO_EXC_"); //$NON-NLS-1$ + text = StringModifier.change(text, "%1", storePath); //$NON-NLS-1$ String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); + .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, e); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ } catch (CertificateException exc) { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_KEY_LOAD_ERROR_"); - text = StringModifier.change(text, "%1", storePath); + .getString("RESID_SECURITY_KEY_LOAD_ERROR_"); //$NON-NLS-1$ + text = StringModifier.change(text, "%1", storePath); //$NON-NLS-1$ String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); + .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ } catch (KeyStoreException exc) { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_INITIALIZE_ERROR_"); - text = StringModifier.change(text, "%1", UniversalSecurityPlugin + .getString("RESID_SECURITY_INITIALIZE_ERROR_"); //$NON-NLS-1$ + text = StringModifier.change(text, "%1", UniversalSecurityPlugin //$NON-NLS-1$ .getKeyStoreLocation()); String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); + .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ } catch (NoSuchProviderException exc2) { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_SECURITY_PROVIDER_ERROR_"); + .getString("RESID_SECURITY_SECURITY_PROVIDER_ERROR_"); //$NON-NLS-1$ String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_INITIALIZE_ERROR_"); - msg = StringModifier.change(msg, "%1", UniversalSecurityPlugin + .getString("RESID_SECURITY_INITIALIZE_ERROR_"); //$NON-NLS-1$ + msg = StringModifier.change(msg, "%1", UniversalSecurityPlugin //$NON-NLS-1$ .getKeyStoreLocation()); Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc2); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ } catch (NoSuchAlgorithmException exc2) { String text = UniversalSecurityPlugin - .getString("RESID_SECURITY_ALGORITHM_ERROR_"); - text = StringModifier.change(text, "%1", UniversalSecurityPlugin + .getString("RESID_SECURITY_ALGORITHM_ERROR_"); //$NON-NLS-1$ + text = StringModifier.change(text, "%1", UniversalSecurityPlugin //$NON-NLS-1$ .getKeyStoreLocation()); String msg = UniversalSecurityPlugin - .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); + .getString("RESID_SECURITY_LOAD_KEYSTORE_ERROR_"); //$NON-NLS-1$ Status err = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, text, exc2); ErrorDialog.openError(UniversalSecurityPlugin .getActiveWorkbenchShell(), UniversalSecurityPlugin - .getString("SEC_MSG"), msg, err); + .getString("SEC_MSG"), msg, err); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java index fefda619998..20147fb4358 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/X509CertificateElement.java @@ -45,7 +45,7 @@ public class X509CertificateElement extends Element public String getVersion() { - return "V." + _cert.getVersion(); + return "V." + _cert.getVersion(); //$NON-NLS-1$ } private String[] parse(String full) @@ -72,13 +72,13 @@ public class X509CertificateElement extends Element } result.append(c); } - return result.toString().split(";"); + return result.toString().split(";"); //$NON-NLS-1$ } private String extract(String full, int index) { String[] pairs = parse(full); - String match = pairs[index].split("=")[1]; + String match = pairs[index].split("=")[1]; //$NON-NLS-1$ return match; } diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java index eea23f9863f..5da0d680cf2 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificateForm.java @@ -83,7 +83,7 @@ public class CertificateForm extends SystemBaseForm lblPath.setText(UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_FILE)); _pathField = new Text(nameGroup, SWT.BORDER); _pathField.setLayoutData(GridUtil.createHorizontalFill()); - _pathField.setText(""); + _pathField.setText(""); //$NON-NLS-1$ _browseButton = new Button(nameGroup, SWT.PUSH); _browseButton.setText(UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_BROWSE)); @@ -93,7 +93,7 @@ public class CertificateForm extends SystemBaseForm Label lblName = new Label(nameGroup, SWT.NONE); lblName.setText(UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_ALIAS)); _aliasField = new Text(nameGroup, SWT.BORDER); - _aliasField.setText(""); + _aliasField.setText(""); //$NON-NLS-1$ _aliasField.setLayoutData(GridUtil.createHorizontalFill()); @@ -140,7 +140,7 @@ public class CertificateForm extends SystemBaseForm FileDialog dlg = new FileDialog(_shell, SWT.OPEN); dlg.setFileName(currentSource); - dlg.setFilterExtensions(new String[]{"*.cer", "*.*"}); + dlg.setFilterExtensions(new String[]{"*.cer", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ String source = dlg.open(); diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java index b030a5cba9d..bf6b2dfc8ea 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/widgets/CertificatePropertiesForm.java @@ -163,14 +163,14 @@ public class CertificatePropertiesForm extends SystemBaseForm lblAlgorithmValue.setLayoutData(data); if(_certificate instanceof X509Certificate){ - lblVersionValue.setText(((X509Certificate)_certificate).getType() + " V."+((X509Certificate)_certificate).getVersion()); + lblVersionValue.setText(((X509Certificate)_certificate).getType() + " V."+((X509Certificate)_certificate).getVersion()); //$NON-NLS-1$ lblIssuedToValue.setText(((X509Certificate)_certificate).getSubjectDN().getName()); lblIssuedByValue.setText(((X509Certificate)_certificate).getIssuerDN().getName()); DateFormat df = DateFormat.getDateInstance(DateFormat.LONG); String validity = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_VALIDITY_PERIOD); - validity = StringModifier.change(validity,"%1", df.format(((X509Certificate)_certificate).getNotBefore())); - validity = StringModifier.change(validity,"%2", df.format(((X509Certificate)_certificate).getNotAfter())); + validity = StringModifier.change(validity,"%1", df.format(((X509Certificate)_certificate).getNotBefore())); //$NON-NLS-1$ + validity = StringModifier.change(validity,"%2", df.format(((X509Certificate)_certificate).getNotAfter())); //$NON-NLS-1$ lblValidityValue.setText(validity); lblAlgorithmValue.setText(((X509Certificate)_certificate).getSigAlgName()); @@ -270,14 +270,14 @@ public class CertificatePropertiesForm extends SystemBaseForm lblAlgorithmValue.setLayoutData(data); if(_certificate instanceof X509Certificate){ - lblVersionValue.setText(((X509Certificate)_certificate).getType() + " V."+((X509Certificate)_certificate).getVersion()); + lblVersionValue.setText(((X509Certificate)_certificate).getType() + " V."+((X509Certificate)_certificate).getVersion()); //$NON-NLS-1$ lblIssuedToValue.setText(((X509Certificate)_certificate).getSubjectDN().getName()); lblIssuedByValue.setText(((X509Certificate)_certificate).getIssuerDN().getName()); DateFormat df = DateFormat.getDateInstance(DateFormat.LONG); String validity = UniversalSecurityPlugin.getString(UniversalSecurityProperties.RESID_SECURITY_VALIDITY_PERIOD); - validity = StringModifier.change(validity,"%1", df.format(((X509Certificate)_certificate).getNotBefore())); - validity = StringModifier.change(validity,"%2", df.format(((X509Certificate)_certificate).getNotAfter())); + validity = StringModifier.change(validity,"%1", df.format(((X509Certificate)_certificate).getNotBefore())); //$NON-NLS-1$ + validity = StringModifier.change(validity,"%2", df.format(((X509Certificate)_certificate).getNotAfter())); //$NON-NLS-1$ lblValidityValue.setText(validity); lblAlgorithmValue.setText(((X509Certificate)_certificate).getSigAlgName()); diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java index 590acc72509..9d128cfbf72 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/NewCertTableLabelProvider.java @@ -87,7 +87,7 @@ public class NewCertTableLabelProvider break; } } - return ""; + return ""; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java index a9a54377238..e8a9b9e79dd 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertAction.java @@ -24,7 +24,6 @@ import org.eclipse.rse.dstore.security.ImageRegistry; import org.eclipse.rse.dstore.security.UniversalSecurityProperties; import org.eclipse.rse.ui.actions.SystemBaseWizardAction; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; public class SystemImportCertAction extends SystemBaseWizardAction { @@ -45,7 +44,6 @@ public class SystemImportCertAction extends SystemBaseWizardAction public IWizard createWizard() { - Shell shell = Display.getDefault().getActiveShell(); SystemImportCertWizard importWiz = new SystemImportCertWizard(_provider, _systemName); importWiz.setInputObject(_certificates); return importWiz; diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java index b3685def2b0..7dbcefd09c0 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java @@ -25,7 +25,6 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.comm.ISystemKeystoreProvider; import org.eclipse.rse.dstore.security.ImageRegistry; import org.eclipse.rse.dstore.security.UniversalSecurityProperties; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.wizards.AbstractSystemWizard; public class SystemImportCertWizard @@ -64,7 +63,7 @@ public class SystemImportCertWizard //super.addPages(); } catch (Exception exc) { - SystemBasePlugin.logError("New File: Error in createPages: ",exc); + SystemBasePlugin.logError("New File: Error in createPages: ",exc); //$NON-NLS-1$ } } @@ -74,11 +73,11 @@ public class SystemImportCertWizard */ protected SystemImportCertWizardMainPage createMainPage() { - SystemMessage errMsg = null; + // SystemMessage errMsg = null; _mainPage = new SystemImportCertWizardMainPage(this, getCertificates()); - if (errMsg != null) - _mainPage.setErrorMessage(errMsg); +// if (errMsg != null) + // _mainPage.setErrorMessage(errMsg); return _mainPage; } @@ -88,11 +87,11 @@ public class SystemImportCertWizard */ protected SystemImportCertWizardAliasPage createAliasPage() { - SystemMessage errMsg = null; + // SystemMessage errMsg = null; _aliasPage = new SystemImportCertWizardAliasPage(this, getCertificates(), _systemName); - if (errMsg != null) - _aliasPage.setErrorMessage(errMsg); + // if (errMsg != null) + // _aliasPage.setErrorMessage(errMsg); return _aliasPage; } diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java index 40805021d7f..17b49748fa6 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java @@ -57,7 +57,7 @@ public class SystemImportCertWizardAliasPage */ public SystemImportCertWizardAliasPage(Wizard wizard, List certs, String systemName) { - super(wizard, "SpecifyAlias", + super(wizard, "SpecifyAlias", //$NON-NLS-1$ UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_ALIAS_TITLE, UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_ALIAS_DESC); _systemName = systemName; @@ -165,7 +165,7 @@ public class SystemImportCertWizardAliasPage public String getAlias() { String alias = _alias.getText().trim(); - if (alias.equals("")) + if (alias.equals("")) //$NON-NLS-1$ { try { diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java index f7926c354bf..01eb6d5211b 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java @@ -65,7 +65,7 @@ public class SystemImportCertWizardMainPage */ public SystemImportCertWizardMainPage(Wizard wizard, List certs) { - super(wizard, "NewCertificate", + super(wizard, "NewCertificate", //$NON-NLS-1$ UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_CERTIFICATE_TITLE, UniversalSecurityProperties.RESID_SECURITY_TRUST_WIZ_CERTIFICATE_DESC); _certificates = certs; @@ -131,7 +131,7 @@ public class SystemImportCertWizardMainPage table.setLayout(tableLayout); // Adjust the table viewer. - String[] properties = new String[] {"STRING", "STRING", "NUMBER"}; + String[] properties = new String[] {"STRING", "STRING", "NUMBER"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ _viewer.setColumnProperties(properties); _viewer.setContentProvider(new CertTableContentProvider()); _viewer.setLabelProvider(new NewCertTableLabelProvider());