Attachment #137420 for bug #272207

Lines 369-374 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java (+97 lines)
369	addMissingFlags(taskData);	369	addMissingFlags(taskData);
370	updateAttributeOptions(taskData);	370	updateAttributeOptions(taskData);
371	addValidOperations(taskData);	371	addValidOperations(taskData);
		372	addMissingAttachmentFlags(taskData);
		373	updateAttachmentOptions(taskData);
372	}	374	}
373	}	375	}
374		376
Lines 697-700 Link Here
697	}	699	}
698	return null;	700	return null;
699	}	701	}
		702
		703	public void updateAttachmentOptions(TaskData existingReport) {
		704	for (TaskAttribute attribute : new HashSet<TaskAttribute>(existingReport.getRoot().getAttributes().values())) {
		705
		706	if (!attribute.getId().startsWith("task.common.attachment")) { //$NON-NLS-1$
		707	continue;
		708	}
		709
		710	for (TaskAttribute attachmentAttribute : attribute.getAttributes().values()) {
		711	if (!attachmentAttribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
		712	continue;
		713	}
		714
		715	TaskAttribute state = attachmentAttribute.getAttribute("state"); //$NON-NLS-1$
		716	attachmentAttribute.clearOptions();
		717
		718	String nameValue = state.getMetaData().getLabel();
		719	state.putOption("", ""); //$NON-NLS-1$ //$NON-NLS-2$
		720	for (BugzillaFlag bugzillaFlag : flags) {
		721	if (nameValue.equals(bugzillaFlag.getName()) && bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
		722	if ("attachment".equals(bugzillaFlag.getType())) { //$NON-NLS-1$
		723	if (bugzillaFlag.isRequestable()) {
		724	state.putOption("?", "?"); //$NON-NLS-1$ //$NON-NLS-2$
		725	}
		726	break;
		727	}
		728	}
		729	}
		730	state.putOption("-", "-"); //$NON-NLS-1$ //$NON-NLS-2$
		731	state.putOption("+", "+"); //$NON-NLS-1$ //$NON-NLS-2$
		732	String flagNameValue = state.getMetaData().getLabel();
		733	for (BugzillaFlag bugzillaFlag : flags) {
		734	if (flagNameValue.equals(bugzillaFlag.getName()) && bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
		735	TaskAttribute requestee = attachmentAttribute.getAttribute("requestee"); //$NON-NLS-1$
		736	if (requestee == null) {
		737	requestee = attachmentAttribute.createMappedAttribute("requestee"); //$NON-NLS-1$
		738	requestee.getMetaData().defaults().setType(TaskAttribute.TYPE_SHORT_TEXT);
		739	requestee.setValue(""); //$NON-NLS-1$
		740	}
		741	requestee.getMetaData().setReadOnly(!bugzillaFlag.isSpecifically_requestable());
		742	}
		743	}
		744
		745	}
		746	}
		747	}
		748
		749	private void addMissingAttachmentFlags(TaskData taskData) {
		750	List<String> existingFlags = new ArrayList<String>();
		751	List<BugzillaFlag> flags = getFlags();
		752	for (TaskAttribute attribute : new HashSet<TaskAttribute>(taskData.getRoot().getAttributes().values())) {
		753
		754	if (!attribute.getId().startsWith("task.common.attachment")) { //$NON-NLS-1$
		755	continue;
		756	}
		757	existingFlags.clear();
		758	for (TaskAttribute attachmentAttribute : attribute.getAttributes().values()) {
		759	if (!attachmentAttribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
		760	continue;
		761	}
		762	TaskAttribute state = attachmentAttribute.getAttribute("state"); //$NON-NLS-1$
		763	if (state != null) {
		764	String nameValue = state.getMetaData().getLabel();
		765	if (!existingFlags.contains(nameValue)) {
766	existingFlags.add(nameValue);
767	}
768	}
769	}
770	TaskAttribute productAttribute = taskData.getRoot().getMappedAttribute(BugzillaAttribute.PRODUCT.getKey());
771	TaskAttribute componentAttribute = taskData.getRoot().getMappedAttribute(
772	BugzillaAttribute.COMPONENT.getKey());
773	for (BugzillaFlag bugzillaFlag : flags) {
774	if (!bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
775	continue;
776	}
777	if (!bugzillaFlag.isUsedIn(productAttribute.getValue(), componentAttribute.getValue())) {
778	continue;
779	}
780	if (existingFlags.contains(bugzillaFlag.getName()) && !bugzillaFlag.isMultiplicable()) {
781	continue;
782	}
783	BugzillaFlagMapper mapper = new BugzillaFlagMapper();
784	mapper.setRequestee(""); //$NON-NLS-1$
785	mapper.setSetter(""); //$NON-NLS-1$
786	mapper.setState(" "); //$NON-NLS-1$
787	mapper.setFlagId(bugzillaFlag.getName());
788	mapper.setNumber(0);
789	mapper.setDescription(bugzillaFlag.getDescription());
790	TaskAttribute newattribute = attribute.createAttribute("task.common.kind.flag_type" + bugzillaFlag.getFlagId()); //$NON-NLS-1$
791	mapper.applyTo(newattribute);
792	}
793	}
794
795	}
796
700	}	797	}




BugzillaAttachmentMapper_Author=Attachment Author:
BugzillaAttachmentMapper_Content_Type=Content Type:
BugzillaAttachmentMapper_Creation_Date=Creation Date:
BugzillaAttachmentMapper_Description=Description:
BugzillaAttachmentMapper_Filename=Filename:
BugzillaAttachmentMapper_obsolate=obsolete
BugzillaAttachmentMapper_patch=patch
BugzillaAttachmentMapper_Size=Size in Bytes:
BugzillaAttachmentMapper_Token=Token:
BugzillaAttachmentMapper_URL=URL:
BugzillaAttribute_Add=Add:
BugzillaAttribute_Add_CC=Add CC:
BugzillaAttribute_Add_self_to_CC=Add self to CC

Lines 18-24 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java (-4 / +20 lines)
18	import java.util.Map;	18	import java.util.Map;
19		19
20	import org.eclipse.mylyn.tasks.core.IRepositoryPerson;	20	import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
21	import org.eclipse.mylyn.tasks.core.data.TaskAttachmentMapper;
22	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;	21	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
23	import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;	22	import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
24	import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;	23	import org.eclipse.mylyn.tasks.core.data.TaskCommentMapper;
Lines 50-56 Link Here
50		49
51	private int commentNum = 0;	50	private int commentNum = 0;
52		51
53	private TaskAttachmentMapper attachment;	52	private BugzillaAttachmentMapper attachment;
54		53
55	private final Map<String, TaskData> taskDataMap;	54	private final Map<String, TaskData> taskDataMap;
56		55
Lines 68-73 Link Here
68		67
69	private boolean isPatch = false;	68	private boolean isPatch = false;
70		69
		70	private String token;
		71
71	private TaskAttribute attachmentAttribute;	72	private TaskAttribute attachmentAttribute;
72		73
73	public SaxMultiBugReportContentHandler(TaskAttributeMapper mapper, TaskDataCollector collector,	74	public SaxMultiBugReportContentHandler(TaskAttributeMapper mapper, TaskDataCollector collector,
Lines 119-124 Link Here
119	commentNum = 0;	120	commentNum = 0;
120	taskComment = null;	121	taskComment = null;
121	longDescs = new ArrayList<TaskComment>();	122	longDescs = new ArrayList<TaskComment>();
		123	token = null;
122	break;	124	break;
123	case LONG_DESC:	125	case LONG_DESC:
124	taskComment = new TaskComment(commentNum++);	126	taskComment = new TaskComment(commentNum++);
Lines 325-335 Link Here
325	case ATTACHID:	327	case ATTACHID:
326	attachmentAttribute = repositoryTaskData.getRoot().createAttribute(	328	attachmentAttribute = repositoryTaskData.getRoot().createAttribute(
327	TaskAttribute.PREFIX_ATTACHMENT + parsedText);	329	TaskAttribute.PREFIX_ATTACHMENT + parsedText);
328	attachment = TaskAttachmentMapper.createFrom(attachmentAttribute);	330	attachment = BugzillaAttachmentMapper.createFrom(attachmentAttribute);
329	attachment.setLength(new Long(-1));	331	attachment.setLength(new Long(-1));
330	attachment.setAttachmentId(parsedText);	332	attachment.setAttachmentId(parsedText);
331	attachment.setPatch(isPatch);	333	attachment.setPatch(isPatch);
332	attachment.setDeprecated(isDeprecated);	334	attachment.setDeprecated(isDeprecated);
		335	attachment.setToken(null);
333	break;	336	break;
334	case DATE:	337	case DATE:
335	// ignore	338	// ignore
Lines 397-402 Link Here
397		400
398	updateCustomFields(repositoryTaskData);	401	updateCustomFields(repositoryTaskData);
399		402
		403	if (token != null) {
		404	TaskAttribute tokenAttribute = BugzillaTaskDataHandler.createAttribute(repositoryTaskData,
		405	BugzillaAttribute.TOKEN);
		406	tokenAttribute.setValue(token);
		407	}
		408
400	// Guard against empty data sets	409	// Guard against empty data sets
401	if (attrCreation != null && !attrCreation.equals("")) { //$NON-NLS-1$	410	if (attrCreation != null && !attrCreation.equals("")) { //$NON-NLS-1$
402	collector.accept(repositoryTaskData);	411	collector.accept(repositoryTaskData);
Lines 422-427 Link Here
422	case FLAG:	431	case FLAG:
423	//ignore	432	//ignore
424	break;	433	break;
		434	case TOKEN:
		435	if (attachment != null) {
		436	attachment.setToken(parsedText);
		437	} else {
		438	token = parsedText;
		439	}
		440	break;
425	default:	441	default:
426	TaskAttribute defaultAttribute = repositoryTaskData.getRoot().getMappedAttribute(tag.getKey());	442	TaskAttribute defaultAttribute = repositoryTaskData.getRoot().getMappedAttribute(tag.getKey());
427	if (defaultAttribute == null) {	443	if (defaultAttribute == null) {
Lines 485-491 Link Here
485	List<TaskAttribute> taskAttachments = repositoryTaskData.getAttributeMapper().getAttributesByType(	501	List<TaskAttribute> taskAttachments = repositoryTaskData.getAttributeMapper().getAttributesByType(
486	repositoryTaskData, TaskAttribute.TYPE_ATTACHMENT);	502	repositoryTaskData, TaskAttribute.TYPE_ATTACHMENT);
487	for (TaskAttribute attachment : taskAttachments) {	503	for (TaskAttribute attachment : taskAttachments) {
488	TaskAttachmentMapper attachmentMapper = TaskAttachmentMapper.createFrom(attachment);	504	BugzillaAttachmentMapper attachmentMapper = BugzillaAttachmentMapper.createFrom(attachment);
489	TaskCommentMapper taskComment = attachIdToComment.get(attachmentMapper.getAttachmentId());	505	TaskCommentMapper taskComment = attachIdToComment.get(attachmentMapper.getAttachmentId());
490	if (taskComment != null) {	506	if (taskComment != null) {
491	attachmentMapper.setAuthor(taskComment.getAuthor());	507	attachmentMapper.setAuthor(taskComment.getAuthor());




		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
	}

	public static String BugzillaAttachmentMapper_Author;

	public static String BugzillaAttachmentMapper_Content_Type;

	public static String BugzillaAttachmentMapper_Creation_Date;

	public static String BugzillaAttachmentMapper_Description;

	public static String BugzillaAttachmentMapper_Filename;

	public static String BugzillaAttachmentMapper_obsolate;

	public static String BugzillaAttachmentMapper_patch;

	public static String BugzillaAttachmentMapper_Size;

	public static String BugzillaAttachmentMapper_Token;

	public static String BugzillaAttachmentMapper_URL;

	public static String BugzillaAttribute_Add;

	public static String BugzillaAttribute_Add_CC;




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.bugzilla.core;

import org.eclipse.core.runtime.Assert;
import org.eclipse.mylyn.tasks.core.data.TaskAttachmentMapper;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
import org.eclipse.mylyn.tasks.core.data.TaskData;

public class BugzillaAttachmentMapper extends TaskAttachmentMapper {
	private String token;

	public String getToken() {
		return token;
	}

	public void setToken(String token) {
		this.token = token;
	}

	@Override
	public void applyTo(TaskAttribute taskAttribute) {
		Assert.isNotNull(taskAttribute);
		TaskData taskData = taskAttribute.getTaskData();
		TaskAttributeMapper mapper = taskData.getAttributeMapper();
		taskAttribute.getMetaData().defaults().setType(TaskAttribute.TYPE_ATTACHMENT);
		if (getAttachmentId() != null) {
			mapper.setValue(taskAttribute, getAttachmentId());
		}
		if (getAuthor() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_AUTHOR);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_PERSON);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Author);
			mapper.setRepositoryPerson(child, getAuthor());
		}
		if (getContentType() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Content_Type);
			mapper.setValue(child, getContentType());
		}
		if (getCreationDate() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_DATE);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_DATE);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Creation_Date);
			mapper.setDateValue(child, getCreationDate());
		}
		if (getDescription() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Description);
			mapper.setValue(child, getDescription());
		}
		if (getFileName() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Filename);
			mapper.setValue(child, getFileName());
		}
		if (isDeprecated() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_BOOLEAN);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_obsolate);
			mapper.setBooleanValue(child, isDeprecated());
		}
		if (isPatch() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_BOOLEAN);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_patch);
			mapper.setBooleanValue(child, isPatch());
		}
		if (getLength() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_SIZE);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Size);
			mapper.setLongValue(child, getLength());
		}
		if (getUrl() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_URL);
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_URL);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_URL);
			mapper.setValue(child, getUrl());
		}
		if (getToken() != null) {
			TaskAttribute child = taskAttribute.createMappedAttribute(BugzillaAttribute.TOKEN.getKey());
			TaskAttributeMetaData defaults = child.getMetaData().defaults();
			defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
			defaults.setLabel(Messages.BugzillaAttachmentMapper_Token);
			mapper.setValue(child, getToken());
		}
	}

	public static BugzillaAttachmentMapper createFrom(TaskAttribute taskAttribute) {
		Assert.isNotNull(taskAttribute);
		TaskAttributeMapper mapper = taskAttribute.getTaskData().getAttributeMapper();
		BugzillaAttachmentMapper attachment = new BugzillaAttachmentMapper();
		attachment.setAttachmentId(mapper.getValue(taskAttribute));
		TaskAttribute child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_AUTHOR);
		if (child != null) {
			attachment.setAuthor(mapper.getRepositoryPerson(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE);
		if (child != null) {
			attachment.setContentType(mapper.getValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_DATE);
		if (child != null) {
			attachment.setCreationDate(mapper.getDateValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION);
		if (child != null) {
			attachment.setDescription(mapper.getValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME);
		if (child != null) {
			attachment.setFileName(mapper.getValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED);
		if (child != null) {
			attachment.setDeprecated(mapper.getBooleanValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH);
		if (child != null) {
			attachment.setPatch(mapper.getBooleanValue(child));
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_SIZE);
		if (child != null) {
			Long value = mapper.getLongValue(child);
			if (value != null) {
				attachment.setLength(value);
			}
		}
		child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_URL);
		if (child != null) {
			attachment.setUrl(mapper.getValue(child));
		}
		child = taskAttribute.getMappedAttribute(BugzillaAttribute.TOKEN.getKey());
		if (child != null) {
			attachment.setToken(mapper.getValue(child));
		}
		return attachment;
	}

}

Lines 157-163 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskAttachmentPage.java (-1 / +1 lines)
157	\| ExpandableComposite.TWISTIE \| ExpandableComposite.TITLE_BAR);	157	\| ExpandableComposite.TWISTIE \| ExpandableComposite.TITLE_BAR);
158	flagExpandComposite.setFont(container.getFont());	158	flagExpandComposite.setFont(container.getFont());
159	flagExpandComposite.setBackground(container.getBackground());	159	flagExpandComposite.setBackground(container.getBackground());
160	flagExpandComposite.setText(Messages.BugzillaTaskAttachmentPage_flags);	160	flagExpandComposite.setText(Messages.BugzillaTaskAttachmentPage_Advanced);
161	flagExpandComposite.setLayout(new GridLayout(3, false));	161	flagExpandComposite.setLayout(new GridLayout(3, false));
162	GridData g = new GridData(GridData.FILL_HORIZONTAL);	162	GridData g = new GridData(GridData.FILL_HORIZONTAL);
163	g.horizontalSpan = 3;	163	g.horizontalSpan = 3;

Lines 1-3 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties (-1 / +3 lines)
		1	BugzillaAttachmentDialog_DetailTitle=Attachment Detail of {0}
		2	BugzillaAttachmentDialog_UpdateTitle=Update of Attachment {0}
1	BugzillaConnectorUi__In_reply_to_comment_X_=(In reply to comment \#{0})	3	BugzillaConnectorUi__In_reply_to_comment_X_=(In reply to comment \#{0})
2	BugzillaConnectorUi__In_reply_to_X_comment_X_=(In reply to {0} comment \#{1})	4	BugzillaConnectorUi__In_reply_to_X_comment_X_=(In reply to {0} comment \#{1})
3	BugzillaConnectorUi__In_reply_to_comment_0_=(In reply to comment \#0)	5	BugzillaConnectorUi__In_reply_to_comment_0_=(In reply to comment \#0)
Lines 28-31 Link Here
28	BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.	30	BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.
29	BugzillaRepositorySettingsPage_supports_bugzilla_X=Supports Bugzilla {0}	31	BugzillaRepositorySettingsPage_supports_bugzilla_X=Supports Bugzilla {0}
30	BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings	32	BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings
31	BugzillaTaskAttachmentPage_flags=Flags	33	BugzillaTaskAttachmentPage_Advanced=Advanced

Lines 25-30 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java (-1 / +5 lines)
25	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	25	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
26	}	26	}
27		27
		28	public static String BugzillaAttachmentDialog_DetailTitle;
		29
		30	public static String BugzillaAttachmentDialog_UpdateTitle;
		31
28	public static String BugzillaConnectorUi__In_reply_to_comment_X_;	32	public static String BugzillaConnectorUi__In_reply_to_comment_X_;
29		33
30	public static String BugzillaConnectorUi__In_reply_to_X_comment_X_;	34	public static String BugzillaConnectorUi__In_reply_to_X_comment_X_;
Lines 79-83 Link Here
79		83
80	public static String BugzillaRepositorySettingsPage_Validating_server_settings;	84	public static String BugzillaRepositorySettingsPage_Validating_server_settings;
81		85
82	public static String BugzillaTaskAttachmentPage_flags;	86	public static String BugzillaTaskAttachmentPage_Advanced;
83	}	87	}




               menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"
               tooltip="Mark attachment as obsolete">
         </action>
           <action
               class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentDetailAction"
               enablesFor="*"
               id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.detail"
               label="Detail..."
               menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
               tooltip="Show Details">
         </action>
           <action
               class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentUpdateAction"
               enablesFor="*"
               id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.update"
               label="Update..."
               menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
               tooltip="Update Attachment">
         </action>
          <menu
                id="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
                label="Mark as"

Lines 1-3 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/messages.properties (+1 lines)
		1	BugzillaAttachmentUpdateAction_Comment=Comment :
1	BugzillaUpdateAttachmentAction_mark_not_obsolete=Mark not obsolete	2	BugzillaUpdateAttachmentAction_mark_not_obsolete=Mark not obsolete
2	BugzillaUpdateAttachmentAction_mark_obsolete=Mark obsolete	3	BugzillaUpdateAttachmentAction_mark_obsolete=Mark obsolete
3	UpdateAttachmentJob_obsolete_not_toggled=Obsolete not toggled successful	4	UpdateAttachmentJob_obsolete_not_toggled=Obsolete not toggled successful

Lines 25-30 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/Messages.java (+2 lines)
25	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	25	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
26	}	26	}
27		27
		28	public static String BugzillaAttachmentUpdateAction_Comment;
		29
28	public static String BugzillaUpdateAttachmentAction_mark_not_obsolete;	30	public static String BugzillaUpdateAttachmentAction_mark_not_obsolete;
29		31
30	public static String BugzillaUpdateAttachmentAction_mark_obsolete;	32	public static String BugzillaUpdateAttachmentAction_mark_obsolete;




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.bugzilla.ui.action;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.mylyn.tasks.core.ITaskAttachment;
import org.eclipse.mylyn.tasks.ui.TasksUi;
import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.editor.IFormPage;
import org.eclipse.ui.forms.widgets.Section;

/**
 * @author Frank Becker
 */
@SuppressWarnings("restriction")
public class ChangeAttachmentJob extends Job {

	private final ITaskAttachment attachment;

	private final TaskEditor editor;

	private IStatus error;

	public ChangeAttachmentJob(ITaskAttachment attachment, TaskEditor editor) {
		super(Messages.UpdateAttachmentJob_update_attachment);
		this.attachment = attachment;
		this.editor = editor;
	}

	public IStatus getError() {
		return error;
	}

	@Override
	protected IStatus run(IProgressMonitor monitor) {
		final ITask task;
		task = editor.getTaskEditorInput().getTask();

		if (!task.getConnectorKind().equals(BugzillaCorePlugin.CONNECTOR_KIND)) {
			return Status.OK_STATUS;
		}
		AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
				task.getConnectorKind());
		monitor.beginTask(Messages.UpdateAttachmentJob_update_attachments, 20);
		try {
			((BugzillaTaskDataHandler) connector.getTaskDataHandler()).postUpdateAttachment(
					attachment.getTaskRepository(), attachment.getTaskAttribute(), "update", monitor); //$NON-NLS-1$
			monitor.worked(10);

			if (attachment != null) {
				if (connector != null) {
					TasksUiInternal.synchronizeTask(connector, task, true, new JobChangeAdapter() {
						@Override
						public void done(IJobChangeEvent event) {
							PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
								public void run() {
									try {
										if (editor != null) {
											editor.refreshPages();
											editor.getEditorSite().getPage().activate(editor);
											IFormPage formPage = editor.getActivePageInstance();
											if (formPage instanceof BugzillaTaskEditorPage) {
												BugzillaTaskEditorPage bugzillaPage = (BugzillaTaskEditorPage) formPage;
												Control control = bugzillaPage.getPart(
														AbstractTaskEditorPage.ID_PART_ATTACHMENTS).getControl();
												if (control instanceof Section) {
													Section section = (Section) control;
													EditorUtil.toggleExpandableComposite(true, section);
												}
											}

										}
									} finally {
										if (editor != null) {
											editor.showBusy(false);
										}
									}
								}
							});
						}
					});
				}
				monitor.worked(10);
				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
					public void run() {
						if (editor != null) {
							editor.showBusy(true);
						}
					}
				});
			}
		} catch (OperationCanceledException e) {
			return Status.CANCEL_STATUS;
		} catch (CoreException e) {
			StatusHandler.log(new Status(IStatus.ERROR, ITasksCoreConstants.ID_PLUGIN,
					"Update of an Attachment failed", e)); //$NON-NLS-1$
			e.printStackTrace();
		} finally {
			monitor.done();
		}
		return Status.OK_STATUS;
	}
}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.bugzilla.ui.action;

import java.util.List;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.internal.bugzilla.ui.dialogs.BugzillaAttachmentDialog;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.FlagAttributeEditor;
import org.eclipse.mylyn.internal.tasks.core.TaskTask;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.mylyn.tasks.core.ITaskAttachment;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.core.data.ITaskDataWorkingCopy;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
import org.eclipse.mylyn.tasks.ui.TasksUi;
import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
import org.eclipse.mylyn.tasks.ui.editors.AttributeEditorFactory;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
import org.eclipse.ui.forms.editor.IFormPage;

@SuppressWarnings("restriction")
public class BugzillaAttachmentUpdateAction extends BaseSelectionListenerAction implements IViewActionDelegate {

	private ISelection currentSelection;

	public BugzillaAttachmentUpdateAction() {
		super("BugzillaAttachmentDetailAction"); //$NON-NLS-1$
	}

	public void init(IViewPart view) {
		// ignore

	}

	public void run(IAction action) {
		IStructuredSelection selection = null;
		if (currentSelection instanceof IStructuredSelection) {
			selection = (IStructuredSelection) currentSelection;
		}
		if (selection == null || selection.isEmpty() || selection.size() != 1) {
			return;
		}
		ITaskAttachment attachment = (ITaskAttachment) selection.getFirstElement();
		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
		IWorkbenchPage page = window.getActivePage();
		IEditorPart activeEditor = page.getActiveEditor();
		IWorkbenchPartSite site = activeEditor.getSite();
		Shell shell = site.getShell();
		if (activeEditor instanceof TaskEditor) {
			final TaskEditor taskEditor = (TaskEditor) activeEditor;
			IFormPage taskEditorPage = taskEditor.findPage("id"); //$NON-NLS-1$
			if (taskEditorPage instanceof BugzillaTaskEditorPage) {
				BugzillaTaskEditorPage bugzillaTaskEditorPage = (BugzillaTaskEditorPage) taskEditorPage;

				ITask attachmentTask = attachment.getTask();
				ITask nTask = new TaskTask(attachmentTask.getConnectorKind(), attachmentTask.getRepositoryUrl(),
						attachmentTask.getTaskId() + "attachment"); //$NON-NLS-1$

				TaskData editTaskData = new TaskData(attachment.getTaskAttribute().getTaskData().getAttributeMapper(),
						attachment.getTaskAttribute().getTaskData().getConnectorKind(), attachment.getTaskAttribute()
								.getTaskData()
								.getRepositoryUrl(), attachment.getTaskAttribute().getTaskData().getTaskId());
				editTaskData.setVersion(attachment.getTaskAttribute().getTaskData().getVersion());
				TaskAttribute target0 = editTaskData.getRoot();
				TaskAttribute temp = attachment.getTaskAttribute();
				target0.setValues(temp.getValues());
				for (TaskAttribute child : temp.getAttributes().values()) {
					target0.deepAddCopy(child);
				}

				TaskAttribute comment = target0.createAttribute("comment"); //$NON-NLS-1$
				TaskAttributeMetaData commentMeta = comment.getMetaData();
				commentMeta.setType(TaskAttribute.TYPE_LONG_RICH_TEXT);
				commentMeta.setLabel(Messages.BugzillaAttachmentUpdateAction_Comment);

				ITaskDataWorkingCopy workingCopy = TasksUi.getTaskDataManager().createWorkingCopy(nTask, editTaskData);
				try {
					workingCopy.save(null, null);
				} catch (CoreException e) {
					// TODO Auto-generated catch block
					e.printStackTrace();
				}
				TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
						attachment.getTaskAttribute().getTaskData().getRepositoryUrl());
				final TaskDataModel model = new TaskDataModel(repository, nTask, workingCopy);
				AttributeEditorFactory factory = new AttributeEditorFactory(model, repository,
						bugzillaTaskEditorPage.getEditorSite()) {
					@Override
					public AbstractAttributeEditor createEditor(String type, final TaskAttribute taskAttribute) {
						AbstractAttributeEditor editor;
						if (IBugzillaConstants.EDITOR_TYPE_FLAG.equals(type)) {
							editor = new FlagAttributeEditor(model, taskAttribute);
						} else {
							editor = super.createEditor(type, taskAttribute);
							if (TaskAttribute.TYPE_BOOLEAN.equals(type)) {
								editor.setDecorationEnabled(false);
							}
						}
						return editor;
					}
				};

				TaskAttribute target = workingCopy.getLocalData().getRoot();
				BugzillaAttachmentDialog dialog = new BugzillaAttachmentDialog(shell, bugzillaTaskEditorPage, factory,
						target, false);
				if (dialog.open() == Window.OK) {
					TaskAttribute attachmentAttribute = attachment.getTaskAttribute();
					for (TaskAttribute child : target.getAttributes().values()) {
						attachmentAttribute.deepAddCopy(child);
					}
					final ChangeAttachmentJob job = new ChangeAttachmentJob(attachment, taskEditor);
					job.setUser(true);
					job.addJobChangeListener(new JobChangeAdapter() {

						@Override
						public void done(IJobChangeEvent event) {
							IFormPage formPage = taskEditor.getActivePageInstance();
							if (formPage instanceof BugzillaTaskEditorPage) {
								final BugzillaTaskEditorPage bugzillaPage = (BugzillaTaskEditorPage) formPage;
								if (job.getError() != null) {
									PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
										public void run() {
											bugzillaPage.getTaskEditor().setMessage(job.getError().getMessage(),
													IMessageProvider.ERROR);
										}
									});
								} else {
									PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
										public void run() {
											bugzillaPage.refreshFormContent();
										}
									});
								}
							}
						}
					});
					job.schedule();
				}
			}
		}
	}

	@SuppressWarnings("unchecked")
	public void selectionChanged(IAction action, ISelection selection) {
		this.currentSelection = selection;
		IStructuredSelection sructuredSelection = null;
		if (selection instanceof IStructuredSelection) {
			sructuredSelection = (IStructuredSelection) currentSelection;
		}
		if (sructuredSelection == null || sructuredSelection.isEmpty()) {
			return;
		}
		List<ITaskAttachment> attachmentList = sructuredSelection.toList();
		if (attachmentList != null && attachmentList.size() == 1) {
			action.setEnabled(true);
		} else {
			action.setEnabled(false);
		}

	}

}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.bugzilla.ui.action;

import java.util.List;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mylyn.internal.bugzilla.ui.dialogs.BugzillaAttachmentDialog;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
import org.eclipse.mylyn.tasks.core.ITaskAttachment;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
import org.eclipse.ui.forms.editor.IFormPage;

public class BugzillaAttachmentDetailAction extends BaseSelectionListenerAction implements IViewActionDelegate {

	private ISelection currentSelection;

	public BugzillaAttachmentDetailAction() {
		super("BugzillaAttachmentDetailAction"); //$NON-NLS-1$
	}

	public void init(IViewPart view) {
		// ignore

	}

	public void run(IAction action) {
		IStructuredSelection selection = null;
		if (currentSelection instanceof IStructuredSelection) {
			selection = (IStructuredSelection) currentSelection;
		}
		if (selection == null || selection.isEmpty() || selection.size() != 1) {
			return;
		}
		ITaskAttachment attachment = (ITaskAttachment) selection.getFirstElement();
		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
		IWorkbenchPage page = window.getActivePage();
		IEditorPart activeEditor = page.getActiveEditor();
		IWorkbenchPartSite site = activeEditor.getSite();
		Shell shell = site.getShell();
		if (activeEditor instanceof TaskEditor) {
			final TaskEditor taskEditor = (TaskEditor) activeEditor;
			IFormPage taskEditorPage = taskEditor.findPage("id"); //$NON-NLS-1$
			if (taskEditorPage instanceof BugzillaTaskEditorPage) {
				BugzillaTaskEditorPage bugzillaTaskEditorPage = (BugzillaTaskEditorPage) taskEditorPage;
				BugzillaAttachmentDialog dialog = new BugzillaAttachmentDialog(shell, bugzillaTaskEditorPage,
						bugzillaTaskEditorPage.getAttributeEditorFactory(), attachment.getTaskAttribute(), true);
				dialog.open();
			}
		}
	}

