Attachment 177049 Details for Bug 322867 – patch

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

[patch] patch

patch322867V1.txt (text/plain), 8.63 KB, created by Frank Becker

on 2010-08-19 16:47:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-08-19 16:47:17 EDT

Size: 8.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java,v
>retrieving revision 1.256
>diff -u -r1.256 BugzillaClient.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	17 Aug 2010 20:03:51 -0000	1.256
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	19 Aug 2010 20:38:14 -0000
>@@ -611,18 +611,18 @@
> 			BugzillaTaskDataHandler.createAttribute(existingReport, element);
> 		}
> 		String useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE);
>-		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+		if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
> 			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.TARGET_MILESTONE);
> 		}
> 		for (BugzillaAttribute element : reportElements2) {
> 			BugzillaTaskDataHandler.createAttribute(existingReport, element);
> 		}
> 		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT);
>-		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+		if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
> 			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.QA_CONTACT);
> 		}
> 		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD);
>-		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+		if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
> 			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.STATUS_WHITEBOARD);
> 		}
> 		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEBUGALIASES);
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java,v
>retrieving revision 1.57
>diff -u -r1.57 SaxMultiBugReportContentHandler.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java	9 Aug 2010 19:46:40 -0000	1.57
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java	19 Aug 2010 20:38:14 -0000
>@@ -487,26 +487,40 @@
> 				attachment.setAuthor(author);
> 			}
> 			break;
>-		case CLASSIFICATION:
> 		case TARGET_MILESTONE:
> 		case QA_CONTACT:
> 		case STATUS_WHITEBOARD:
>-		case ALIAS:
>-		case SEE_ALSO:
>-			TaskAttribute suppressAttribute = createAttrribute(parsedText, tag);
>-			String propertyName = null;
>+			TaskAttribute suppressAttribute0 = createAttrribute(parsedText, tag);
>+			String propertyName0 = null;
> 			switch (tag) {
>-			case CLASSIFICATION:
>-				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION;
>-				break;
> 			case TARGET_MILESTONE:
>-				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE;
>+				propertyName0 = IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE;
> 				break;
> 			case QA_CONTACT:
>-				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT;
>+				propertyName0 = IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT;
> 				break;
> 			case STATUS_WHITEBOARD:
>-				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD;
>+				propertyName0 = IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD;
>+				break;
>+			default:
>+				propertyName0 = null;
>+				break;
>+			}
>+			String useParam0 = repositoryTaskData.getAttributeMapper().getTaskRepository().getProperty(propertyName0);
>+			if (useParam0 == null || (useParam0 != null && useParam0.equals("true"))) { //$NON-NLS-1$
>+				suppressAttribute0.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>+			} else {
>+				suppressAttribute0.getMetaData().setKind(null);
>+			}
>+			break;
>+		case CLASSIFICATION:
>+		case ALIAS:
>+		case SEE_ALSO:
>+			TaskAttribute suppressAttribute1 = createAttrribute(parsedText, tag);
>+			String propertyName = null;
>+			switch (tag) {
>+			case CLASSIFICATION:
>+				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION;
> 				break;
> 			case ALIAS:
> 				propertyName = IBugzillaConstants.BUGZILLA_PARAM_USEBUGALIASES;
>@@ -518,14 +532,14 @@
> 				propertyName = null;
> 				break;
> 			}
>-			String useParam = repositoryTaskData.getAttributeMapper().getTaskRepository().getProperty(propertyName);
>-			if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>-				suppressAttribute.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>+			String useParam1 = repositoryTaskData.getAttributeMapper().getTaskRepository().getProperty(propertyName);
>+			if (useParam1 != null && useParam1.equals("true")) { //$NON-NLS-1$
>+				suppressAttribute1.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
> 				if (BugzillaAttribute.CLASSIFICATION.equals(tag)) {
>-					suppressAttribute.getMetaData().setReadOnly(true);
>+					suppressAttribute1.getMetaData().setReadOnly(true);
> 				}
> 			} else {
>-				suppressAttribute.getMetaData().setKind(null);
>+				suppressAttribute1.getMetaData().setKind(null);
> 			}
> 			break;
> 		default:
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java,v
>retrieving revision 1.108
>diff -u -r1.108 BugzillaRepositorySettingsPage.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java	13 Aug 2010 19:32:56 -0000	1.108
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java	19 Aug 2010 20:38:15 -0000
>@@ -381,20 +381,58 @@
> 				useXMLRPCstatusTransitions.setSelection(value);
> 			} else {
> 				// we use the repository values
>-				boolean value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION));
>+				boolean value;
>+				String valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION);
>+				if (valueString == null) {
>+					value = false;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				useclassification.setSelection(!value);
>-				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE);
>+				if (valueString == null) {
>+					value = true;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				usetargetmilestone.setSelection(!value);
>-				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT);
>+				if (valueString == null) {
>+					value = true;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				useqacontact.setSelection(!value);
>-				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD);
>+				if (valueString == null) {
>+					value = true;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				usestatuswhiteboard.setSelection(!value);
>-				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEBUGALIASES));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEBUGALIASES);
>+				if (valueString == null) {
>+					value = false;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				usebugaliases.setSelection(!value);
>-				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USE_SEE_ALSO));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USE_SEE_ALSO);
>+				if (valueString == null) {
>+					value = false;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
> 				use_see_also.setSelection(!value);
> 
> 				value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC));
>+				valueString = repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC);
>+				if (valueString == null) {
>+					value = false;
>+				} else {
>+					value = Boolean.parseBoolean(valueString);
>+				}
>+
> 				useXMLRPCstatusTransitions.setSelection(value);
> 			}
> 		}

Actions: View | Diff

Attachments on bug 322867: 177049 | 177050 | 177162 | 177163 | 178004 | 178005