Attachment 66483 Details for Bug 170452 – Patch Intel Mac's running Mac OS X

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

[patch] Patch Intel Mac's running Mac OS X

patchFor170452.txt (text/plain), 3.16 KB, created by Frank Becker

on 2007-05-09 11:00:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-05-09 11:00:50 EDT

Size: 3.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.bugzilla.ui
>Index: src/org/eclipse/mylar/internal/bugzilla/ui/wizard/BugzillaProductPage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.bugzilla.ui/src/org/eclipse/mylar/internal/bugzilla/ui/wizard/BugzillaProductPage.java,v
>retrieving revision 1.61
>diff -u -r1.61 BugzillaProductPage.java
>--- src/org/eclipse/mylar/internal/bugzilla/ui/wizard/BugzillaProductPage.java	20 Apr 2007 17:48:30 -0000	1.61
>+++ src/org/eclipse/mylar/internal/bugzilla/ui/wizard/BugzillaProductPage.java	9 May 2007 14:42:18 -0000
>@@ -148,7 +148,7 @@
> 		java2buzillaOSMap.put("aix", "AIX");
> 		java2buzillaOSMap.put("hpux", "HP-UX");
> 		java2buzillaOSMap.put("linux", "Linux");
>-		java2buzillaOSMap.put("macosx", "MacOS X");
>+		java2buzillaOSMap.put("macosx", "Mac OS");
> 		java2buzillaOSMap.put("qnx", "QNX-Photon");
> 		java2buzillaOSMap.put("solaris", "Solaris");
> 		java2buzillaOSMap.put("win32", "Windows XP");
>@@ -468,7 +468,14 @@
> 				// to null, and use "other"
> 				bugzillaPlatform = null;
> 			}
>-
>+			if (bugzillaPlatform!= null && bugzillaPlatform.compareTo("PC")== 0 &&
>+				bugzillaOS!= null       && bugzillaOS.compareTo("Mac OS")== 0)
>+				// Intel Mac's return PC as Platform because the OSArch == "x86"
>+				// so we change the Plaform if the bugzilla OS tell us it is an Mac OS
>+				//
>+				// btw bugzilla 3.0rc1 set Platform to PC in enter_bug.cgi pickplatform
>+				// move line 225 before 202 to fix this.
>+				bugzillaPlatform = "Macintosh";
> 			// Set the OS and the Platform in the taskData
> 			if (bugzillaOS != null && opSysAttribute != null) {
> 				opSysAttribute.setValue(bugzillaOS);
>#P org.eclipse.mylar.bugzilla.tests
>Index: src/org/eclipse/mylar/bugzilla/tests/NewBugWizardTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.bugzilla.tests/src/org/eclipse/mylar/bugzilla/tests/NewBugWizardTest.java,v
>retrieving revision 1.27
>diff -u -r1.27 NewBugWizardTest.java
>--- src/org/eclipse/mylar/bugzilla/tests/NewBugWizardTest.java	21 Feb 2007 01:08:46 -0000	1.27
>+++ src/org/eclipse/mylar/bugzilla/tests/NewBugWizardTest.java	9 May 2007 14:42:19 -0000
>@@ -59,9 +59,12 @@
> 			assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());
> 
> 		String platform = Platform.getOSArch();
>-		if (platform.equals("x86"))
>-			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
>-		else if (platform.equals("x86_64"))
>+		if (platform.equals("x86")) {
>+			if (os.equals("macosx"))
>+				assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
>+			else
>+				assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
>+		} else if (platform.equals("x86_64"))
> 			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
> 		else if (platform.equals("ia64"))
> 			assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());

Actions: View | Diff

Attachments on bug 170452: 57119 | 66222 | 66483