	@SuppressWarnings("unchecked")
	public void selectionChanged(IAction action, ISelection selection) {
		this.currentSelection = selection;
		IStructuredSelection sructuredSelection = null;
		if (selection instanceof IStructuredSelection) {
			sructuredSelection = (IStructuredSelection) currentSelection;
		}
		if (sructuredSelection == null || sructuredSelection.isEmpty()) {
			return;
		}
		List<ITaskAttachment> attachmentList = sructuredSelection.toList();
		if (attachmentList != null && attachmentList.size() == 1) {
			action.setEnabled(true);
		} else {
			action.setEnabled(false);
		}

	}

}




/*******************************************************************************
 * Copyright (c) 2004, 2008 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.bugzilla.ui.dialogs;

import java.text.MessageFormat;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
import org.eclipse.mylyn.internal.bugzilla.ui.tasklist.Messages;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
import org.eclipse.mylyn.tasks.ui.editors.AttributeEditorFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.SelectionDialog;
import org.eclipse.ui.forms.events.ExpansionAdapter;
import org.eclipse.ui.forms.events.ExpansionEvent;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;

/**
 * 
 * @author Frank Becker
 */
public class BugzillaAttachmentDialog extends SelectionDialog {

	private final FormToolkit toolkit;

	private Composite scrollComposite;

	private ExpandableComposite flagExpandComposite = null;

	private final TaskAttribute attachment;

	private final Shell parentShell;

	private final boolean readOnly;

	private final AttributeEditorFactory attributeEditorFactory;

	private static final int LABEL_WIDTH = 120;

	private static final int COLUMN_GAP = 5;

	private static final int MULTI_ROW_HEIGHT = 55;

	private static final int COLUMN_WIDTH = 200;

	private static final int MULTI_COLUMN_WIDTH = COLUMN_WIDTH + 5 + COLUMN_GAP + LABEL_WIDTH + 5 + COLUMN_WIDTH;

	public BugzillaAttachmentDialog(Shell parentShell, BugzillaTaskEditorPage editor, AttributeEditorFactory factory,
			TaskAttribute attachment, boolean readonly) {
		super(parentShell);
		this.attachment = attachment;
		this.parentShell = parentShell;
		this.readOnly = readonly;
		attributeEditorFactory = factory;
		toolkit = new FormToolkit(Display.getCurrent());
		this.setTitle(MessageFormat.format(readonly ? Messages.BugzillaAttachmentDialog_DetailTitle
				: Messages.BugzillaAttachmentDialog_UpdateTitle, attachment.getValue()));
	}

