Attachment #163529 for bug #307729

View | Details | Raw Unified | Return to bug 307729
Collapse All | Expand All




				}
			}
			break;
		case SEE_ALSO:
			TaskAttribute seeAlso = repositoryTaskData.getRoot().getMappedAttribute(tag.getKey());
			if (seeAlso == null) {
				BugzillaTaskDataHandler.createAttribute(repositoryTaskData, tag).setValue(parsedText);
			} else {
				if (seeAlso.getValue().equals("")) { //$NON-NLS-1$
					seeAlso.setValue(parsedText);
				} else {
					List<String> values = seeAlso.getValues();
					List<String> newValues = new ArrayList<String>(values);
					newValues.add(parsedText);
					seeAlso.setValues(newValues);
				}
			}
			break;
		case UNKNOWN:
			//ignore
			break;




BugzillaAttribute_Reassign_to_default_assignee=Reassign to default assignee
BugzillaAttribute_Remaining=Remaining:
BugzillaAttribute_Remove_CC=Remove CC
BugzillaAttribute_Remove_See_Also=Remove See Also
BugzillaAttribute_REPORT_ACCESSIBLE=Reporter
BugzillaAttribute_REPORT_NAME=Reporter:
BugzillaAttribute_Reporter=Reporter:
BugzillaAttribute_Resolution=Resolution:
BugzillaAttribute_See_Also=Add Bug URLs:
BugzillaAttribute_Severity=Severity:
BugzillaAttribute_Size=Size:
BugzillaAttribute_Status=Status:

Lines 126-131 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java (+5 lines)
126		126
127	REMAINING_TIME(Messages.BugzillaAttribute_Remaining, "remaining_time", TaskAttribute.TYPE_SHORT_TEXT, true, false), //$NON-NLS-1$	127	REMAINING_TIME(Messages.BugzillaAttribute_Remaining, "remaining_time", TaskAttribute.TYPE_SHORT_TEXT, true, false), //$NON-NLS-1$
128		128
		129	REMOVE_SEE_ALSO(Messages.BugzillaAttribute_Remove_See_Also,
		130	"remove_see_also", TaskAttribute.TYPE_SHORT_RICH_TEXT, false, false), //$NON-NLS-1$
		131
		132	SEE_ALSO(Messages.BugzillaAttribute_See_Also, "see_also", TaskAttribute.TYPE_SHORT_RICH_TEXT, false, false), //$NON-NLS-1$
		133
129	SET_DEFAULT_ASSIGNEE(Messages.BugzillaAttribute_Reassign_to_default_assignee,	134	SET_DEFAULT_ASSIGNEE(Messages.BugzillaAttribute_Reassign_to_default_assignee,
130	"set_default_assignee", TaskAttribute.TYPE_BOOLEAN, true, //$NON-NLS-1$	135	"set_default_assignee", TaskAttribute.TYPE_BOOLEAN, true, //$NON-NLS-1$
131	false),	136	false),

Lines 119-124 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java (+4 lines)
119		119
120	public static String BugzillaAttribute_Remove_CC;	120	public static String BugzillaAttribute_Remove_CC;
121		121
		122	public static String BugzillaAttribute_Remove_See_Also;
		123
122	public static String BugzillaAttribute_REPORT_ACCESSIBLE;	124	public static String BugzillaAttribute_REPORT_ACCESSIBLE;
123		125
124	public static String BugzillaAttribute_REPORT_NAME;	126	public static String BugzillaAttribute_REPORT_NAME;
Lines 127-132 Link Here
127		129
128	public static String BugzillaAttribute_Resolution;	130	public static String BugzillaAttribute_Resolution;
129		131
		132	public static String BugzillaAttribute_See_Also;
		133
130	public static String BugzillaAttribute_Severity;	134	public static String BugzillaAttribute_Severity;
131		135
132	public static String BugzillaAttribute_Size;	136	public static String BugzillaAttribute_Size;




						|| id.equals(BugzillaAttribute.REMOVECC.getKey())
						|| id.equals(BugzillaAttribute.CREATION_TS.getKey())
						|| id.equals(BugzillaAttribute.BUG_STATUS.getKey())
						|| id.equals(BugzillaAttribute.VOTES.getKey())
						|| id.equals(BugzillaAttribute.REMOVE_SEE_ALSO.getKey())) {
					continue;
				} else if (id.equals(BugzillaAttribute.NEW_COMMENT.getKey())) {
					BugzillaVersion bugzillaVersion = null;

			}
		}

		TaskAttribute removeSeeAlso = model.getRoot().getMappedAttribute(BugzillaAttribute.REMOVE_SEE_ALSO.getKey());
		if (removeSeeAlso != null) {
			List<String> removeSeeAlsoList = removeSeeAlso.getValues();
			int i = 0;
			for (String removeSeeAlsoEntry : removeSeeAlsoList) {
				fields.put(BugzillaAttribute.REMOVE_SEE_ALSO.getKey() + "_" + i, new NameValuePair( //$NON-NLS-1$
						BugzillaAttribute.REMOVE_SEE_ALSO.getKey(), removeSeeAlsoEntry));
				i++;
			}
		}

		// check for security token (required for successful submit on Bugzilla 3.2.1 and greater but not in xml until Bugzilla 3.2.3  bug#263318)

		if (groupSecurityEnabled || (!tokenFound && tokenRequired)) {

Return to bug 307729

Lines 455-460 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java (+15 lines)
455	}	455	}
456	}	456	}
457	break;	457	break;
		458	case SEE_ALSO:
		459	TaskAttribute seeAlso = repositoryTaskData.getRoot().getMappedAttribute(tag.getKey());
		460	if (seeAlso == null) {
		461	BugzillaTaskDataHandler.createAttribute(repositoryTaskData, tag).setValue(parsedText);
		462	} else {
		463	if (seeAlso.getValue().equals("")) { //$NON-NLS-1$
		464	seeAlso.setValue(parsedText);
		465	} else {
		466	List<String> values = seeAlso.getValues();
		467	List<String> newValues = new ArrayList<String>(values);
		468	newValues.add(parsedText);
		469	seeAlso.setValues(newValues);
		470	}
		471	}
		472	break;
