Attachment #145341 for bug #272207

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 38-41 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties (-1 / +3 lines)
38	BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.	38	BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.
39	BugzillaRepositorySettingsPage_supports_bugzilla_X=Supports Bugzilla {0}	39	BugzillaRepositorySettingsPage_supports_bugzilla_X=Supports Bugzilla {0}
40	BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings	40	BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings
41	BugzillaTaskAttachmentPage_flags=Flags	41	BugzillaTaskAttachmentPage_Advanced=Advanced
		42	BugzillaAttachmentDialog_DetailTitle=Attachment Detail of {0}
		43	BugzillaAttachmentDialog_UpdateTitle=Update of Attachment {0}

Lines 79-83 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java (-1 / +5 lines)
79		79
80	public static String BugzillaRepositorySettingsPage_Validating_server_settings;	80	public static String BugzillaRepositorySettingsPage_Validating_server_settings;
81		81
82	public static String BugzillaTaskAttachmentPage_flags;	82	public static String BugzillaTaskAttachmentPage_Advanced;
		83
		84	public static String BugzillaAttachmentDialog_DetailTitle;
		85
		86	public static String BugzillaAttachmentDialog_UpdateTitle;
83	}	87	}




               menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"
               tooltip="Mark attachment as not obsolete">
         </action>
         <action
               class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaObsoleteAttachmentAction"
               enablesFor="*"
               id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.obsolete"

               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 10-12 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/messages.properties (+1 lines)
10	###############################################################################	10	###############################################################################
11	UpdateAttachmentJob_update_attachment=Update attachment	11	UpdateAttachmentJob_update_attachment=Update attachment
12	UpdateAttachmentJob_update_attachments=Update attachments	12	UpdateAttachmentJob_update_attachments=Update attachments
		13	BugzillaAttachmentUpdateAction_Comment=Comment :

Lines 29-32 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/Messages.java (+1 lines)
29		29
30	public static String UpdateAttachmentJob_update_attachment;	30	public static String UpdateAttachmentJob_update_attachment;
31		31
		32	public static String BugzillaAttachmentUpdateAction_Comment;
32	}	33	}




/*******************************************************************************
 * Copyright (c) 2009 Frank Becker 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:
 *     Frank Becker - 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.provisional.commons.ui.CommonFormUtil;
import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
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;
													CommonFormUtil.setExpanded(section, true);
												}
											}

										}
									} 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) 2009 Frank Becker 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:
 *     Frank Becker - 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;
	}

}

Lines 374-379 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java (+95 lines)
374	if (localuser) {	374	if (localuser) {
375	removeDomain(taskData);	375	removeDomain(taskData);
376	}	376	}
		377	addMissingAttachmentFlags(taskData);
		378	updateAttachmentOptions(taskData);
377	}	379	}
378	}	380	}
379		381
Lines 729-732 Link Here
729	public String getEncoding() {	731	public String getEncoding() {
730	return encoding;	732	return encoding;
731	}	733	}
		734
		735	public void updateAttachmentOptions(TaskData existingReport) {
		736	for (TaskAttribute attribute : new HashSet<TaskAttribute>(existingReport.getRoot().getAttributes().values())) {
		737
		738	if (!attribute.getId().startsWith("task.common.attachment")) { //$NON-NLS-1$
		739	continue;
		740	}
		741
		742	for (TaskAttribute attachmentAttribute : attribute.getAttributes().values()) {
		743	if (!attachmentAttribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
		744	continue;
		745	}
		746
		747	TaskAttribute state = attachmentAttribute.getAttribute("state"); //$NON-NLS-1$
		748	attachmentAttribute.clearOptions();
		749
		750	String nameValue = state.getMetaData().getLabel();
		751	state.putOption("", ""); //$NON-NLS-1$ //$NON-NLS-2$
		752	for (BugzillaFlag bugzillaFlag : flags) {
		753	if (nameValue.equals(bugzillaFlag.getName()) && bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
		754	if ("attachment".equals(bugzillaFlag.getType())) { //$NON-NLS-1$
		755	if (bugzillaFlag.isRequestable()) {
		756	state.putOption("?", "?"); //$NON-NLS-1$ //$NON-NLS-2$
		757	}
		758	break;
		759	}
		760	}
		761	}
		762	state.putOption("-", "-"); //$NON-NLS-1$ //$NON-NLS-2$
		763	state.putOption("+", "+"); //$NON-NLS-1$ //$NON-NLS-2$
		764	String flagNameValue = state.getMetaData().getLabel();
		765	for (BugzillaFlag bugzillaFlag : flags) {
		766	if (flagNameValue.equals(bugzillaFlag.getName()) && bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
		767	TaskAttribute requestee = attachmentAttribute.getAttribute("requestee"); //$NON-NLS-1$
		768	if (requestee == null) {
		769	requestee = attachmentAttribute.createMappedAttribute("requestee"); //$NON-NLS-1$
		770	requestee.getMetaData().defaults().setType(TaskAttribute.TYPE_SHORT_TEXT);
		771	requestee.setValue(""); //$NON-NLS-1$
		772	}
		773	requestee.getMetaData().setReadOnly(!bugzillaFlag.isSpecifically_requestable());
		774	}
		775	}
		776
		777	}
		778	}
		779	}
		780
		781	private void addMissingAttachmentFlags(TaskData taskData) {
		782	List<String> existingFlags = new ArrayList<String>();
		783	List<BugzillaFlag> flags = getFlags();
		784	for (TaskAttribute attribute : new HashSet<TaskAttribute>(taskData.getRoot().getAttributes().values())) {
		785
		786	if (!attribute.getId().startsWith("task.common.attachment")) { //$NON-NLS-1$
		787	continue;
		788	}
		789	existingFlags.clear();
		790	for (TaskAttribute attachmentAttribute : attribute.getAttributes().values()) {
		791	if (!attachmentAttribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
		792	continue;
		793	}
		794	TaskAttribute state = attachmentAttribute.getAttribute("state"); //$NON-NLS-1$
		795	if (state != null) {
		796	String nameValue = state.getMetaData().getLabel();
		797	if (!existingFlags.contains(nameValue)) {
798	existingFlags.add(nameValue);
799	}
800	}
801	}
802	TaskAttribute productAttribute = taskData.getRoot().getMappedAttribute(BugzillaAttribute.PRODUCT.getKey());
803	TaskAttribute componentAttribute = taskData.getRoot().getMappedAttribute(
804	BugzillaAttribute.COMPONENT.getKey());
805	for (BugzillaFlag bugzillaFlag : flags) {
806	if (!bugzillaFlag.getType().equals("attachment")) { //$NON-NLS-1$
807	continue;
808	}
809	if (!bugzillaFlag.isUsedIn(productAttribute.getValue(), componentAttribute.getValue())) {
810	continue;
811	}
812	if (existingFlags.contains(bugzillaFlag.getName()) && !bugzillaFlag.isMultiplicable()) {
813	continue;
814	}
815	BugzillaFlagMapper mapper = new BugzillaFlagMapper();
816	mapper.setRequestee(""); //$NON-NLS-1$
817	mapper.setSetter(""); //$NON-NLS-1$
818	mapper.setState(" "); //$NON-NLS-1$
819	mapper.setFlagId(bugzillaFlag.getName());
820	mapper.setNumber(0);
821	mapper.setDescription(bugzillaFlag.getDescription());
822	TaskAttribute newattribute = attribute.createAttribute("task.common.kind.flag_type" + bugzillaFlag.getFlagId()); //$NON-NLS-1$
823	mapper.applyTo(newattribute);
824	}
825	}
826	}
732	}	827	}




BugzillaAttribute_who=who
BugzillaAttribute_who_name=who_name
BugzillaAttribute_Worked=Worked:

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:

BugzillaClient_could_not_post_form_null_returned=Could not post form, client returned null method.
BugzillaClient_description_required_when_submitting_attachments=A description is required when submitting attachments.






	public static String BugzillaAttribute_Worked;

	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 BugzillaClient_could_not_post_form_null_returned;

	public static String BugzillaClient_description_required_when_submitting_attachments;




/*******************************************************************************
 * Copyright (c) 2009 Frank Becker 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:
 *     Frank Becker - initial API and implementation
 *******************************************************************************/

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

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;

/**


	@Override
	public void applyTo(TaskAttribute taskAttribute) {
		// ignore
		super.applyTo(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) {

		}
		return attachment;
	}

}

Return to bug 272207

Lines 177-182 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java (+20 lines)
177		177
178	public static String BugzillaAttribute_Worked;	178	public static String BugzillaAttribute_Worked;
179		179
		180	public static String BugzillaAttachmentMapper_Author;
		181
		182	public static String BugzillaAttachmentMapper_Content_Type;
		183
		184	public static String BugzillaAttachmentMapper_Creation_Date;
		185
		186	public static String BugzillaAttachmentMapper_Description;
		187
		188	public static String BugzillaAttachmentMapper_Filename;
		189
		190	public static String BugzillaAttachmentMapper_obsolate;
		191
		192	public static String BugzillaAttachmentMapper_patch;
		193
		194	public static String BugzillaAttachmentMapper_Size;
		195
		196	public static String BugzillaAttachmentMapper_Token;
		197
		198	public static String BugzillaAttachmentMapper_URL;
		199
180	public static String BugzillaClient_could_not_post_form_null_returned;	200	public static String BugzillaClient_could_not_post_form_null_returned;
181		201
182	public static String BugzillaClient_description_required_when_submitting_attachments;	202	public static String BugzillaClient_description_required_when_submitting_attachments;

Lines 96-102 Link Here

(-)plugin.xml (-1 / +17 lines)
96	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"	96	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"
97	tooltip="Mark attachment as not obsolete">	97	tooltip="Mark attachment as not obsolete">
98	</action>	98	</action>
99	<action	99	<action
100	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaObsoleteAttachmentAction"	100	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaObsoleteAttachmentAction"
101	enablesFor="*"	101	enablesFor="*"
102	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.obsolete"	102	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.obsolete"
Lines 104-109 Link Here
104	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"	104	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark/markadditions"
105	tooltip="Mark attachment as obsolete">	105	tooltip="Mark attachment as obsolete">
106	</action>	106	</action>
		107	<action
		108	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentDetailAction"
		109	enablesFor="*"
		110	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.detail"
		111	label="Detail..."
		112	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
		113	tooltip="Show Details">
		114	</action>
		115	<action
		116	class="org.eclipse.mylyn.internal.bugzilla.ui.action.BugzillaAttachmentUpdateAction"
		117	enablesFor="*"
		118	id="org.eclipse.mylyn.bugzilla.ui.contribution.attachment.update"
		119	label="Update..."
		120	menubarPath="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
		121	tooltip="Update Attachment">
		122	</action>
107	<menu	123	<menu
108	id="org.eclipse.mylyn.bugzilla.ui.attachments.mark"	124	id="org.eclipse.mylyn.bugzilla.ui.attachments.mark"
109	label="Mark as"	125	label="Mark as"

Added Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/ChangeAttachmentJob.java (+131 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Frank Becker 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	* Frank Becker - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.bugzilla.ui.action;
13
14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.core.runtime.OperationCanceledException;
18	import org.eclipse.core.runtime.Status;
19	import org.eclipse.core.runtime.jobs.IJobChangeEvent;
20	import org.eclipse.core.runtime.jobs.Job;
21	import org.eclipse.core.runtime.jobs.JobChangeAdapter;
22	import org.eclipse.mylyn.commons.core.StatusHandler;
23	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
24	import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
25	import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
26	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil;
27	import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
28	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
29	import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
30	import org.eclipse.mylyn.tasks.core.ITask;
31	import org.eclipse.mylyn.tasks.core.ITaskAttachment;
32	import org.eclipse.mylyn.tasks.ui.TasksUi;
33	import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
34	import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
35	import org.eclipse.swt.widgets.Control;
36	import org.eclipse.ui.PlatformUI;
37	import org.eclipse.ui.forms.editor.IFormPage;
38	import org.eclipse.ui.forms.widgets.Section;
39
40	/**
41	* @author Frank Becker
42	*/
43	@SuppressWarnings("restriction")
44	public class ChangeAttachmentJob extends Job {
45
46	private final ITaskAttachment attachment;
47
48	private final TaskEditor editor;
49
50	private IStatus error;
51
52	public ChangeAttachmentJob(ITaskAttachment attachment, TaskEditor editor) {
53	super(Messages.UpdateAttachmentJob_update_attachment);
54	this.attachment = attachment;
55	this.editor = editor;
56	}
57
58	public IStatus getError() {
59	return error;
60	}
61
62	@Override
63	protected IStatus run(IProgressMonitor monitor) {
64	final ITask task;
65	task = editor.getTaskEditorInput().getTask();
66
67	if (!task.getConnectorKind().equals(BugzillaCorePlugin.CONNECTOR_KIND)) {
68	return Status.OK_STATUS;
69	}
70	AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
71	task.getConnectorKind());
72	monitor.beginTask(Messages.UpdateAttachmentJob_update_attachments, 20);
73	try {
74	((BugzillaTaskDataHandler) connector.getTaskDataHandler()).postUpdateAttachment(
75	attachment.getTaskRepository(), attachment.getTaskAttribute(), "update", monitor); //$NON-NLS-1$
76	monitor.worked(10);
77
78	if (attachment != null) {
79	if (connector != null) {
80	TasksUiInternal.synchronizeTask(connector, task, true, new JobChangeAdapter() {
81	@Override
82	public void done(IJobChangeEvent event) {
83	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
84	public void run() {
85	try {
86	if (editor != null) {
87	editor.refreshPages();
88	editor.getEditorSite().getPage().activate(editor);
89	IFormPage formPage = editor.getActivePageInstance();
90	if (formPage instanceof BugzillaTaskEditorPage) {
91	BugzillaTaskEditorPage bugzillaPage = (BugzillaTaskEditorPage) formPage;
92	Control control = bugzillaPage.getPart(
93	AbstractTaskEditorPage.ID_PART_ATTACHMENTS).getControl();
94	if (control instanceof Section) {
95	Section section = (Section) control;
96	CommonFormUtil.setExpanded(section, true);
97	}
98	}
99
100	}
101	} finally {
102	if (editor != null) {
103	editor.showBusy(false);
104	}
105	}
106	}
107	});
108	}
109	});
110	}
111	monitor.worked(10);
112	PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
113	public void run() {
114	if (editor != null) {
115	editor.showBusy(true);
116	}
117	}
118	});
119	}
120	} catch (OperationCanceledException e) {
121	return Status.CANCEL_STATUS;
122	} catch (CoreException e) {
123	StatusHandler.log(new Status(IStatus.ERROR, ITasksCoreConstants.ID_PLUGIN,
124	"Update of an Attachment failed", e)); //$NON-NLS-1$
125	e.printStackTrace();
126	} finally {
127	monitor.done();
128	}
129	return Status.OK_STATUS;
130	}
131	}