	@Override
	protected Control createDialogArea(Composite parent) {
		int currentColumn = 1;
		int columnCount = 4;
		Composite composite = (Composite) super.createDialogArea(parent);

		initializeDialogUnits(composite);

		Composite attributeArea = new Composite(composite, SWT.FLAT);
		attributeArea.setLayout(new GridLayout(4, false));
		createAttributeEditors(currentColumn, columnCount, attributeArea);
		Composite advancedComposite = createFlagSection(attributeArea);
		createFlagEditors(columnCount, advancedComposite);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_URL), currentColumn, columnCount,
				advancedComposite);
		createCommntEditor(currentColumn, columnCount, attributeArea);
		Dialog.applyDialogFont(composite);
		return composite;
	}

	private void createAttributeEditor(TaskAttribute attribute, int currentColumn, int columnCount,
			Composite attributeArea) {
		String type = attribute.getMetaData().getType();
		if (type != null) {
			AbstractAttributeEditor editor = attributeEditorFactory.createEditor(type, attribute);
			if (attribute.getId().equals(BugzillaAttribute.TOKEN.getKey())
					|| attribute.getId().equals("size") || attribute.getId().equals(TaskAttribute.ATTACHMENT_URL)) { //$NON-NLS-1$
				editor.setReadOnly(true);
			} else {
				editor.setReadOnly(readOnly);
			}
			if (editor.hasLabel()) {
				editor.createLabelControl(attributeArea, toolkit);
				Label label = editor.getLabelControl();
				label.setBackground(attributeArea.getBackground());
				String labelString = editor.getLabel();
				if (labelString != null && !labelString.equals("")) { //$NON-NLS-1$
					GridData gd = GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(LABEL_WIDTH,
							SWT.DEFAULT).create();
					if (currentColumn > 1) {
						gd.horizontalIndent = COLUMN_GAP;
						gd.widthHint = LABEL_WIDTH + COLUMN_GAP;
					}
					label.setLayoutData(gd);
					currentColumn++;
				}
			}
			editor.createControl(attributeArea, toolkit);
			GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
			if (type.equals("shortText") || type.equals("url")) { //$NON-NLS-1$//$NON-NLS-2$
				gd.horizontalSpan = 3;
			} else {
				gd.horizontalSpan = 1;
			}
			editor.getControl().setLayoutData(gd);
			if (attribute.getId().equals(TaskAttribute.ATTACHMENT_URL)) {
				editor.getControl().setEnabled(false);
			}

			currentColumn += gd.horizontalSpan;
			currentColumn %= columnCount;
		}
	}

	private void createAttributeEditors(int currentColumn, int columnCount, Composite attributeArea) {
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION), currentColumn,
				columnCount, attributeArea);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME), currentColumn,
				columnCount, attributeArea);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_SIZE), currentColumn, columnCount,
				attributeArea);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE), currentColumn,
				columnCount, attributeArea);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH), currentColumn,
				columnCount, attributeArea);
		createAttributeEditor(attachment.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED), currentColumn,
				columnCount, attributeArea);
	}

	private void createFlagEditors(int columnCount, Composite advancedComposite) {
		int currentFlagColumn = 1;

		for (TaskAttribute attribute : attachment.getAttributes().values()) {
			if (!attribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
				continue;
			}
			String type = attribute.getMetaData().getType();
			if (type != null) {
				AbstractAttributeEditor editor = attributeEditorFactory.createEditor(type, attribute);
				editor.setReadOnly(readOnly);

				if (editor.hasLabel()) {
					editor.createLabelControl(advancedComposite, toolkit);
					Label label = editor.getLabelControl();
					label.setBackground(advancedComposite.getBackground());
					GridData gd = GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(LABEL_WIDTH,
							SWT.DEFAULT).create();
					if (currentFlagColumn > 1) {
						gd.horizontalIndent = COLUMN_GAP;
						gd.widthHint = LABEL_WIDTH + COLUMN_GAP;
					}
					label.setLayoutData(gd);
					currentFlagColumn++;
				}
				editor.createControl(advancedComposite, toolkit);
				GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
				gd.widthHint = 150;//COLUMN_WIDTH;
				gd.horizontalSpan = 3;
				editor.getControl().setLayoutData(gd);
				currentFlagColumn += gd.horizontalSpan;
				currentFlagColumn %= columnCount;
			}
		}
	}

	private void createCommntEditor(int currentColumn, int columnCount, Composite attributeArea) {
		TaskAttribute commentAttribute = attachment.getAttribute("comment"); //$NON-NLS-1$
		if (commentAttribute == null || readOnly) {
			return;
		}
		String type = commentAttribute.getMetaData().getType();
		if (type != null) {
			AbstractAttributeEditor editor = attributeEditorFactory.createEditor(type, commentAttribute);
			String labelString = editor.getLabel();
			if (editor.hasLabel()) {
				editor.createLabelControl(attributeArea, toolkit);
				if (!labelString.equals("")) { //$NON-NLS-1$
					Label label = editor.getLabelControl();
					label.setBackground(attributeArea.getBackground());
					GridData gd = GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(LABEL_WIDTH,
							SWT.DEFAULT).create();
					if (currentColumn > 1) {
						gd.horizontalIndent = COLUMN_GAP;
						gd.widthHint = LABEL_WIDTH + COLUMN_GAP;
					}
					label.setLayoutData(gd);
				}
			}
			editor.createControl(attributeArea, toolkit);
			GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
			gd.heightHint = MULTI_ROW_HEIGHT;
			gd.widthHint = MULTI_COLUMN_WIDTH;
			gd.horizontalSpan = columnCount - currentColumn + 1;
			editor.getControl().setLayoutData(gd);
		}
	}

	private Composite createFlagSection(Composite container) {
		flagExpandComposite = toolkit.createExpandableComposite(container, ExpandableComposite.COMPACT
				| ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
		flagExpandComposite.setFont(container.getFont());
		flagExpandComposite.setBackground(container.getBackground());
		flagExpandComposite.setText(Messages.BugzillaTaskAttachmentPage_Advanced);
		flagExpandComposite.setLayout(new GridLayout(4, false));
		GridData g = new GridData(GridData.FILL_HORIZONTAL);
		g.horizontalSpan = 4;
		flagExpandComposite.setLayoutData(g);
		flagExpandComposite.addExpansionListener(new ExpansionAdapter() {
			@Override
			public void expansionStateChanged(ExpansionEvent e) {
				parentShell.getDisplay().getActiveShell().pack();
			}
		});

		scrollComposite = new Composite(flagExpandComposite, SWT.NONE);
		scrollComposite.setLayout(new GridLayout(4, false));
		flagExpandComposite.setClient(scrollComposite);
		return scrollComposite;
	}

}

Return to bug 272207

Lines 1-3 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties (+10 lines)
		1	BugzillaAttachmentMapper_Author=Attachment Author:
		2	BugzillaAttachmentMapper_Content_Type=Content Type:
		3	BugzillaAttachmentMapper_Creation_Date=Creation Date:
		4	BugzillaAttachmentMapper_Description=Description:
		5	BugzillaAttachmentMapper_Filename=Filename:
		6	BugzillaAttachmentMapper_obsolate=obsolete
		7	BugzillaAttachmentMapper_patch=patch
		8	BugzillaAttachmentMapper_Size=Size in Bytes:
		9	BugzillaAttachmentMapper_Token=Token:
		10	BugzillaAttachmentMapper_URL=URL:
1	BugzillaAttribute_Add=Add:	11	BugzillaAttribute_Add=Add:
2	BugzillaAttribute_Add_CC=Add CC:	12	BugzillaAttribute_Add_CC=Add CC:
3	BugzillaAttribute_Add_self_to_CC=Add self to CC	13	BugzillaAttribute_Add_self_to_CC=Add self to CC

