Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-01-06 04:21:52 -0500
committerLars Vogel2019-04-23 08:03:41 -0400
commita840833365652e6a2f37b6287af77969655ebb51 (patch)
tree8107083eba81c1482fb292f5bee819e918b32b3b
parent8593faa52bbe2571e10bd3dec73b77e279c4a444 (diff)
downloadrt.equinox.bundles-a840833365652e6a2f37b6287af77969655ebb51.tar.gz
rt.equinox.bundles-a840833365652e6a2f37b6287af77969655ebb51.tar.xz
rt.equinox.bundles-a840833365652e6a2f37b6287af77969655ebb51.zip
Bug 343993 - Remove bad wizban image from certificate details dialog
The wizban image in this dialog is nothing else than a resized 16 pixel icon. Since there is no better source in available wizard banner images, let's remove the image instead. Change-Id: I1a83801ea8f1e321dc445e1093a504a32965d125 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/icons/titleAreaCert.gifbin1000 -> 0 bytes
-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/X509CertificateViewDialog.java16
4 files changed, 2 insertions, 18 deletions
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 91bdd185..bdd1e0a8 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.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Import-Package: javax.crypto.spec,
diff --git a/bundles/org.eclipse.equinox.security.ui/icons/titleAreaCert.gif b/bundles/org.eclipse.equinox.security.ui/icons/titleAreaCert.gif
deleted file mode 100644
index c81e8799..00000000
--- a/bundles/org.eclipse.equinox.security.ui/icons/titleAreaCert.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.security.ui/pom.xml b/bundles/org.eclipse.equinox.security.ui/pom.xml
index 4d48af4b..164c7b2c 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.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 bc25c2cc..e87c9a69 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
@@ -17,7 +17,6 @@ package org.eclipse.equinox.internal.provisional.security.ui;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
-import org.eclipse.equinox.internal.security.ui.Activator;
import org.eclipse.equinox.internal.security.ui.SecurityUIMsg;
import org.eclipse.equinox.internal.security.ui.wizard.CertificateViewer;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -25,19 +24,16 @@ import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
public class X509CertificateViewDialog extends TitleAreaDialog {
- private final static String titleImageName = "/titleAreaCert.gif"; //$NON-NLS-1$
private X509Certificate theCert;
private static final DateFormat _df = DateFormat.getDateInstance(DateFormat.LONG);
private X500PrincipalHelper nameHelper = new X500PrincipalHelper();
// We use the "bannerFont" for our bold font
private static Font boldFont = JFaceResources.getBannerFont();
- private Image titleImage;
public X509CertificateViewDialog(Shell parentShell, X509Certificate cert) {
super(parentShell);
@@ -59,11 +55,6 @@ public class X509CertificateViewDialog extends TitleAreaDialog {
setTitle((nameHelper.getCN() != null ? nameHelper.getCN() : nameHelper.getOU()));
- titleImage = Activator.getImageDescriptor(titleImageName).createImage();
-
- if (titleImage != null)
- setTitleImage(titleImage);
-
Composite composite = (Composite) super.createDialogArea(parent);
TabFolder tabFolder = new TabFolder(composite, SWT.BORDER);
@@ -218,11 +209,4 @@ public class X509CertificateViewDialog extends TitleAreaDialog {
}
- public boolean close() {
- if (titleImage != null) {
- titleImage.dispose();
- }
- return super.close();
- }
-
}

Back to the top