Attachment 97108 Details for Bug 227293 – Patch for many items listed

[patch] Patch for many items listed

patch227293-1.txt (text/plain), 11.60 KB, created by Kevin McGuire

on 2008-04-22 18:55:55 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin McGuire

Created: 2008-04-22 18:55:55 EDT

Size: 11.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.security.ui
>Index: src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 PolicyPage.java
>--- src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java	26 Mar 2008 14:11:41 -0000	1.4
>+++ src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java	22 Apr 2008 22:51:01 -0000
>@@ -18,7 +18,8 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
>-import org.eclipse.swt.layout.*;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.*;
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.IWorkbenchPreferencePage;
>@@ -36,53 +37,33 @@
> 
> 	protected Control createContents(Composite parent) {
> 
>-		//Composite page = new Composite(parent, SWT.NONE);
>-		//page.setLayout(new FormLayout());
>+		Composite composite = new Composite(parent, SWT.NONE);
>+		GridLayout compositeLayout = new GridLayout();
>+		compositeLayout.marginWidth = 0;
>+		compositeLayout.marginHeight = 0;
>+		composite.setLayout(compositeLayout);
>+		composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
>+
>+		//Group gives nice box around the radio buttons
>+		Group buttonGroup = new Group(composite, SWT.LEFT);
>+		GridLayout buttonLayout = new GridLayout();
>+		buttonGroup.setLayout(buttonLayout);
>+		GridData compositeData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
>+		buttonGroup.setLayoutData(compositeData);
>+		buttonGroup.setText(SecurityUIMsg.POLPAGE_LABEL_DESC);
>+
>+		anyButton = new Button(buttonGroup, SWT.RADIO);
>+		anysignedButton = new Button(buttonGroup, SWT.RADIO);
>+		onlytrustedButton = new Button(buttonGroup, SWT.RADIO);
>+		onlytrustedButton.setSelection(true);
>+
>+		expiredButton = new Button(buttonGroup, SWT.CHECK);
>+		expiredButton.setEnabled(true); //since onlytrustedButton is default on
>+
>+		GridData data = new GridData();
>+		data.horizontalIndent = 20;
>+		expiredButton.setLayoutData(data);
> 
>-		//		Label titleLabel = new Label(page, SWT.NONE);
>-		//		titleLabel.setText(SecurityUIMsg.POLPAGE_LABEL_TITLE);
>-		FormData data = new FormData();
>-		//				data.top = new FormAttachment(0, 0);
>-		//		data.left = new FormAttachment(0, 0);
>-		//		titleLabel.setLayoutData(data);
>-
>-		//folder = new TabFolder(page, SWT.NONE);
>-		//folder.setLayout(new FormLayout());
>-		//data = new FormData();
>-		//data.top = new FormAttachment(0, 10);
>-		//data.left = new FormAttachment(0, 0);
>-		//data.right = new FormAttachment(100, 0);
>-		//data.bottom = new FormAttachment(100, 0);
>-		//folder.setLayoutData(data);
>-		//folder.setEnabled(false);
>-
>-		//TabItem item = new TabItem(folder, SWT.NONE);
>-		//item.setText(SecurityUIMsg.POLPAGE_LABEL_SECTION);
>-
>-		Composite loadArea = new Composite(parent, SWT.NONE);
>-		loadArea.setLayout(new FormLayout());
>-
>-		//item.setControl(loadArea);
>-
>-		data = new FormData();
>-		data.top = new FormAttachment(0, 0);
>-		data.left = new FormAttachment(0, 0);
>-		data.right = new FormAttachment(100, 0);
>-		data.bottom = new FormAttachment(100, 0);
>-		loadArea.setLayoutData(data);
>-
>-		Label titleLabel = new Label(loadArea, SWT.NONE);
>-		titleLabel.setText(SecurityUIMsg.POLPAGE_LABEL_DESC);
>-		data = new FormData();
>-		data.top = new FormAttachment(0, 5);
>-		data.left = new FormAttachment(0, 5);
>-		titleLabel.setLayoutData(data);
>-
>-		anyButton = new Button(loadArea, SWT.RADIO);
>-		anysignedButton = new Button(loadArea, SWT.RADIO);
>-		onlytrustedButton = new Button(loadArea, SWT.RADIO);
>-		expiredButton = new Button(loadArea, SWT.CHECK);
>-		expiredButton.setEnabled(false);
> 		expiredButton.addSelectionListener(new SelectionListener() {
> 			public void widgetDefaultSelected(SelectionEvent event) {
> 				//do nothing
>@@ -134,10 +115,6 @@
> 				persistPolicySetting(DefaultAuthorizationEngine.ENFORCE_NONE);
> 			}
> 		});
>-		data = new FormData();
>-		data.top = new FormAttachment(titleLabel, 10);
>-		data.left = new FormAttachment(0, 5);
>-		anyButton.setLayoutData(data);
> 
> 		anysignedButton.setText(SecurityUIMsg.POLPAGE_BUTTON_ALLOW_ANY_SIGNED);
> 		anysignedButton.addSelectionListener(new SelectionListener() {
>@@ -151,10 +128,6 @@
> 				persistPolicySetting(DefaultAuthorizationEngine.ENFORCE_SIGNED);
> 			}
> 		});
>-		data = new FormData();
>-		data.top = new FormAttachment(anyButton, 2);
>-		data.left = new FormAttachment(0, 5);
>-		anysignedButton.setLayoutData(data);
> 
> 		onlytrustedButton.setText(SecurityUIMsg.POLPAGE_BUTTON_ALLOW_ONLY_TRUSTED);
> 		onlytrustedButton.addSelectionListener(new SelectionListener() {
>@@ -168,10 +141,7 @@
> 			}
> 
> 		});
>-		data = new FormData();
>-		data.top = new FormAttachment(anysignedButton, 2);
>-		data.left = new FormAttachment(0, 5);
>-		onlytrustedButton.setLayoutData(data);
>+
> 		/*
> 				whitelistButton.setText(STR_whiteList);
> 				whitelistButton.addSelectionListener(new SelectionListener() {
>@@ -239,16 +209,11 @@
> 				promptButton.setLayoutData(data);
> 		*/
> 		expiredButton.setText(SecurityUIMsg.POLPAGE_BUTTON_ALLOW_EXPIRED);
>-		data = new FormData();
>-		data.top = new FormAttachment(onlytrustedButton, 5);
>-		data.left = new FormAttachment(0, 5);
>-		//data.bottom = new FormAttachment(100, -5);
>-		expiredButton.setLayoutData(data);
> 
> 		//		onlytrustedButton.setSelection(true);
> 		//		expiredButton.setEnabled(true);
> 
>-		return loadArea;
>+		return composite;
> 	}
> 
> 	//protected void enableSecurityWidgets() {
>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.2
>diff -u -r1.2 SecurityCategoryPage.java
>--- src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java	20 Mar 2008 22:42:29 -0000	1.2
>+++ src/org/eclipse/equinox/internal/security/ui/preferences/SecurityCategoryPage.java	22 Apr 2008 22:51:01 -0000
>@@ -37,6 +37,9 @@
> 		GridLayout layout = new GridLayout();
> 		pageArea.setLayout(layout);
> 
>+		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));
> 
>@@ -46,9 +49,6 @@
> 		//PreferenceLinkArea certsLinkArea = new PreferenceLinkArea(pageArea, SWT.NONE, "org.eclipse.equinox.security.ui.certificates", SecurityUIMsg.CATPAGE_LABEL_CERTIFICATES, (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
> 		//certsLinkArea.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));
>-
> 		return pageArea;
> 	}
> }
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/plugin.xml,v
>retrieving revision 1.7
>diff -u -r1.7 plugin.xml
>--- plugin.xml	21 Apr 2008 17:46:55 -0000	1.7
>+++ plugin.xml	22 Apr 2008 22:51:01 -0000
>@@ -5,7 +5,8 @@
>       <page
>          name="%security"
>          class="org.eclipse.equinox.internal.security.ui.preferences.SecurityCategoryPage"
>-         id="org.eclipse.equinox.security.ui.category">
>+         id="org.eclipse.equinox.security.ui.category"
>+         category="org.eclipse.ui.preferencePages.Workbench">
>       </page>
>    </extension>
> 
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/plugin.properties,v
>retrieving revision 1.6
>diff -u -r1.6 plugin.properties
>--- plugin.properties	21 Apr 2008 17:46:55 -0000	1.6
>+++ plugin.properties	22 Apr 2008 22:51:01 -0000
>@@ -12,7 +12,7 @@
> pluginName = Equinox Security Default UI
> providerName = Eclipse.org
> security = Security
>-policy = Trusted Bundles
>+policy = Trusted Plug-ins
> certificates = Certificates
> advanced = Providers and Services
> certificateFile = Certificate File
>Index: src/org/eclipse/equinox/internal/security/ui/SecurityUIMsg.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityUIMsg.properties,v
>retrieving revision 1.4
>diff -u -r1.4 SecurityUIMsg.properties
>--- src/org/eclipse/equinox/internal/security/ui/SecurityUIMsg.properties	3 Apr 2008 18:00:46 -0000	1.4
>+++ src/org/eclipse/equinox/internal/security/ui/SecurityUIMsg.properties	22 Apr 2008 22:51:01 -0000
>@@ -44,18 +44,20 @@
> STR_CERT_VIEWER_FIELD=Field
> STR_CERT_VIEWER_VALUE=Value
> 
>-CATPAGE_LABEL_STORAGE = See <a>''{0}''</a> for settings related to the encrypted storage system
>-CATPAGE_LABEL_POLICY = See <a>''{0}''</a> to manage policy settings applied to bundles
>-CATPAGE_LABEL_CERTIFICATES = See <a>''{0}''</a> to manage security certificates
>-CATPAGE_LABEL_ADVANCED = See <a>''{0}''</a> to view advanced security configuration
>+CATPAGE_LABEL_STORAGE = See <a>''{0}''</a> for settings related to the encrypted storage system.
>+CATPAGE_LABEL_POLICY = See <a>''{0}''</a> to manage policy settings applied to plug-ins.
>+CATPAGE_LABEL_CERTIFICATES = See <a>''{0}''</a> to manage security certificates.
>+CATPAGE_LABEL_ADVANCED = See <a>''{0}''</a> to view advanced security configuration.
> 
> POLPAGE_LABEL_SECTION = Loading code
>-POLPAGE_LABEL_TITLE = Manage policy applied to bundle code
>-POLPAGE_LABEL_DESC = Select the policy to be applied when loading bundle code:
>-POLPAGE_BUTTON_ALLOW_ANY = Allow any signed or unsigned application code
>-POLPAGE_BUTTON_ALLOW_ANY_SIGNED = Allow any signed application code
>-POLPAGE_BUTTON_ALLOW_ONLY_TRUSTED = Allow only signed and trusted application code
>-POLPAGE_BUTTON_ALLOW_EXPIRED = Allow application code from signers with expired certificates
>+POLPAGE_LABEL_TITLE = Manage policy applied to plug-in code
>+
>+POLPAGE_LABEL_DESC = Allow plug-in code to load when
>+POLPAGE_BUTTON_ALLOW_ANY = Signed or unsigned
>+POLPAGE_BUTTON_ALLOW_ANY_SIGNED = Signed
>+POLPAGE_BUTTON_ALLOW_ONLY_TRUSTED = Signed and trusted
>+POLPAGE_BUTTON_ALLOW_EXPIRED = Permit signers with expired certificates
>+
> 
> CERTPAGE_LABEL_TITLE = Manage security certificates (UNDER CONSTRUCTION)
> CERTPAGE_LABEL_LINK = <a>Manage trust repositories...</a>

Actions: View | Diff

Attachments on bug 227293: 96632 | 96634 | 96785 | 96787 | 96788 | 96790 | 96791 | 96792 | 96793 | 96794 | 96795 | 96797 | 96799 | 96800 | 96804 | 96805 | 96806 | 96808 | 96810 | 97108 | 97857 | 98268 | 98382 | 98385 | 98458 | 98597 | 99159 | 99199 | 99353