Attachment #97648 for bug #228918

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

View | Details | Raw Unified | Return to bug 228918
Collapse All | Expand All

Lines 10-13 Link Here

(-)fragment.properties (-1 / +1 lines)
10	###############################################################################	10	###############################################################################
11	fragmentName = OS X Keystore service integration	11	fragmentName = OS X Keystore service integration
12	providerName = Eclipse.org	12	providerName = Eclipse.org
13	moduleName = Password provider backed by the OS X Keystore	13	macModuleName = OS X Keystore Integration

Lines 3-9 Link Here

(-)fragment.xml (-1 / +1 lines)
3	<fragment>	3	<fragment>
4	<extension	4	<extension
5	id="OSXKeystoreIntegration"	5	id="OSXKeystoreIntegration"
6	name="%moduleName"	6	name="%macModuleName"
7	point="org.eclipse.equinox.security.secureStorage">	7	point="org.eclipse.equinox.security.secureStorage">
8	<provider	8	<provider
9	class="org.eclipse.equinox.internal.security.osx.OSXProvider"	9	class="org.eclipse.equinox.internal.security.osx.OSXProvider"

Lines 59-64 Link Here

(-)plugin.xml (+1 lines)
59	<!-- The default UI password provider -->	59	<!-- The default UI password provider -->
60	<extension	60	<extension
61	id="DefaultPasswordProvider"	61	id="DefaultPasswordProvider"
		62	name="%uiPasswordProviderName"
62	point="org.eclipse.equinox.security.secureStorage">	63	point="org.eclipse.equinox.security.secureStorage">
63	<provider	64	<provider
64	class="org.eclipse.equinox.internal.security.ui.storage.DefaultPasswordProvider"	65	class="org.eclipse.equinox.internal.security.ui.storage.DefaultPasswordProvider"

Lines 18-20 Link Here

(-)plugin.properties (+1 lines)
18	certificateFile = Certificate File	18	certificateFile = Certificate File
19	certificateFileDescription = Import certificates into the platform.	19	certificateFileDescription = Import certificates into the platform.
20	storage = Secure Storage	20	storage = Secure Storage
		21	uiPasswordProviderName = UI Prompt

Lines 154-160 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/storage/TabPassword.java (-1 / +1 lines)
154	for (Iterator i = availableModules.iterator(); i.hasNext();) {	154	for (Iterator i = availableModules.iterator(); i.hasNext();) {
155	PasswordProviderDescription module = (PasswordProviderDescription) i.next();	155	PasswordProviderDescription module = (PasswordProviderDescription) i.next();
156	TableItem item = new TableItem(providerTable, SWT.LEFT);	156	TableItem item = new TableItem(providerTable, SWT.LEFT);
157	item.setText(new String[] {null, Integer.toString(module.getPriority()), module.getId()});	157	item.setText(new String[] {null, Integer.toString(module.getPriority()), module.getName()});
158	item.setData(module.getId());	158	item.setData(module.getId());
159	if (disabledModules == null)	159	if (disabledModules == null)
160	item.setChecked(true);	160	item.setChecked(true);

Lines 49-55 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/nls/messages.properties (-1 / +1 lines)
49	providersTable = Providers:	49	providersTable = Providers:
50	enabledColumn = Enabled	50	enabledColumn = Enabled
51	priorityColumn = Priority	51	priorityColumn = Priority
52	idColumn = ID	52	idColumn = Description
53	descriptionColumn = Description	53	descriptionColumn = Description
54	defaultGroup = Default secure preferences	54	defaultGroup = Default secure preferences
55	confirmDeleteMsg = This action will delete default secure storage. All data in it will be lost. Are you sure you want to delete it?	55	confirmDeleteMsg = This action will delete default secure storage. All data in it will be lost. Are you sure you want to delete it?

Lines 59-65 Link Here

(-)src/org/eclipse/equinox/internal/security/storage/friends/InternalExchangeUtils.java (-1 / +1 lines)
59	List result = new ArrayList(availableModules.size());	59	List result = new ArrayList(availableModules.size());
60	for (Iterator i = availableModules.iterator(); i.hasNext();) {	60	for (Iterator i = availableModules.iterator(); i.hasNext();) {
61	ExtStorageModule module = (ExtStorageModule) i.next();	61	ExtStorageModule module = (ExtStorageModule) i.next();
62	result.add(new PasswordProviderDescription(module.moduleID, module.priority));	62	result.add(new PasswordProviderDescription(module.name, module.moduleID, module.priority));
63	}	63	}
64	return result;	64	return result;
65	}	65	}

Lines 17-25 Link Here

(-)src/org/eclipse/equinox/internal/security/storage/friends/PasswordProviderDescription.java (-1 / +9 lines)
17		17
18	private int priority;	18	private int priority;
19	private String id;	19	private String id;
		20	private String name;
20		21
21	public PasswordProviderDescription(String id, int priority) {	22	public PasswordProviderDescription(String name, String id, int priority) {
22	this.id = id;	23	this.id = id;
		24	this.name = name;
23	this.priority = priority;	25	this.priority = priority;
24	}	26	}
25		27
Lines 30-33 Link Here
30	public String getId() {	32	public String getId() {
31	return id;	33	return id;
32	}	34	}
		35
		36	public String getName() {
		37	if (name == null \|\| name.length() == 0)
		38	return id;
		39	return name;
		40	}
33	}	41	}




		public String moduleID;
		public IConfigurationElement element;
		public int priority;
		public String name;

		public ExtStorageModule(String id, IConfigurationElement element, int priority, String name) {
			super();
			this.element = element;
			this.moduleID = id;
			this.priority = priority;
			this.name = name;
		}
	}


				if (priority > 10)
					priority = 10;
			}
			String name = extensions[i].getLabel();
			allAvailableModules.add(new ExtStorageModule(moduleID, element, priority, name));
		}

		Collections.sort(allAvailableModules, new Comparator() {

Lines 3-9 Link Here

(-)fragment.xml (-1 / +1 lines)
3	<fragment>	3	<fragment>
4	<extension	4	<extension
5	id="WindowsPasswordProvider"	5	id="WindowsPasswordProvider"
6	name="%moduleName"	6	name="%windowsModuleName"
7	point="org.eclipse.equinox.security.secureStorage">	7	point="org.eclipse.equinox.security.secureStorage">
8	<provider	8	<provider
9	class="org.eclipse.equinox.internal.security.win32.WinCrypto"	9	class="org.eclipse.equinox.internal.security.win32.WinCrypto"

Lines 10-13 Link Here

(-)fragment.properties (-1 / +1 lines)
10	###############################################################################	10	###############################################################################
11	fragmentName = Windows Data Protection services integration	11	fragmentName = Windows Data Protection services integration
12	providerName = Eclipse.org	12	providerName = Eclipse.org
13	moduleName = Password provider backed by the Windows Data Protection API (DPAPI)	13	windowsModuleName = Windows Integration

Return to bug 228918

Lines 40-51 Link Here

(-)src/org/eclipse/equinox/internal/security/storage/PasswordProviderSelector.java (-2 / +5 lines)
40	public String moduleID;	40	public String moduleID;
41	public IConfigurationElement element;	41	public IConfigurationElement element;
42	public int priority;	42	public int priority;
		43	public String name;
43		44
44	public ExtStorageModule(String id, IConfigurationElement element, int priority) {	45	public ExtStorageModule(String id, IConfigurationElement element, int priority, String name) {
45	super();	46	super();
46	this.element = element;	47	this.element = element;
47	this.moduleID = id;	48	this.moduleID = id;
48	this.priority = priority;	49	this.priority = priority;
		50	this.name = name;
49	}	51	}
50	}	52	}
51		53
Lines 104-110 Link Here
104	if (priority > 10)	106	if (priority > 10)
105	priority = 10;	107	priority = 10;
106	}	108	}
107	allAvailableModules.add(new ExtStorageModule(moduleID, element, priority));	109	String name = extensions[i].getLabel();
		110	allAvailableModules.add(new ExtStorageModule(moduleID, element, priority, name));
108	}	111	}
109		112
110	Collections.sort(allAvailableModules, new Comparator() {	113	Collections.sort(allAvailableModules, new Comparator() {