Attachment 76931 Details for Bug 168597 – patch for org.eclipse.hyades.test.ui

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

[patch] patch for org.eclipse.hyades.test.ui

bugzilla168597b.txt (text/plain), 3.05 KB, created by DuWayne Morris

on 2007-08-24 13:25:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: DuWayne Morris

Created: 2007-08-24 13:25:38 EDT

Size: 3.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.ui
>Index: src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java,v
>retrieving revision 1.12
>diff -u -r1.12 RecorderRegistryInfo.java
>--- src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java	26 Apr 2007 20:49:40 -0000	1.12
>+++ src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderRegistryInfo.java	24 Aug 2007 16:24:42 -0000
>@@ -27,6 +27,7 @@
> 
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.Platform;
>+import org.eclipse.hyades.execution.recorder.local.appadapters.JNIWrapper;
> 
> /**
>  * @author mdunn
>@@ -66,8 +67,13 @@
> 	private String proxyOverrideString = "";
> 	private String autoConfigURLString = "";
> 	
>+	private boolean bUseNativeRegistryInterface = false;
>+	private JNIWrapper jniWrapper = null;	
>+	
> 	public RecorderRegistryInfo() {
> 		StringBuffer inputFileContents = getRegistryInfo();
>+		if (bUseNativeRegistryInterface)
>+			inputFileContents = getRegistryInfoUsingNativeAPI();
> 		// below is for bugzilla 177396 mdd
> 		String checkVistaError=inputFileContents.toString();
> 		if (checkVistaError.equalsIgnoreCase("VISTA_ADMIN_ERROR")) {
>@@ -154,7 +160,15 @@
> 			if (currentOS.equals("win32")) {
> 				String myVersion = System.getProperty("os.version");
> 				if (myVersion.startsWith("6")) {
>-					inputFileContents.append("VISTA_ADMIN_ERROR");
>+					try{
>+						// Bugilla 168597, use native registry calls 
>+						// instead of displaying an error message
>+						jniWrapper = new JNIWrapper();
>+						bUseNativeRegistryInterface = true;
>+					}
>+					catch (UnsatisfiedLinkError e2){
>+						inputFileContents.append("VISTA_ADMIN_ERROR");
>+					}
> 				}
> 				else {
> 					inputFileContents.append("WINDOWS_ADMIN_ERROR");
>@@ -183,6 +197,28 @@
> 		}
> 		return inputFileContents;
> 	}
>+	
>+	// added for Bugilla 168597
>+	StringBuffer getRegistryInfoUsingNativeAPI(){
>+		StringBuffer inputFileContents = new StringBuffer();		
>+		// fire up an instance of the JNI layer to start using native code
>+		AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyEnable");
>+		AddSettingToBuffer(jniWrapper, inputFileContents, "AutoConfigURL");
>+		AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyServer");
>+		AddSettingToBuffer(jniWrapper, inputFileContents, "ProxyOverride");
>+
>+		return inputFileContents;
>+	}
>+	
>+	private void AddSettingToBuffer(JNIWrapper jniWrapper, StringBuffer inputFileContents, String name){
>+		String setting = jniWrapper.getInternetSetting(name);
>+		if (setting != null  && setting.length() > 0){
>+			inputFileContents.append("\"" + name + "\"=" + setting + "\r\n");
>+		}
>+		return;
>+	}
>+			
>+	
> 	private boolean checkProxyEnabled(StringBuffer inputBuffer) 
> 	{
> 			boolean comparesOK = false;

Actions: View | Diff

Attachments on bug 168597: 76930 | 76931 | 80259 | 80260 | 80261 | 80262 | 80270 | 80900 | 80901 | 80902