458	case UNKNOWN:	473	case UNKNOWN:
459	//ignore	474	//ignore
460	break;	475	break;

Lines 1175-1181 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java (-1 / +13 lines)
1175	\|\| id.equals(BugzillaAttribute.REMOVECC.getKey())	1175	\|\| id.equals(BugzillaAttribute.REMOVECC.getKey())
1176	\|\| id.equals(BugzillaAttribute.CREATION_TS.getKey())	1176	\|\| id.equals(BugzillaAttribute.CREATION_TS.getKey())
1177	\|\| id.equals(BugzillaAttribute.BUG_STATUS.getKey())	1177	\|\| id.equals(BugzillaAttribute.BUG_STATUS.getKey())
1178	\|\| id.equals(BugzillaAttribute.VOTES.getKey())) {	1178	\|\| id.equals(BugzillaAttribute.VOTES.getKey())
		1179	\|\| id.equals(BugzillaAttribute.REMOVE_SEE_ALSO.getKey())) {
1179	continue;	1180	continue;
1180	} else if (id.equals(BugzillaAttribute.NEW_COMMENT.getKey())) {	1181	} else if (id.equals(BugzillaAttribute.NEW_COMMENT.getKey())) {
1181	BugzillaVersion bugzillaVersion = null;	1182	BugzillaVersion bugzillaVersion = null;
Lines 1410-1415 Link Here
1410	}	1411	}
1411	}	1412	}
1412		1413
		1414	TaskAttribute removeSeeAlso = model.getRoot().getMappedAttribute(BugzillaAttribute.REMOVE_SEE_ALSO.getKey());
		1415	if (removeSeeAlso != null) {
		1416	List<String> removeSeeAlsoList = removeSeeAlso.getValues();
		1417	int i = 0;
		1418	for (String removeSeeAlsoEntry : removeSeeAlsoList) {
		1419	fields.put(BugzillaAttribute.REMOVE_SEE_ALSO.getKey() + "_" + i, new NameValuePair( //$NON-NLS-1$
		1420	BugzillaAttribute.REMOVE_SEE_ALSO.getKey(), removeSeeAlsoEntry));
		1421	i++;
		1422	}
		1423	}
		1424
1413	// check for security token (required for successful submit on Bugzilla 3.2.1 and greater but not in xml until Bugzilla 3.2.3 bug#263318)	1425	// check for security token (required for successful submit on Bugzilla 3.2.1 and greater but not in xml until Bugzilla 3.2.3 bug#263318)
1414		1426
1415	if (groupSecurityEnabled \|\| (!tokenFound && tokenRequired)) {	1427	if (groupSecurityEnabled \|\| (!tokenFound && tokenRequired)) {

Lines 55-64 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties (+2 lines)
55	BugzillaAttribute_Reassign_to_default_assignee=Reassign to default assignee	55	BugzillaAttribute_Reassign_to_default_assignee=Reassign to default assignee
56	BugzillaAttribute_Remaining=Remaining:	56	BugzillaAttribute_Remaining=Remaining:
57	BugzillaAttribute_Remove_CC=Remove CC	57	BugzillaAttribute_Remove_CC=Remove CC
		58	BugzillaAttribute_Remove_See_Also=Remove See Also
58	BugzillaAttribute_REPORT_ACCESSIBLE=Reporter	59	BugzillaAttribute_REPORT_ACCESSIBLE=Reporter
59	BugzillaAttribute_REPORT_NAME=Reporter:	60	BugzillaAttribute_REPORT_NAME=Reporter:
60	BugzillaAttribute_Reporter=Reporter:	61	BugzillaAttribute_Reporter=Reporter:
61	BugzillaAttribute_Resolution=Resolution:	62	BugzillaAttribute_Resolution=Resolution:
		63	BugzillaAttribute_See_Also=Add Bug URLs:
62	BugzillaAttribute_Severity=Severity:	64	BugzillaAttribute_Severity=Severity:
63	BugzillaAttribute_Size=Size:	65	BugzillaAttribute_Size=Size:
64	BugzillaAttribute_Status=Status:	66	BugzillaAttribute_Status=Status: