Attachment 139482 Details for Bug 280561 – patch for 3.2.1

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

[patch] patch for 3.2.1

patch280561.txt (text/plain), 3.49 KB, created by Frank Becker

on 2009-06-17 17:13:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2009-06-17 17:13:30 EDT

Size: 3.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java,v
>retrieving revision 1.43
>diff -u -r1.43 BugzillaCorePlugin.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java	11 Jun 2009 02:29:59 -0000	1.43
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java	17 Jun 2009 21:12:46 -0000
>@@ -325,9 +325,11 @@
> 
> 			String OS = Platform.getOS();
> 			String platform = Platform.getOSArch();
>+			String ws = Platform.getWS();
> 
> 			String bugzillaOS = null; // Bugzilla String for OS
> 			String bugzillaPlatform = null; // Bugzilla String for Platform
>+			String[] wsExtentions = null;
> /*
> 			AIX -> AIX
> 			Linux -> Linux
>@@ -336,6 +338,27 @@
> 			MacOS X -> Mac OS X
>  */
> 
>+			if (ws.length() > 1) {
>+				char first = ws.charAt(0);
>+				char firstLower = Character.toLowerCase(first);
>+				char firstUpper = Character.toUpperCase(first);
>+				String[] wsExtentionsTemp = { " - " + firstUpper + ws.substring(1, ws.length()), //$NON-NLS-1$
>+						" - " + firstLower + ws.substring(1, ws.length()), //$NON-NLS-1$
>+						" " + firstUpper + ws.substring(1, ws.length()), //$NON-NLS-1$
>+						" " + firstLower + ws.substring(1, ws.length()), "" }; //$NON-NLS-1$//$NON-NLS-2$
>+				wsExtentions = wsExtentionsTemp;
>+			} else if (ws.length() == 1) {
>+				char first = ws.charAt(0);
>+				char firstLower = Character.toLowerCase(first);
>+				char firstUpper = Character.toUpperCase(first);
>+				String[] wsExtentionsTemp = { " - " + firstUpper, " - " + firstLower, " " + firstUpper, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+						" " + firstLower, "" }; //$NON-NLS-1$//$NON-NLS-2$
>+				wsExtentions = wsExtentionsTemp;
>+			} else {
>+				String[] wsExtentionsTemp = { "" }; //$NON-NLS-1$
>+				wsExtentions = wsExtentionsTemp;
>+			}
>+
> 			bugzillaOS = System.getProperty("os.name") + " " + System.getProperty("os.version"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 			// We start with the most specific Value as the Search String.
> 			// If we didn't find it we remove the last part of the version String or the OS Name from
>@@ -343,18 +366,25 @@
> 			//
> 			// The search in casesensitive.
> 			if (opSysAttribute != null) {
>-				while (bugzillaOS != null && opSysAttribute.getOption(bugzillaOS) == null) {
>-					int dotindex = bugzillaOS.lastIndexOf('.');
>-					if (dotindex > 0) {
>-						bugzillaOS = bugzillaOS.substring(0, dotindex);
>-					} else {
>-						int spaceindex = bugzillaOS.lastIndexOf(' ');
>-						if (spaceindex > 0) {
>-							bugzillaOS = bugzillaOS.substring(0, spaceindex);
>+				for (String element : wsExtentions) {
>+					String bugzillaOSTemp = bugzillaOS;
>+					while (bugzillaOSTemp != null && opSysAttribute.getOption(bugzillaOSTemp + element) == null) {
>+						int dotindex = bugzillaOSTemp.lastIndexOf('.');
>+						if (dotindex > 0) {
>+							bugzillaOSTemp = bugzillaOSTemp.substring(0, dotindex);
> 						} else {
>-							bugzillaOS = null;
>+							int spaceindex = bugzillaOSTemp.lastIndexOf(' ');
>+							if (spaceindex > 0) {
>+								bugzillaOSTemp = bugzillaOSTemp.substring(0, spaceindex);
>+							} else {
>+								bugzillaOSTemp = null;
>+							}
> 						}
> 					}
>+					if (bugzillaOSTemp != null) {
>+						bugzillaOS = bugzillaOSTemp + element;
>+						break;
>+					}
> 				}
> 			} else {
> 				bugzillaOS = null;

Actions: View | Diff

Attachments on bug 280561: 139392 | 139482 | 139483