Added Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentMapper.java (+164 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004, 2008 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.bugzilla.core;
13
14	import org.eclipse.core.runtime.Assert;
15	import org.eclipse.mylyn.tasks.core.data.TaskAttachmentMapper;
16	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
17	import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
18	import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
19	import org.eclipse.mylyn.tasks.core.data.TaskData;
20
21	public class BugzillaAttachmentMapper extends TaskAttachmentMapper {
22	private String token;
23
24	public String getToken() {
25	return token;
26	}
27
28	public void setToken(String token) {
29	this.token = token;
30	}
31
32	@Override
33	public void applyTo(TaskAttribute taskAttribute) {
34	Assert.isNotNull(taskAttribute);
35	TaskData taskData = taskAttribute.getTaskData();
36	TaskAttributeMapper mapper = taskData.getAttributeMapper();
37	taskAttribute.getMetaData().defaults().setType(TaskAttribute.TYPE_ATTACHMENT);
38	if (getAttachmentId() != null) {
39	mapper.setValue(taskAttribute, getAttachmentId());
40	}
41	if (getAuthor() != null) {
42	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_AUTHOR);
43	TaskAttributeMetaData defaults = child.getMetaData().defaults();
44	defaults.setType(TaskAttribute.TYPE_PERSON);
45	defaults.setLabel(Messages.BugzillaAttachmentMapper_Author);
46	mapper.setRepositoryPerson(child, getAuthor());
47	}
48	if (getContentType() != null) {
49	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE);
50	TaskAttributeMetaData defaults = child.getMetaData().defaults();
51	defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
52	defaults.setLabel(Messages.BugzillaAttachmentMapper_Content_Type);
53	mapper.setValue(child, getContentType());
54	}
55	if (getCreationDate() != null) {
56	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_DATE);
57	TaskAttributeMetaData defaults = child.getMetaData().defaults();
58	defaults.setType(TaskAttribute.TYPE_DATE);
59	defaults.setLabel(Messages.BugzillaAttachmentMapper_Creation_Date);
60	mapper.setDateValue(child, getCreationDate());
61	}
62	if (getDescription() != null) {
63	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION);
64	TaskAttributeMetaData defaults = child.getMetaData().defaults();
65	defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
66	defaults.setLabel(Messages.BugzillaAttachmentMapper_Description);
67	mapper.setValue(child, getDescription());
68	}
69	if (getFileName() != null) {
70	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME);
71	TaskAttributeMetaData defaults = child.getMetaData().defaults();
72	defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
73	defaults.setLabel(Messages.BugzillaAttachmentMapper_Filename);
74	mapper.setValue(child, getFileName());
75	}
76	if (isDeprecated() != null) {
77	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED);
78	TaskAttributeMetaData defaults = child.getMetaData().defaults();
79	defaults.setType(TaskAttribute.TYPE_BOOLEAN);
80	defaults.setLabel(Messages.BugzillaAttachmentMapper_obsolate);
81	mapper.setBooleanValue(child, isDeprecated());
82	}
83	if (isPatch() != null) {
84	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH);
85	TaskAttributeMetaData defaults = child.getMetaData().defaults();
86	defaults.setType(TaskAttribute.TYPE_BOOLEAN);
87	defaults.setLabel(Messages.BugzillaAttachmentMapper_patch);
88	mapper.setBooleanValue(child, isPatch());
89	}
90	if (getLength() != null) {
91	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_SIZE);
92	TaskAttributeMetaData defaults = child.getMetaData().defaults();
93	defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
94	defaults.setLabel(Messages.BugzillaAttachmentMapper_Size);
95	mapper.setLongValue(child, getLength());
96	}
97	if (getUrl() != null) {
98	TaskAttribute child = taskAttribute.createMappedAttribute(TaskAttribute.ATTACHMENT_URL);
99	TaskAttributeMetaData defaults = child.getMetaData().defaults();
100	defaults.setType(TaskAttribute.TYPE_URL);
101	defaults.setLabel(Messages.BugzillaAttachmentMapper_URL);
102	mapper.setValue(child, getUrl());
103	}
104	if (getToken() != null) {
105	TaskAttribute child = taskAttribute.createMappedAttribute(BugzillaAttribute.TOKEN.getKey());
106	TaskAttributeMetaData defaults = child.getMetaData().defaults();
107	defaults.setType(TaskAttribute.TYPE_SHORT_TEXT);
108	defaults.setLabel(Messages.BugzillaAttachmentMapper_Token);
109	mapper.setValue(child, getToken());
110	}
111	}
112
113	public static BugzillaAttachmentMapper createFrom(TaskAttribute taskAttribute) {
114	Assert.isNotNull(taskAttribute);
115	TaskAttributeMapper mapper = taskAttribute.getTaskData().getAttributeMapper();
116	BugzillaAttachmentMapper attachment = new BugzillaAttachmentMapper();
117	attachment.setAttachmentId(mapper.getValue(taskAttribute));
118	TaskAttribute child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_AUTHOR);
119	if (child != null) {
120	attachment.setAuthor(mapper.getRepositoryPerson(child));
121	}
122	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE);
123	if (child != null) {
124	attachment.setContentType(mapper.getValue(child));
125	}
126	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_DATE);
127	if (child != null) {
128	attachment.setCreationDate(mapper.getDateValue(child));
129	}
130	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION);
131	if (child != null) {
132	attachment.setDescription(mapper.getValue(child));
133	}
134	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME);
135	if (child != null) {
136	attachment.setFileName(mapper.getValue(child));
137	}
138	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED);
139	if (child != null) {
140	attachment.setDeprecated(mapper.getBooleanValue(child));
141	}
142	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH);
143	if (child != null) {
144	attachment.setPatch(mapper.getBooleanValue(child));
145	}
146	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_SIZE);
147	if (child != null) {
148	Long value = mapper.getLongValue(child);
149	if (value != null) {
150	attachment.setLength(value);
151	}
152	}
153	child = taskAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_URL);
154	if (child != null) {
155	attachment.setUrl(mapper.getValue(child));
156	}
157	child = taskAttribute.getMappedAttribute(BugzillaAttribute.TOKEN.getKey());
158	if (child != null) {
159	attachment.setToken(mapper.getValue(child));
160	}
161	return attachment;
162	}
163
164	}

Lines 94-99 Link Here

(-)plugin.xml (+16 lines)
94	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"	94	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"
95	tooltip="Mark attachment as obsolete">	95	tooltip="Mark attachment as obsolete">
96	</action>	96	</action>
		97	<action
		98	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentDetailAction"
		99	enablesFor="*"
		100	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.detail"
		101	label="Detail..."
		102	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
		103	tooltip="Show Details">
		104	</action>
		105	<action
		106	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentUpdateAction"
		107	enablesFor="*"
		108	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.update"
		109	label="Update..."
		110	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
		111	tooltip="Update Attachment">
		112	</action>
97	<menu	113	<menu
98	id="org.eclipse.mylyn.bugzilla.ui.attachments.mark"	114	id="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
99	label="Mark as"	115	label="Mark as"