Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.security.ui/.settings/org.eclipse.jdt.core.prefs63
-rw-r--r--bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/SecurityContributionItemFactory.java1
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/X509CertificateViewDialog.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/ConfirmationDialog.java3
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityConfigurationSection.java1
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java3
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeContentProvider.java3
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeLabelProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java5
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizard.java11
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizardDialog.java1
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/DefaultPasswordProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java5
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StorageLoginDialog.java9
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java12
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java7
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java7
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ExportDialog.java7
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewNodeDialog.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewValueDialog.java5
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NodesView.java11
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ValuesView.java12
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportCertSelectPage.java6
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportConfirmationPage.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportFileSelectPage.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportTrustEngineSelectPage.java3
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportWizard.java13
32 files changed, 196 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.security.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.security.ui/.settings/org.eclipse.jdt.core.prefs
index e9d1abe57..f5b62f259 100644
--- a/bundles/org.eclipse.equinox.security.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.security.ui/.settings/org.eclipse.jdt.core.prefs
@@ -7,6 +7,15 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -16,20 +25,28 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
@@ -37,39 +54,79 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
diff --git a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
index 146dc608b..8d6e42851 100644
--- a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.security.ui;singleton:=true
-Bundle-Version: 1.2.600.qualifier
+Bundle-Version: 1.2.700.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: javax.crypto.spec,
diff --git a/bundles/org.eclipse.equinox.security.ui/pom.xml b/bundles/org.eclipse.equinox.security.ui/pom.xml
index 634622367..34c18b631 100644
--- a/bundles/org.eclipse.equinox.security.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.security.ui/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.security.ui</artifactId>
- <version>1.2.600-SNAPSHOT</version>
+ <version>1.2.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/SecurityContributionItemFactory.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/SecurityContributionItemFactory.java
index 8bf6b3858..87fe11fa5 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/SecurityContributionItemFactory.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/SecurityContributionItemFactory.java
@@ -53,6 +53,7 @@ public abstract class SecurityContributionItemFactory {
* evaluating and inspecting the security status of the system.
*/
public static final ContributionItemFactory SECURITY_STATUS = new ContributionItemFactory("securityStatus") {//$NON-NLS-1$
+ @Override
public IContributionItem create(IWorkbenchWindow window) {
if (window == null)
throw new IllegalArgumentException();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/X509CertificateViewDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/X509CertificateViewDialog.java
index e87c9a69b..0425cdc64 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/X509CertificateViewDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/X509CertificateViewDialog.java
@@ -46,10 +46,12 @@ public class X509CertificateViewDialog extends TitleAreaDialog {
newShell.setText(SecurityUIMsg.CERTVIEW_SHELL_TITLE);
}
+ @Override
protected Control createContents(Composite parent) {
return super.createContents(parent);
}
+ @Override
protected Control createDialogArea(Composite parent) {
nameHelper.setPrincipal(theCert.getSubjectX500Principal());
@@ -198,11 +200,13 @@ public class X509CertificateViewDialog extends TitleAreaDialog {
advancedTab.setControl(advTabComposite);
}
+ @Override
protected void setShellStyle(int newShellStyle) {
super.setShellStyle(newShellStyle | SWT.RESIZE | SWT.DIALOG_TRIM);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
// The default has only a "Close" button, but it returns the CANCEL Id
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CLOSE_LABEL, true);
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
index a763712f3..010690f3b 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
@@ -80,6 +80,7 @@ public class Activator extends AbstractUIPlugin {
return plugin.getBundle().getSymbolicName();
}
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
bundleContext = context;
@@ -92,6 +93,7 @@ public class Activator extends AbstractUIPlugin {
defaultAuthzManagerReg = bundleContext.registerService(AuthorizationManager.class, new DefaultAuthorizationManager(), properties);
}
+ @Override
public void stop(BundleContext context) throws Exception {
super.stop(context);
bundleContext = null;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/ConfirmationDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/ConfirmationDialog.java
index bf124264d..c3a239483 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/ConfirmationDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/ConfirmationDialog.java
@@ -33,10 +33,12 @@ public class ConfirmationDialog extends TitleAreaDialog {
this.cert = cert;
}
+ @Override
protected Control createContents(Composite parent) {
return super.createContents(parent);
}
+ @Override
protected Control createDialogArea(Composite parent) {
setTitle(SecurityUIMsg.CONFIRMATION_DIALOG_TITLE);
setMessage(SecurityUIMsg.CONFIRMATION_DIALOG_MSG);
@@ -50,6 +52,7 @@ public class ConfirmationDialog extends TitleAreaDialog {
return composite;
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
Button yesBtn = createButton(parent, YES, SecurityUIMsg.CONFIRMATION_DIALGO_YES, true);
yesBtn.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityConfigurationSection.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityConfigurationSection.java
index e2f175e68..5af7f8e9d 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityConfigurationSection.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityConfigurationSection.java
@@ -25,6 +25,7 @@ public class SecurityConfigurationSection implements ISystemSummarySection {
private static final String ALG_ALIAS = "Alg.Alias."; //$NON-NLS-1$
private static final String PROVIDER = "Provider."; //$NON-NLS-1$
+ @Override
public void write(PrintWriter writer) {
Provider[] providers = Security.getProviders();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
index 362ffb138..a3d3b0dce 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
@@ -78,12 +78,14 @@ public class SecurityStatusControl extends ControlContribution {
return new IconState(mgr.isEnabled(), mgr.getStatus(), mgr.needsAttention());
}
+ @Override
protected Control createControl(Composite parent) {
label = new CLabel(parent, SWT.NONE);
label.setImage(getIcon(currentState));
Job updateJob = new Job(ID) {
+ @Override
public IStatus run(IProgressMonitor monitor) {
while (true) {
IconState newState = getCurrentState();
@@ -115,6 +117,7 @@ public class SecurityStatusControl extends ControlContribution {
return label;
}
+ @Override
public void dispose() {
Image currentImage = label.getImage();
if (currentImage != null) {
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeContentProvider.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeContentProvider.java
index 23365f9b6..b59e70a94 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeContentProvider.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeContentProvider.java
@@ -60,10 +60,12 @@ public class X509CertificateAttributeContentProvider implements IStructuredConte
}
+ @Override
public Object[] getElements(Object inputElement) {
return elements.toArray();
}
+ @Override
public void dispose() {
// TODO Auto-generated method stub
@@ -87,6 +89,7 @@ public class X509CertificateAttributeContentProvider implements IStructuredConte
clear(true);
}
+ @Override
public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
viewer = aViewer;
clear(false); // clear the viewer.
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeLabelProvider.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeLabelProvider.java
index a7d967885..385bfe846 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeLabelProvider.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/X509CertificateAttributeLabelProvider.java
@@ -39,11 +39,13 @@ public class X509CertificateAttributeLabelProvider extends LabelProvider impleme
}
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
+ @Override
public String getColumnText(Object element, int columnIndex) {
String text = ""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java
index aef3b9fae..7c690330f 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java
@@ -32,10 +32,12 @@ public class SecurityCategoryPage extends PreferencePage implements IWorkbenchPr
//empty
}
+ @Override
public void init(IWorkbench workbench) {
this.noDefaultAndApplyButton();
}
+ @Override
protected Control createContents(Composite parent) {
Composite pageArea = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
index 33485024c..e4d4a6d01 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChallengeResponseDialog.java
@@ -43,22 +43,26 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
answers = new Text[this.size];
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.passwordRecoveryTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.passwordButtonOK, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.passwordButtonCancel, false);
}
+ @Override
protected boolean isResizable() {
return true;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite compositeTop = (Composite) super.createDialogArea(parent);
setTitle(SecUIMessages.passwordRecoveryTitleMsg);
@@ -121,6 +125,7 @@ public class ChallengeResponseDialog extends TitleAreaDialog {
okButton.setEnabled(valid);
}
+ @Override
protected void okPressed() {
questionsText = new String[size];
answersText = new String[size];
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizard.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizard.java
index 62f4b7403..f62e8dddd 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizard.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizard.java
@@ -33,6 +33,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setDescription(SecUIMessages.wizardDecode);
}
+ @Override
public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
@@ -45,6 +46,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setControl(container);
}
+ @Override
public IWizardPage getPreviousPage() {
return null;
}
@@ -57,6 +59,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setDescription(SecUIMessages.wizardEncode);
}
+ @Override
public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
@@ -69,6 +72,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setControl(container);
}
+ @Override
public IWizardPage getPreviousPage() {
return null;
}
@@ -80,6 +84,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setTitle(SecUIMessages.wizardDoneTitle);
}
+ @Override
public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
@@ -88,6 +93,7 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setControl(container);
}
+ @Override
public IWizardPage getPreviousPage() {
return null;
}
@@ -98,25 +104,30 @@ public class ChangePasswordWizard extends Wizard implements INewWizard {
setWindowTitle(SecUIMessages.changePasswordWizardTitle);
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
// nothing to do here
}
+ @Override
public void addPages() {
addPage(new DecodePage());
addPage(new EncodePage());
addPage(new DonePage());
}
+ @Override
public boolean canFinish() {
ChangePasswordWizardDialog recodeWizard = (ChangePasswordWizardDialog) getContainer();
return recodeWizard.isRecodeDone();
}
+ @Override
public boolean performFinish() {
return true;
}
+ @Override
public IWizardPage getPreviousPage(IWizardPage page) {
return null;
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizardDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizardDialog.java
index cd414fc90..bad572444 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizardDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/ChangePasswordWizardDialog.java
@@ -42,6 +42,7 @@ public class ChangePasswordWizardDialog extends WizardDialog {
return recodeDone;
}
+ @Override
protected void nextPressed() {
IWizardPage currentPage = getCurrentPage();
if (currentPage instanceof ChangePasswordWizard.DecodePage) { // decrypt
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/DefaultPasswordProvider.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/DefaultPasswordProvider.java
index 4a373d1cd..e315c19f6 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/DefaultPasswordProvider.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/DefaultPasswordProvider.java
@@ -29,6 +29,7 @@ import org.eclipse.ui.PlatformUI;
*/
public class DefaultPasswordProvider extends PasswordProvider {
+ @Override
public PBEKeySpec getPassword(IPreferencesContainer container, int passwordType) {
if (!StorageUtils.showUI(container))
return null;
@@ -56,6 +57,7 @@ public class DefaultPasswordProvider extends PasswordProvider {
return result[0];
}
+ @Override
public boolean retryOnError(Exception e, IPreferencesContainer container) {
if (!StorageUtils.showUI(container))
return false;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
index 8c7318054..daec41f67 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/PasswordRecoveryDialog.java
@@ -43,22 +43,26 @@ public class PasswordRecoveryDialog extends TitleAreaDialog {
answers = new Text[questionsText.length];
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.pswdRecoveryTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.pswRecoveryButtonOK, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.pswRecoveryButtonCancel, false);
}
+ @Override
protected boolean isResizable() {
return true;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite compositeTop = (Composite) super.createDialogArea(parent);
Composite composite = new Composite(compositeTop, SWT.NONE);
@@ -102,6 +106,7 @@ public class PasswordRecoveryDialog extends TitleAreaDialog {
okButton.setEnabled(valid);
}
+ @Override
protected void okPressed() {
answersText = new String[questionsText.length];
for (int i = 0; i < questionsText.length; i++) {
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StorageLoginDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StorageLoginDialog.java
index 1be7fd778..7e9282261 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StorageLoginDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StorageLoginDialog.java
@@ -69,12 +69,14 @@ public class StorageLoginDialog extends TitleAreaDialog {
return generatedPassword;
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.buttonLogin, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.buttonExit, false);
}
+ @Override
protected IDialogSettings getDialogBoundsSettings() {
IDialogSettings settings = Activator.getDefault().getDialogSettings();
String settingsID = (confirmPassword) ? DIALOG_SETTINGS_SECTION_NEW : DIALOG_SETTINGS_SECTION_OLD;
@@ -84,16 +86,19 @@ public class StorageLoginDialog extends TitleAreaDialog {
return section;
}
+ @Override
protected boolean isResizable() {
return true;
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.generalDialogTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected Control createContents(Composite parent) {
Control contents = super.createContents(parent);
dlgTitleImage = dlgImageDescriptor.createImage();
@@ -101,6 +106,7 @@ public class StorageLoginDialog extends TitleAreaDialog {
return contents;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite compositeTop = (Composite) super.createDialogArea(parent);
@@ -130,10 +136,12 @@ public class StorageLoginDialog extends TitleAreaDialog {
showPassword = new Button(composite, SWT.CHECK | SWT.RIGHT);
showPassword.setText(SecUIMessages.showPassword);
showPassword.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
passwordVisibility();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
passwordVisibility();
}
@@ -192,6 +200,7 @@ public class StorageLoginDialog extends TitleAreaDialog {
return true;
}
+ @Override
protected void okPressed() {
String internalPassword;
try {
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
index b5df74da3..f1a2c0266 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/StoragePreferencePage.java
@@ -33,10 +33,12 @@ public class StoragePreferencePage extends PreferencePage implements IWorkbenchP
//empty
}
+ @Override
public void init(IWorkbench workbench) {
// nothing to do
}
+ @Override
protected Control createContents(Composite parent) {
final TabFolder folder = new TabFolder(parent, SWT.TOP);
@@ -60,6 +62,7 @@ public class StoragePreferencePage extends PreferencePage implements IWorkbenchP
return folder;
}
+ @Override
protected void performDefaults() {
if (passwordTab != null)
passwordTab.performDefaults();
@@ -68,6 +71,7 @@ public class StoragePreferencePage extends PreferencePage implements IWorkbenchP
super.performDefaults();
}
+ @Override
public boolean performOk() {
if (passwordTab != null)
passwordTab.performOk();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
index d45a4ed6a..0f3df489e 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
@@ -139,6 +139,7 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
buttonSave.setEnabled(modified);
}
+ @Override
public void onDeleted() {
if (nodesView != null)
nodesView.postDeleted();
@@ -155,16 +156,13 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
return;
File outputFile = new File(fileName);
- PrintStream output;
- try {
- output = new PrintStream(new FileOutputStream(outputFile));
+ try (PrintStream output = new PrintStream(new FileOutputStream(outputFile))) {
+ export(root, output);
+ output.flush();
} catch (FileNotFoundException e) {
Activator.log(IStatus.ERROR, e.getMessage(), null, e);
return;
}
- export(root, output);
- output.flush();
- output.close();
}
protected void export(ISecurePreferences node, PrintStream stream) {
@@ -178,7 +176,7 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
try {
String data = key + " := " + node.get(key, ""); //$NON-NLS-1$ //$NON-NLS-2$
stream.println(data);
- }catch (StorageException e) {
+ } catch (StorageException e) {
Activator.log(IStatus.ERROR, SecUIMessages.failedDecrypt, null, e);
}
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
index 31433f105..06136f4c7 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
@@ -67,6 +67,7 @@ public class TabPassword {
buttonClearPassword.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
buttonClearPassword.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
InternalExchangeUtils.passwordProvidersReset();
enableLogout();
@@ -107,10 +108,12 @@ public class TabPassword {
providerTable.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// do nothing
}
+ @Override
public void widgetSelected(SelectionEvent e) {
if ((e.detail & SWT.CHECK) != 0)
providerModified = true;
@@ -125,10 +128,12 @@ public class TabPassword {
buttonChangePassword.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
buttonChangePassword.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
}
+ @Override
public void widgetSelected(SelectionEvent e) {
PasswordProviderDescription selectedModule = getSelectedModule();
if (selectedModule == null)
@@ -153,10 +158,12 @@ public class TabPassword {
buttonRecoverPassword.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
buttonRecoverPassword.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
}
+ @Override
public void widgetSelected(SelectionEvent e) {
String moduleID = getSelectedModuleID();
ISecurePreferences rootNode = SecurePreferencesFactory.getDefault();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
index d1dd772c0..2df31af6d 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
@@ -46,6 +46,7 @@ public class UICallbackProvider implements IUICallbacks {
return exception;
}
+ @Override
public void run(IProgressMonitor monitor) {
monitor.beginTask(SecUIMessages.initializing, IProgressMonitor.UNKNOWN);
try {
@@ -57,11 +58,13 @@ public class UICallbackProvider implements IUICallbacks {
}
}
+ @Override
public void setupPasswordRecovery(final int size, final String moduleID, final IPreferencesContainer container) {
if (!StorageUtils.showUI(container))
return;
UIJob reciverySetupJob = new UIJob(SecUIMessages.pswJobName) {
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
boolean reply = MessageDialog.openQuestion(StorageUtils.getShell(), SecUIMessages.pswdRecoveryOptionTitle, SecUIMessages.pswdRecoveryOptionMsg);
if (!reply)
@@ -78,6 +81,7 @@ public class UICallbackProvider implements IUICallbacks {
reciverySetupJob.schedule();
}
+ @Override
public void execute(final IStorageTask callback) throws StorageException {
if (!StorageUtils.showUI(null)) {
callback.execute();
@@ -106,6 +110,7 @@ public class UICallbackProvider implements IUICallbacks {
});
} else { // we are running in non-UI thread, use Job to show small progress indicator on the status bar
Job job = new Job(SecUIMessages.secureStorageInitialization) {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
callback.execute();
@@ -126,6 +131,7 @@ public class UICallbackProvider implements IUICallbacks {
throw exception[0];
}
+ @Override
public Boolean ask(final String msg) {
if (!StorageUtils.showUI(null)) // container-independent operation
return null;
@@ -138,6 +144,7 @@ public class UICallbackProvider implements IUICallbacks {
return result[0];
}
+ @Override
public boolean runningUI() {
return StorageUtils.runningUI();
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ExportDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ExportDialog.java
index acaab8b19..f0b393acf 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ExportDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ExportDialog.java
@@ -52,18 +52,21 @@ public class ExportDialog extends TitleAreaDialog {
super(parentShell);
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.generalTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.exportDialogOK, true);
okButton.setEnabled(validFile());
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.exportDialogCancel, false);
}
+ @Override
protected Control createContents(Composite parent) {
Control contents = super.createContents(parent);
setTitle(SecUIMessages.exportDialogTitle);
@@ -73,6 +76,7 @@ public class ExportDialog extends TitleAreaDialog {
return contents;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite compositeTop = (Composite) super.createDialogArea(parent);
Composite composite = new Composite(compositeTop, SWT.NONE);
@@ -98,10 +102,12 @@ public class ExportDialog extends TitleAreaDialog {
browse.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
browse.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
}
+ @Override
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(getShell());
dialog.setText(SecUIMessages.fileSelectTitle);
@@ -143,6 +149,7 @@ public class ExportDialog extends TitleAreaDialog {
return valid;
}
+ @Override
protected void okPressed() {
file = fileText.getText();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewNodeDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewNodeDialog.java
index 3ee902545..b03089cc7 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewNodeDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewNodeDialog.java
@@ -35,18 +35,21 @@ public class NewNodeDialog extends TitleAreaDialog {
super(parentShell);
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.newNodeTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.newNodeOK, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.newNodeCancel, false);
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite composite = (Composite) super.createDialogArea(parent);
setMessage(SecUIMessages.newNodeMsg);
@@ -77,6 +80,7 @@ public class NewNodeDialog extends TitleAreaDialog {
return valid;
}
+ @Override
protected void okPressed() {
name = nodeName.getText();
super.okPressed();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewValueDialog.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewValueDialog.java
index 792ef4055..e7ed3262b 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewValueDialog.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NewValueDialog.java
@@ -47,18 +47,21 @@ public class NewValueDialog extends TitleAreaDialog {
this.existingKeys = existingKeys;
}
+ @Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText(SecUIMessages.generalTitle);
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, HELP_ID);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
okButton = createButton(parent, IDialogConstants.OK_ID, SecUIMessages.addValueOK, true);
okButton.setEnabled(false);
createButton(parent, IDialogConstants.CANCEL_ID, SecUIMessages.addValueCancel, false);
}
+ @Override
protected Control createContents(Composite parent) {
Control contents = super.createContents(parent);
setTitle(SecUIMessages.addValueTitle);
@@ -68,6 +71,7 @@ public class NewValueDialog extends TitleAreaDialog {
return contents;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite compositeTop = (Composite) super.createDialogArea(parent);
Composite composite = new Composite(compositeTop, SWT.NONE);
@@ -111,6 +115,7 @@ public class NewValueDialog extends TitleAreaDialog {
return valid;
}
+ @Override
protected void okPressed() {
key = keyText.getText();
value = valueText.getText();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NodesView.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NodesView.java
index 5d873c8ba..0255c8bbb 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NodesView.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/NodesView.java
@@ -49,6 +49,7 @@ public class NodesView {
class ViewContentProvider implements ITreeContentProvider {
+ @Override
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
if (nodeTreeViewer != null) {
nodeTreeViewer.setSelection(null);
@@ -56,16 +57,19 @@ public class NodesView {
}
}
+ @Override
public void dispose() {
// nothing to do
}
+ @Override
public Object[] getElements(Object parent) {
if (defaultPrefs.equals(parent))
return new Object[] {SecurePreferencesFactory.getDefault()};
return new Object[0];
}
+ @Override
public Object getParent(Object child) {
if (!(child instanceof ISecurePreferences))
return null;
@@ -76,6 +80,7 @@ public class NodesView {
return node.parent();
}
+ @Override
public Object[] getChildren(Object parent) {
if (!(parent instanceof ISecurePreferences))
return new Object[0];
@@ -87,6 +92,7 @@ public class NodesView {
return result;
}
+ @Override
public boolean hasChildren(Object parent) {
if (!(parent instanceof ISecurePreferences))
return false;
@@ -98,6 +104,7 @@ public class NodesView {
class ViewLabelProvider extends LabelProvider {
+ @Override
public String getText(Object obj) {
if (!(obj instanceof ISecurePreferences))
return obj.toString();
@@ -107,6 +114,7 @@ public class NodesView {
return node.name();
}
+ @Override
public Image getImage(Object obj) {
return null;
}
@@ -166,6 +174,7 @@ public class NodesView {
private void makeActions() {
refreshNodesAction = new Action() {
+ @Override
public void run() {
nodeTreeViewer.refresh();
}
@@ -175,6 +184,7 @@ public class NodesView {
refreshNodesAction.setImageDescriptor(ImageDescriptor.createFromFile(NodesView.class, "/icons/storage/node_refresh.gif")); //$NON-NLS-1$
addNodeAction = new Action() {
+ @Override
public void run() {
TreeSelection selection = (TreeSelection) nodeTreeViewer.getSelection();
Object selected = selection.getFirstElement();
@@ -205,6 +215,7 @@ public class NodesView {
addNodeAction.setImageDescriptor(ImageDescriptor.createFromFile(NodesView.class, "/icons/storage/node_new.gif")); //$NON-NLS-1$
removeNodeAction = new Action() {
+ @Override
public void run() {
TreeSelection selection = (TreeSelection) nodeTreeViewer.getSelection();
Object selected = selection.getFirstElement();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ValuesView.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ValuesView.java
index 1d2fc3405..e3e2f9616 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ValuesView.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/view/ValuesView.java
@@ -95,14 +95,17 @@ public class ValuesView {
class TableContentProvider implements IStructuredContentProvider {
+ @Override
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
selectedNode = (ISecurePreferences) newInput;
}
+ @Override
public void dispose() {
// nothing to do
}
+ @Override
public Object[] getElements(Object parent) {
if (selectedNode == null)
return new Object[0];
@@ -123,6 +126,7 @@ public class ValuesView {
}
class TableLabelProvider extends LabelProvider implements ITableLabelProvider {
+ @Override
public String getColumnText(Object obj, int index) {
if (obj == null)
return null;
@@ -138,14 +142,17 @@ public class ValuesView {
}
}
+ @Override
public String getText(Object element) {
return getColumnText(element, 0);
}
+ @Override
public Image getColumnImage(Object obj, int index) {
return null;
}
+ @Override
public Image getImage(Object obj) {
return null;
}
@@ -234,6 +241,7 @@ public class ValuesView {
private void makeActions() {
addValueAction = new Action() {
+ @Override
public void run() {
if (selectedNode == null)
return;
@@ -258,6 +266,7 @@ public class ValuesView {
addValueAction.setImageDescriptor(ImageDescriptor.createFromFile(NodesView.class, "/icons/storage/value_new.gif")); //$NON-NLS-1$
removeValueAction = new Action() {
+ @Override
public void run() {
if (selectedNode == null)
return;
@@ -291,6 +300,7 @@ public class ValuesView {
private void addDevelopmentMenuOptions() {
showValueAction = new Action() {
+ @Override
public void run() {
if (selectedNode == null)
return;
@@ -322,6 +332,7 @@ public class ValuesView {
showValueAction.setImageDescriptor(ImageDescriptor.createFromFile(NodesView.class, "/icons/storage/value_show.gif")); //$NON-NLS-1$
encryptValueAction = new Action() {
+ @Override
public void run() {
reCodeValue(true);
}
@@ -331,6 +342,7 @@ public class ValuesView {
encryptValueAction.setImageDescriptor(ImageDescriptor.createFromFile(NodesView.class, "/icons/storage/encrypt.gif")); //$NON-NLS-1$
decryptValueAction = new Action() {
+ @Override
public void run() {
reCodeValue(false);
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportCertSelectPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportCertSelectPage.java
index 7a799ac5d..0ce05ec9c 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportCertSelectPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportCertSelectPage.java
@@ -16,7 +16,7 @@ package org.eclipse.equinox.internal.security.ui.wizard;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.security.cert.*;
-import java.util.*;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.equinox.internal.security.ui.SecurityUIMsg;
import org.eclipse.jface.wizard.WizardPage;
@@ -47,6 +47,7 @@ public class CertificateImportCertSelectPage extends WizardPage implements Liste
setDescription(SecurityUIMsg.WIZARD_SELECT_CERT_FROM_DROP_DOWN);
}
+ @Override
public void createControl(Composite parent) {
Composite certSelectComposite = new Composite(parent, SWT.NONE);
setControl(certSelectComposite);
@@ -99,6 +100,7 @@ public class CertificateImportCertSelectPage extends WizardPage implements Liste
}
+ @Override
public void handleEvent(Event e) {
if (e.widget == certDropDown) {
// populate the preview with select cert info
@@ -122,6 +124,7 @@ public class CertificateImportCertSelectPage extends WizardPage implements Liste
/**
* This methods get called before each page gets showed
*/
+ @Override
public void setVisible(boolean visible) {
if (visible)
populateDropDown();
@@ -129,6 +132,7 @@ public class CertificateImportCertSelectPage extends WizardPage implements Liste
}
+ @Override
public boolean canFlipToNextPage() {
return ((CertificateImportWizard) getWizard()).selectCert != null;
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportConfirmationPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportConfirmationPage.java
index bd53f45f6..c6a584366 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportConfirmationPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportConfirmationPage.java
@@ -33,6 +33,7 @@ public class CertificateImportConfirmationPage extends WizardPage {
setDescription(SecurityUIMsg.WIZARD_IMPORT_CONFIRMATION_MSG);
}
+ @Override
public void createControl(Composite parent) {
composite = new Composite(parent, SWT.NONE);
setControl(composite);
@@ -48,6 +49,7 @@ public class CertificateImportConfirmationPage extends WizardPage {
trustEngineLabel.setText(""); //$NON-NLS-1$
}
+ @Override
public void setVisible(boolean visible) {
if (visible) {
CertificateImportWizard certImporWiz = (CertificateImportWizard) getWizard();
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportFileSelectPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportFileSelectPage.java
index 21fbf547a..d2636412f 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportFileSelectPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportFileSelectPage.java
@@ -35,6 +35,7 @@ public class CertificateImportFileSelectPage extends WizardPage implements Liste
setDescription(SecurityUIMsg.WIZARD_TITLE_FILE_SELECT);
}
+ @Override
public void createControl(Composite parent) {
Composite certSelectComposite = new Composite(parent, SWT.NONE);
setControl(certSelectComposite);
@@ -82,10 +83,12 @@ public class CertificateImportFileSelectPage extends WizardPage implements Liste
}
}
+ @Override
public boolean canFlipToNextPage() {
return (filePathField.getText().length() < 1 || null != getErrorMessage()) ? false : true;
}
+ @Override
public void handleEvent(Event e) {
if (e.widget == browseDirectoriesButton || e.widget == filePathField)
if (filePathField.getText().length() < 1)
@@ -95,6 +98,7 @@ public class CertificateImportFileSelectPage extends WizardPage implements Liste
getWizard().getContainer().updateButtons();
}
+ @Override
public IWizardPage getNextPage() {
File file = new File(filePathField.getText().trim());
if (file.isDirectory() || !file.exists()) {
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportTrustEngineSelectPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportTrustEngineSelectPage.java
index d8d455d33..b77614337 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportTrustEngineSelectPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportTrustEngineSelectPage.java
@@ -35,6 +35,7 @@ public class CertificateImportTrustEngineSelectPage extends WizardPage implement
setDescription(SecurityUIMsg.WIZARD_ENGINE_SELECT_MSG);
}
+ @Override
public void createControl(Composite parent) {
Composite certSelectComposite = new Composite(parent, SWT.NONE);
setControl(certSelectComposite);
@@ -81,6 +82,7 @@ public class CertificateImportTrustEngineSelectPage extends WizardPage implement
trustEngineCombo.addListener(SWT.Selection, this);
}
+ @Override
public void handleEvent(Event e) {
if (e.widget == aliasField) {
if (aliasField.getText().length() < 1) {
@@ -102,6 +104,7 @@ public class CertificateImportTrustEngineSelectPage extends WizardPage implement
getWizard().getContainer().updateButtons();
}
+ @Override
public boolean canFlipToNextPage() {
return (aliasField.getText().length() > 0) && (trustEngineCombo.getSelectionIndex() != -1);
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportWizard.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportWizard.java
index ca1df4226..4922029b4 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportWizard.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/wizard/CertificateImportWizard.java
@@ -38,16 +38,12 @@ public class CertificateImportWizard extends Wizard implements IImportWizard {
super();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
//nothing
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
+ @Override
public void addPages() {
// mainPage = new ImportWizardPage(SecurityUIMsg.IMPORT_FILE); //NON-NLS-1
// addPage(mainPage);
@@ -65,13 +61,12 @@ public class CertificateImportWizard extends Wizard implements IImportWizard {
addPage(certConfirmPage);
}
+ @Override
public boolean canFinish() {
return getContainer().getCurrentPage() == certConfirmPage;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
+ @Override
public boolean performFinish() {
try {
selectTrustEngine.addTrustAnchor(selectCert, aliasName);

Back to the top