Attachment 97648 Details for Bug 228918 – Patch

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

[patch] Patch

patch secure storageProvider names.txt (text/plain), 9.64 KB, created by Oleg Besedin

on 2008-04-25 13:52:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Besedin

Created: 2008-04-25 13:52:39 EDT

Size: 9.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.security.macosx
>Index: fragment.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx/fragment.properties,v
>retrieving revision 1.1
>diff -u -r1.1 fragment.properties
>--- fragment.properties	24 Apr 2008 20:07:19 -0000	1.1
>+++ fragment.properties	25 Apr 2008 17:52:03 -0000
>@@ -10,4 +10,4 @@
> ###############################################################################
> fragmentName = OS X Keystore service integration
> providerName = Eclipse.org
>-moduleName = Password provider backed by the OS X Keystore
>+macModuleName = OS X Keystore Integration
>Index: fragment.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx/fragment.xml,v
>retrieving revision 1.1
>diff -u -r1.1 fragment.xml
>--- fragment.xml	24 Apr 2008 20:07:19 -0000	1.1
>+++ fragment.xml	25 Apr 2008 17:52:03 -0000
>@@ -3,7 +3,7 @@
> <fragment>
>    <extension
>          id="OSXKeystoreIntegration"
>-         name="%moduleName"
>+         name="%macModuleName"
>          point="org.eclipse.equinox.security.secureStorage">
>       <provider
>             class="org.eclipse.equinox.internal.security.osx.OSXProvider"
>#P org.eclipse.equinox.security.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/plugin.xml,v
>retrieving revision 1.9
>diff -u -r1.9 plugin.xml
>--- plugin.xml	24 Apr 2008 16:37:58 -0000	1.9
>+++ plugin.xml	25 Apr 2008 17:52:03 -0000
>@@ -59,6 +59,7 @@
>    
>    <extension
>          id="DefaultPasswordProvider"
>+         name="%uiPasswordProviderName"
>          point="org.eclipse.equinox.security.secureStorage">
>       <provider
>             class="org.eclipse.equinox.internal.security.ui.storage.DefaultPasswordProvider"
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/plugin.properties,v
>retrieving revision 1.7
>diff -u -r1.7 plugin.properties
>--- plugin.properties	23 Apr 2008 05:09:06 -0000	1.7
>+++ plugin.properties	25 Apr 2008 17:52:03 -0000
>@@ -18,3 +18,4 @@
> certificateFile = Certificate File
> certificateFileDescription = Import certificates into the platform.
> storage = Secure Storage
>+uiPasswordProviderName = UI Prompt
>Index: src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java,v
>retrieving revision 1.2
>diff -u -r1.2 TabPassword.java
>--- src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java	11 Apr 2008 15:43:09 -0000	1.2
>+++ src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java	25 Apr 2008 17:52:03 -0000
>@@ -154,7 +154,7 @@
> 		for (Iterator i = availableModules.iterator(); i.hasNext();) {
> 			PasswordProviderDescription module = (PasswordProviderDescription) i.next();
> 			TableItem item = new TableItem(providerTable, SWT.LEFT);
>-			item.setText(new String[] {null, Integer.toString(module.getPriority()), module.getId()});
>+			item.setText(new String[] {null, Integer.toString(module.getPriority()), module.getName()});
> 			item.setData(module.getId());
> 			if (disabledModules == null)
> 				item.setChecked(true);
>Index: src/org/eclipse/equinox/internal/security/ui/nls/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/nls/messages.properties,v
>retrieving revision 1.18
>diff -u -r1.18 messages.properties
>--- src/org/eclipse/equinox/internal/security/ui/nls/messages.properties	24 Apr 2008 16:02:09 -0000	1.18
>+++ src/org/eclipse/equinox/internal/security/ui/nls/messages.properties	25 Apr 2008 17:52:03 -0000
>@@ -49,7 +49,7 @@
> providersTable = Providers:
> enabledColumn = Enabled
> priorityColumn = Priority
>-idColumn = ID
>+idColumn = Description
> descriptionColumn = Description
> defaultGroup = Default secure preferences
> confirmDeleteMsg = This action will delete default secure storage. All data in it will be lost. Are you sure you want to delete it?
>#P org.eclipse.equinox.security
>Index: src/org/eclipse/equinox/internal/security/storage/friends/InternalExchangeUtils.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/InternalExchangeUtils.java,v
>retrieving revision 1.9
>diff -u -r1.9 InternalExchangeUtils.java
>--- src/org/eclipse/equinox/internal/security/storage/friends/InternalExchangeUtils.java	23 Apr 2008 17:56:30 -0000	1.9
>+++ src/org/eclipse/equinox/internal/security/storage/friends/InternalExchangeUtils.java	25 Apr 2008 17:52:04 -0000
>@@ -59,7 +59,7 @@
> 		List result = new ArrayList(availableModules.size());
> 		for (Iterator i = availableModules.iterator(); i.hasNext();) {
> 			ExtStorageModule module = (ExtStorageModule) i.next();
>-			result.add(new PasswordProviderDescription(module.moduleID, module.priority));
>+			result.add(new PasswordProviderDescription(module.name, module.moduleID, module.priority));
> 		}
> 		return result;
> 	}
>Index: src/org/eclipse/equinox/internal/security/storage/friends/PasswordProviderDescription.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/friends/PasswordProviderDescription.java,v
>retrieving revision 1.1
>diff -u -r1.1 PasswordProviderDescription.java
>--- src/org/eclipse/equinox/internal/security/storage/friends/PasswordProviderDescription.java	29 Feb 2008 16:30:10 -0000	1.1
>+++ src/org/eclipse/equinox/internal/security/storage/friends/PasswordProviderDescription.java	25 Apr 2008 17:52:04 -0000
>@@ -17,9 +17,11 @@
> 
> 	private int priority;
> 	private String id;
>+	private String name;
> 
>-	public PasswordProviderDescription(String id, int priority) {
>+	public PasswordProviderDescription(String name, String id, int priority) {
> 		this.id = id;
>+		this.name = name;
> 		this.priority = priority;
> 	}
> 
>@@ -30,4 +32,10 @@
> 	public String getId() {
> 		return id;
> 	}
>+
>+	public String getName() {
>+		if (name == null || name.length() == 0)
>+			return id;
>+		return name;
>+	}
> }
>Index: src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java,v
>retrieving revision 1.4
>diff -u -r1.4 PasswordProviderSelector.java
>--- src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java	11 Apr 2008 15:43:11 -0000	1.4
>+++ src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java	25 Apr 2008 17:52:04 -0000
>@@ -40,12 +40,14 @@
> 		public String moduleID;
> 		public IConfigurationElement element;
> 		public int priority;
>+		public String name;
> 
>-		public ExtStorageModule(String id, IConfigurationElement element, int priority) {
>+		public ExtStorageModule(String id, IConfigurationElement element, int priority, String name) {
> 			super();
> 			this.element = element;
> 			this.moduleID = id;
> 			this.priority = priority;
>+			this.name = name;
> 		}
> 	}
> 
>@@ -104,7 +106,8 @@
> 				if (priority > 10)
> 					priority = 10;
> 			}
>-			allAvailableModules.add(new ExtStorageModule(moduleID, element, priority));
>+			String name = extensions[i].getLabel();
>+			allAvailableModules.add(new ExtStorageModule(moduleID, element, priority, name));
> 		}
> 
> 		Collections.sort(allAvailableModules, new Comparator() {
>#P org.eclipse.equinox.security.win32.x86
>Index: fragment.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86/fragment.xml,v
>retrieving revision 1.1
>diff -u -r1.1 fragment.xml
>--- fragment.xml	28 Feb 2008 18:04:33 -0000	1.1
>+++ fragment.xml	25 Apr 2008 17:52:05 -0000
>@@ -3,7 +3,7 @@
> <fragment>
>    <extension
>          id="WindowsPasswordProvider"
>-         name="%moduleName"
>+         name="%windowsModuleName"
>          point="org.eclipse.equinox.security.secureStorage">
>       <provider
>             class="org.eclipse.equinox.internal.security.win32.WinCrypto"
>Index: fragment.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86/fragment.properties,v
>retrieving revision 1.1
>diff -u -r1.1 fragment.properties
>--- fragment.properties	28 Feb 2008 18:04:33 -0000	1.1
>+++ fragment.properties	25 Apr 2008 17:52:05 -0000
>@@ -10,4 +10,4 @@
> ###############################################################################
> fragmentName = Windows Data Protection services integration
> providerName = Eclipse.org
>-moduleName = Password provider backed by the Windows Data Protection API (DPAPI)
>+windowsModuleName = Windows Integration

Actions: View | Diff

Attachments on bug 228918: 97648