Attachment 97461 Details for Bug 214119 – Draft patch (needs some cleanup)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Draft patch (needs some cleanup)

patch_214119.txt (text/plain), 9.53 KB, created by Matt Flaherty

on 2008-04-24 10:18:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Flaherty

Created: 2008-04-24 10:18:27 EDT

Size: 9.53 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.security.ui
>Index: src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 SecurityCategoryPage.java
>--- src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java	23 Apr 2008 05:09:05 -0000	1.3
>+++ src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java	24 Apr 2008 14:17:01 -0000
>@@ -40,9 +40,6 @@
> 		PreferenceLinkArea policyLinkArea = new PreferenceLinkArea(pageArea, SWT.NONE, "org.eclipse.equinox.security.ui.policy", SecurityUIMsg.CATPAGE_LABEL_POLICY, (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
> 		policyLinkArea.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
> 
>-		PreferenceLinkArea advancedLinkArea = new PreferenceLinkArea(pageArea, SWT.NONE, "org.eclipse.equinox.security.ui.advanced", SecurityUIMsg.CATPAGE_LABEL_ADVANCED, (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
>-		advancedLinkArea.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
>-
> 		PreferenceLinkArea storageLinkArea = new PreferenceLinkArea(pageArea, SWT.NONE, "org.eclipse.equinox.security.ui.storage", SecurityUIMsg.CATPAGE_LABEL_STORAGE, (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
> 		storageLinkArea.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
> 
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/plugin.xml,v
>retrieving revision 1.8
>diff -u -r1.8 plugin.xml
>--- plugin.xml	23 Apr 2008 05:09:06 -0000	1.8
>+++ plugin.xml	24 Apr 2008 14:17:01 -0000
>@@ -39,14 +39,6 @@
>       </page>
>    </extension>
> 
>-   <extension point="org.eclipse.ui.preferencePages">
>-      <page
>-         name="%advanced"
>-         class="org.eclipse.equinox.internal.security.ui.preferences.AdvancedPage"
>-         id="org.eclipse.equinox.security.ui.advanced"
>-         category="org.eclipse.equinox.security.ui.category">
>-      </page>
>-   </extension>
>    
> <!--   
>    <extension
>@@ -81,5 +73,15 @@
>             class="org.eclipse.equinox.internal.security.ui.storage.UICallbackProvider">
>       </provider>
>    </extension>
>+   <extension
>+         id="security"
>+         name="Security"
>+         point="org.eclipse.ui.systemSummarySections">
>+      <section
>+            class="org.eclipse.equinox.internal.security.ui.SecuritySummary"
>+            id="securitySection"
>+            sectionTitle="Security">
>+      </section>
>+   </extension>
>    
> </plugin>
>Index: src/org/eclipse/equinox/internal/security/ui/SecuritySummary.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/security/ui/SecuritySummary.java
>diff -N src/org/eclipse/equinox/internal/security/ui/SecuritySummary.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/security/ui/SecuritySummary.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,176 @@
>+/*******************************************************************************
>+ * Copyright (c) 2003, 2007 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.security.ui;
>+
>+import java.io.PrintWriter;
>+import java.security.Provider;
>+import java.security.Security;
>+import java.util.*;
>+import org.eclipse.ui.about.ISystemSummarySection;
>+
>+public class SecuritySummary implements ISystemSummarySection {
>+
>+	private static final String ALG_ALIAS = "Alg.Alias."; //$NON-NLS-1$
>+	private static final String PROVIDER = "Provider."; //$NON-NLS-1$
>+
>+	public void write(PrintWriter writer) {
>+
>+		Provider[] providers = Security.getProviders();
>+		writer.println("Installed providers (" + providers.length + "): ");
>+		writer.println();
>+
>+		for (int i = 0; i < providers.length; i++) {
>+			appendProvider(writer, providers[i], i);
>+		}
>+	}
>+
>+	private void appendProvider(PrintWriter writer, Provider provider, int index) {
>+		writer.println(" Provider: " + provider.getName() + ", Version: " + provider.getVersion() + ", Class: " + provider.getClass().getName());
>+		writer.println("  Description: " + provider.getInfo());
>+		ProviderService[] services = getServices(provider);
>+		writer.println("  Available services (" + services.length + "):");
>+		for (int i = 0; i < services.length; i++) {
>+			appendService(writer, services[i], i);
>+		}
>+		writer.println();
>+	}
>+
>+	private void appendService(PrintWriter writer, ProviderService service, int index) {
>+		writer.println("   Service: " + service.getType() + ", Algorithm: " + service.getAlgorithm() + ", Class: " + service.getClassName());
>+		List aliases = service.getAliases();
>+		if (null != aliases && (0 < aliases.size())) {
>+			writer.print("    Aliases: ");
>+			for (Iterator it = aliases.iterator(); it.hasNext();) {
>+				writer.print((String) it.next());
>+				if (it.hasNext()) {
>+					writer.print(", ");
>+				}
>+			}
>+			writer.println();
>+		}
>+		Map attributes = service.getAttributes();
>+		if ((null != attributes) && (0 < attributes.size())) {
>+			writer.println("    Attributes:");
>+			Set keys = attributes.keySet();
>+			for (Iterator it = keys.iterator(); it.hasNext();) {
>+				String key = (String) it.next();
>+				writer.print("      " + key + ": ");
>+				writer.println((String) attributes.get(key));
>+			}
>+		}
>+	}
>+
>+	private static ProviderService[] getServices(Provider provider) {
>+
>+		Set providerKeys = provider.keySet();
>+		Hashtable serviceList = new Hashtable();
>+		Hashtable attributeMap = new Hashtable(); // "type" => "Hashtable of (attribute,value) pairs"
>+		Hashtable aliasMap = new Hashtable(); // "type" => "Arraylist of aliases"
>+		for (Iterator it = providerKeys.iterator(); it.hasNext();) {
>+			String key = (String) it.next();
>+
>+			// this is provider info, available off the Provider API
>+			if (key.startsWith(PROVIDER)) {
>+				continue;
>+			}
>+
>+			// this is an alias
>+			if (key.startsWith(ALG_ALIAS)) {
>+				String value = key.substring(key.indexOf(ALG_ALIAS) + ALG_ALIAS.length(), key.length());
>+				String type = (String) provider.get(key);
>+				String algo = value.substring(0, value.indexOf('.'));
>+				String alias = value.substring(value.indexOf('.') + 1, value.length());
>+				ArrayList aliasList = (ArrayList) aliasMap.get(type + '.' + algo);
>+				if (aliasList == null) {
>+					aliasList = new ArrayList();
>+					aliasList.add(alias);
>+					aliasMap.put(type, aliasList);
>+				} else {
>+					aliasList.add(alias);
>+				}
>+			}
>+
>+			// this is an attribute
>+			else if (key.indexOf(' ') > -1) {
>+				String type = key.substring(0, key.indexOf('.'));
>+				String algorithm = key.substring(key.indexOf('.') + 1, key.indexOf(' '));
>+				String attribute = key.substring(key.indexOf(' ') + 1, key.length());
>+				String value = (String) provider.get(key);
>+				Hashtable attributeTable = (Hashtable) attributeMap.get(type + '.' + algorithm);
>+				if (attributeTable == null) {
>+					attributeTable = new Hashtable();
>+					attributeTable.put(attribute, value);
>+					attributeMap.put(type + '.' + algorithm, attributeTable);
>+				} else {
>+					attributeTable.put(attribute, value);
>+				}
>+			}
>+
>+			// else this is a service
>+			else {
>+				serviceList.put(key, provider.get(key));
>+			}
>+		}
>+
>+		ProviderService[] serviceArray = new ProviderService[serviceList.size()];
>+		Set serviceKeys = serviceList.keySet();
>+		int serviceCount = 0;
>+		for (Iterator it = serviceKeys.iterator(); it.hasNext();) {
>+			String key = (String) it.next();
>+			String type = key.substring(0, key.indexOf('.'));
>+			String algo = key.substring(key.indexOf('.') + 1, key.length());
>+			String className = (String) serviceList.get(key);
>+			List aliases = (List) aliasMap.get(algo);
>+			Map attributes = (Map) attributeMap.get(key);
>+
>+			serviceArray[serviceCount] = new ProviderService(type, algo, className, aliases, attributes);
>+			serviceCount++;
>+		}
>+		return serviceArray;
>+	}
>+
>+	private static class ProviderService {
>+
>+		private final String type;
>+		private final String algorithm;
>+		private final String className;
>+		private final List aliases;
>+		private final Map attributes;
>+
>+		public ProviderService(String type, String algorithm, String className, List aliases, Map attributes) {
>+			this.type = type;
>+			this.algorithm = algorithm;
>+			this.className = className;
>+			this.aliases = aliases;
>+			this.attributes = attributes;
>+		}
>+
>+		public String getType() {
>+			return type;
>+		}
>+
>+		public String getAlgorithm() {
>+			return algorithm;
>+		}
>+
>+		public String getClassName() {
>+			return className;
>+		}
>+
>+		public List getAliases() {
>+			return aliases;
>+		}
>+
>+		public Map getAttributes() {
>+			return attributes;
>+		}
>+	}
>+}

Actions: View | Diff

Attachments on bug 214119: 97461 | 97472