Attachment #66483 for bug #170452

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 170452
Collapse All | Expand All




		java2buzillaOSMap.put("aix", "AIX");
		java2buzillaOSMap.put("hpux", "HP-UX");
		java2buzillaOSMap.put("linux", "Linux");
		java2buzillaOSMap.put("macosx", "Mac OS");
		java2buzillaOSMap.put("qnx", "QNX-Photon");
		java2buzillaOSMap.put("solaris", "Solaris");
		java2buzillaOSMap.put("win32", "Windows XP");

				// 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);

Lines 59-67 Link Here

(-)src/org/eclipse/mylar/bugzilla/tests/NewBugWizardTest.java (-3 / +6 lines)
59	assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());	59	assertEquals("AIX", newReport.getAttribute(BugzillaReportElement.OP_SYS.getKeyString()).getValue());
60		60
61	String platform = Platform.getOSArch();	61	String platform = Platform.getOSArch();
62	if (platform.equals("x86"))	62	if (platform.equals("x86")) {
63	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	63	if (os.equals("macosx"))
64	else if (platform.equals("x86_64"))	64	assertEquals("Macintosh", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
		65	else
		66	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
		67	} else if (platform.equals("x86_64"))
65	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	68	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());
66	else if (platform.equals("ia64"))	69	else if (platform.equals("ia64"))
67	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());	70	assertEquals("PC", newReport.getAttribute(BugzillaReportElement.REP_PLATFORM.getKeyString()).getValue());

Return to bug 170452

Lines 148-154 Link Here

(-)src/org/eclipse/mylar/internal/bugzilla/ui/wizard/BugzillaProductPage.java (-2 / +9 lines)
148	java2buzillaOSMap.put("aix", "AIX");	148	java2buzillaOSMap.put("aix", "AIX");
149	java2buzillaOSMap.put("hpux", "HP-UX");	149	java2buzillaOSMap.put("hpux", "HP-UX");
150	java2buzillaOSMap.put("linux", "Linux");	150	java2buzillaOSMap.put("linux", "Linux");
151	java2buzillaOSMap.put("macosx", "MacOS X");	151	java2buzillaOSMap.put("macosx", "Mac OS");
152	java2buzillaOSMap.put("qnx", "QNX-Photon");	152	java2buzillaOSMap.put("qnx", "QNX-Photon");
153	java2buzillaOSMap.put("solaris", "Solaris");	153	java2buzillaOSMap.put("solaris", "Solaris");
154	java2buzillaOSMap.put("win32", "Windows XP");	154	java2buzillaOSMap.put("win32", "Windows XP");
Lines 468-474 Link Here
468	// to null, and use "other"	468	// to null, and use "other"
469	bugzillaPlatform = null;	469	bugzillaPlatform = null;
470	}	470	}
471		471	if (bugzillaPlatform!= null && bugzillaPlatform.compareTo("PC")== 0 &&
		472	bugzillaOS!= null && bugzillaOS.compareTo("Mac OS")== 0)
		473	// Intel Mac's return PC as Platform because the OSArch == "x86"
		474	// so we change the Plaform if the bugzilla OS tell us it is an Mac OS
		475	//
		476	// btw bugzilla 3.0rc1 set Platform to PC in enter_bug.cgi pickplatform
		477	// move line 225 before 202 to fix this.
		478	bugzillaPlatform = "Macintosh";
472	// Set the OS and the Platform in the taskData	479	// Set the OS and the Platform in the taskData
473	if (bugzillaOS != null && opSysAttribute != null) {	480	if (bugzillaOS != null && opSysAttribute != null) {
474	opSysAttribute.setValue(bugzillaOS);	481	opSysAttribute.setValue(bugzillaOS);