Added Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentDetailAction.java (+92 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.ui.action;
13
14	import java.util.List;
15
16	import org.eclipse.jface.action.IAction;
17	import org.eclipse.jface.viewers.ISelection;
18	import org.eclipse.jface.viewers.IStructuredSelection;
19	import org.eclipse.mylyn.internal.bugzilla.ui.dialogs.BugzillaAttachmentDialog;
20	import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
21	import org.eclipse.mylyn.tasks.core.ITaskAttachment;
22	import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
23	import org.eclipse.swt.widgets.Shell;
24	import org.eclipse.ui.IEditorPart;
25	import org.eclipse.ui.IViewActionDelegate;
26	import org.eclipse.ui.IViewPart;
27	import org.eclipse.ui.IWorkbenchPage;
28	import org.eclipse.ui.IWorkbenchPartSite;
29	import org.eclipse.ui.IWorkbenchWindow;
30	import org.eclipse.ui.PlatformUI;
31	import org.eclipse.ui.actions.BaseSelectionListenerAction;
32	import org.eclipse.ui.forms.editor.IFormPage;
33
34	public class BugzillaAttachmentDetailAction extends BaseSelectionListenerAction implements IViewActionDelegate {
35
36	private ISelection currentSelection;
37
38	public BugzillaAttachmentDetailAction() {
39	super("BugzillaAttachmentDetailAction"); //$NON-NLS-1$
40	}
41
42	public void init(IViewPart view) {
43	// ignore
44
45	}
46
47	public void run(IAction action) {
48	IStructuredSelection selection = null;
49	if (currentSelection instanceof IStructuredSelection) {
50	selection = (IStructuredSelection) currentSelection;
51	}
52	if (selection == null \|\| selection.isEmpty() \|\| selection.size() != 1) {
53	return;
54	}
55	ITaskAttachment attachment = (ITaskAttachment) selection.getFirstElement();
56	IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
57	IWorkbenchPage page = window.getActivePage();
58	IEditorPart activeEditor = page.getActiveEditor();
59	IWorkbenchPartSite site = activeEditor.getSite();
60	Shell shell = site.getShell();
61	if (activeEditor instanceof TaskEditor) {
62	final TaskEditor taskEditor = (TaskEditor) activeEditor;
63	IFormPage taskEditorPage = taskEditor.findPage("id"); //$NON-NLS-1$
64	if (taskEditorPage instanceof BugzillaTaskEditorPage) {
65	BugzillaTaskEditorPage bugzillaTaskEditorPage = (BugzillaTaskEditorPage) taskEditorPage;
66	BugzillaAttachmentDialog dialog = new BugzillaAttachmentDialog(shell, bugzillaTaskEditorPage,
67	bugzillaTaskEditorPage.getAttributeEditorFactory(), attachment.getTaskAttribute(), true);
68	dialog.open();
69	}
70	}
71	}
72
73	@SuppressWarnings("unchecked")
74	public void selectionChanged(IAction action, ISelection selection) {
75	this.currentSelection = selection;
76	IStructuredSelection sructuredSelection = null;
77	if (selection instanceof IStructuredSelection) {
78	sructuredSelection = (IStructuredSelection) currentSelection;
79	}
80	if (sructuredSelection == null \|\| sructuredSelection.isEmpty()) {
81	return;
82	}
83	List<ITaskAttachment> attachmentList = sructuredSelection.toList();
84	if (attachmentList != null && attachmentList.size() == 1) {
85	action.setEnabled(true);
86	} else {
87	action.setEnabled(false);
88	}
89
90	}
91
92	}

Lines 84-89 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties (+12 lines)
84	BugzillaAttribute_who=who	84	BugzillaAttribute_who=who
85	BugzillaAttribute_who_name=who_name	85	BugzillaAttribute_who_name=who_name
86	BugzillaAttribute_Worked=Worked:	86	BugzillaAttribute_Worked=Worked:
		87
		88	BugzillaAttachmentMapper_Author=Attachment Author:
		89	BugzillaAttachmentMapper_Content_Type=Content Type:
		90	BugzillaAttachmentMapper_Creation_Date=Creation Date:
		91	BugzillaAttachmentMapper_Description=Description:
		92	BugzillaAttachmentMapper_Filename=Filename:
		93	BugzillaAttachmentMapper_obsolate=obsolete
		94	BugzillaAttachmentMapper_patch=patch
		95	BugzillaAttachmentMapper_Size=Size in Bytes:
		96	BugzillaAttachmentMapper_Token=Token:
		97	BugzillaAttachmentMapper_URL=URL:
		98
87	BugzillaClient_could_not_post_form_null_returned=Could not post form, client returned null method.	99	BugzillaClient_could_not_post_form_null_returned=Could not post form, client returned null method.
88	BugzillaClient_description_required_when_submitting_attachments=A description is required when submitting attachments.	100	BugzillaClient_description_required_when_submitting_attachments=A description is required when submitting attachments.
89		101

Lines 18-24 Link Here

(-)src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java (-2 / +1 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 511-517 Link Here
511	List<TaskAttribute> taskAttachments = repositoryTaskData.getAttributeMapper().getAttributesByType(	510	List<TaskAttribute> taskAttachments = repositoryTaskData.getAttributeMapper().getAttributesByType(
512	repositoryTaskData, TaskAttribute.TYPE_ATTACHMENT);	511	repositoryTaskData, TaskAttribute.TYPE_ATTACHMENT);
513	for (TaskAttribute attachment : taskAttachments) {	512	for (TaskAttribute attachment : taskAttachments) {
514	TaskAttachmentMapper attachmentMapper = TaskAttachmentMapper.createFrom(attachment);	513	BugzillaAttachmentMapper attachmentMapper = BugzillaAttachmentMapper.createFrom(attachment);
515	TaskCommentMapper taskComment = attachIdToComment.get(attachmentMapper.getAttachmentId());	514	TaskCommentMapper taskComment = attachIdToComment.get(attachmentMapper.getAttachmentId());
516	if (taskComment != null) {	515	if (taskComment != null) {
517	attachmentMapper.setAuthor(taskComment.getAuthor());	516	attachmentMapper.setAuthor(taskComment.getAuthor());