Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbecker2010-08-08 10:51:29 -0400
committerfbecker2010-08-08 10:51:29 -0400
commit519e0789401dca14290a20f53cfd758c27d4d315 (patch)
tree177adaf23fabf8f2c982f01c87dee281a8565379
parent8df2d534741909196eb2f635fb63d82e25c60188 (diff)
downloadorg.eclipse.mylyn.tasks-519e0789401dca14290a20f53cfd758c27d4d315.tar.gz
org.eclipse.mylyn.tasks-519e0789401dca14290a20f53cfd758c27d4d315.tar.xz
org.eclipse.mylyn.tasks-519e0789401dca14290a20f53cfd758c27d4d315.zip
ASSIGNED - bug 315921: [patch] fix attachment details nits
https://bugs.eclipse.org/bugs/show_bug.cgi?id=315921
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentUpdateAction.java21
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizard.java9
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizardPage.java198
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties2
4 files changed, 133 insertions, 97 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentUpdateAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentUpdateAction.java
index a9fdbb26c..3117c69d5 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentUpdateAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/action/BugzillaAttachmentUpdateAction.java
@@ -14,9 +14,11 @@ package org.eclipse.mylyn.internal.bugzilla.ui.action;
import java.util.List;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
+import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditorPage;
import org.eclipse.mylyn.internal.bugzilla.ui.editor.FlagAttributeEditor;
import org.eclipse.mylyn.internal.bugzilla.ui.wizard.BugzillaAttachmentWizard;
@@ -108,6 +110,7 @@ public class BugzillaAttachmentUpdateAction extends BaseSelectionListenerAction
ITaskDataWorkingCopy workingCopy = TasksUi.getTaskDataManager().createWorkingCopy(nTask, editTaskData);
TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
attachment.getTaskAttribute().getTaskData().getRepositoryUrl());
+ final String repositoryLabel = repository.getRepositoryLabel();
final TaskDataModel model = new TaskDataModel(repository, nTask, workingCopy);
AttributeEditorFactory factory = new AttributeEditorFactory(model, repository,
bugzillaTaskEditorPage.getEditorSite()) {
@@ -130,8 +133,22 @@ public class BugzillaAttachmentUpdateAction extends BaseSelectionListenerAction
target.setValue(target0.getValue());
final BugzillaAttachmentWizard attachmentWizard = new BugzillaAttachmentWizard(shell, factory, target,
- taskEditor, attachment);
- final NewAttachmentWizardDialog dialog = new NewAttachmentWizardDialog(shell, attachmentWizard, false);
+ taskEditor, attachment, repository.getRepositoryLabel());
+ final NewAttachmentWizardDialog dialog = new NewAttachmentWizardDialog(shell, attachmentWizard, false) {
+
+ @Override
+ protected IDialogSettings getDialogBoundsSettings() {
+ IDialogSettings settings = BugzillaUiPlugin.getDefault().getDialogSettings();
+ IDialogSettings section = settings.getSection(BugzillaUiPlugin.ATTACHMENT_WIZARD_SETTINGS_SECTION
+ + repositoryLabel);
+ if (section == null) {
+ section = settings.addNewSection(BugzillaUiPlugin.ATTACHMENT_WIZARD_SETTINGS_SECTION
+ + repositoryLabel);
+ }
+ return section;
+ }
+
+ };
model.addModelListener(new TaskDataModelListener() {
@Override
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizard.java
index 98e753261..e65358d8d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizard.java
@@ -43,14 +43,17 @@ public class BugzillaAttachmentWizard extends Wizard {
private final ITaskAttachment attachment;
+ private final String repositoryLabel;
+
public BugzillaAttachmentWizard(Shell parentShell, AttributeEditorFactory factory,
- TaskAttribute attachmentAttribute, TaskEditor taskEditor, ITaskAttachment attachment) {
+ TaskAttribute attachmentAttribute, TaskEditor taskEditor, ITaskAttachment attachment, String repositoryLabel) {
super();
this.factory = factory;
this.attachmentAttribute = attachmentAttribute;
this.parentShell = parentShell;
this.taskEditor = taskEditor;
this.attachment = attachment;
+ this.repositoryLabel = repositoryLabel;
setNeedsProgressMonitor(true);
setWindowTitle(Messages.BugzillaAttachmentWizard_Attachment_Details_Dialog_Title);
}
@@ -127,8 +130,8 @@ public class BugzillaAttachmentWizard extends Wizard {
@Override
public void addPages() {
- attachmentWizardPage = new BugzillaAttachmentWizardPage(parentShell, factory, attachmentAttribute,
- attachment.getTask().getTaskId());
+ attachmentWizardPage = new BugzillaAttachmentWizardPage(parentShell, factory, attachment.getTask().getTaskId(),
+ attachmentAttribute, repositoryLabel);
addPage(attachmentWizardPage);
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizardPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizardPage.java
index 2709ab3aa..e5fa35581 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizardPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaAttachmentWizardPage.java
@@ -27,8 +27,8 @@ 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.custom.SashForm;
import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -46,7 +46,7 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
private static final String DIALOG_SETTING_RUN_IN_BACKGROUND = "run-in-background"; //$NON-NLS-1$
- private static final String DIALOG_SETTINGS_SECTION_BUGZILLA_ATTACHMENTS_WIZARD = "bugzilla-attachments-wizard"; //$NON-NLS-1$
+ private static final String DIALOG_SETTING_ADVANCED_EXPANDED = "advanced-expanded"; //$NON-NLS-1$
private final AttributeEditorFactory factory;
@@ -66,7 +66,7 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
private AbstractAttributeEditor commentEditor;
- private ExpandableComposite flagExpandComposite;
+ private ExpandableComposite advancedExpandComposite;
private Button runInBackgroundButton;
@@ -74,15 +74,22 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
private Composite scrolledBodyComposite;
- public BugzillaAttachmentWizardPage(Shell parentShell, AttributeEditorFactory factory,
- TaskAttribute attachmentAttribute, String taskID) {
+ private int currentColumn = 1;
+
+ private final int columnCount = 4;
+
+ private final String repositoryLabel;
+
+ public BugzillaAttachmentWizardPage(Shell parentShell, AttributeEditorFactory factory, String taskID,
+ TaskAttribute attachmentAttribute, String repositoryLabel) {
super(PAGE_NAME);
setTitle(Messages.BugzillaAttachmentWizardPage_Titel);
+ this.repositoryLabel = repositoryLabel;
+ this.attachmentAttribute = attachmentAttribute;
setDescription(MessageFormat.format(Messages.BugzillaAttachmentWizardPage_Description,
- attachmentAttribute.getValue(), taskID));
+ attachmentAttribute.getValue(), taskID, repositoryLabel));
setImageDescriptor(createImageDescriptor());
this.factory = factory;
- this.attachmentAttribute = attachmentAttribute;
}
private static ImageDescriptor createImageDescriptor() {
@@ -104,70 +111,56 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
public void createControl(Composite parent) {
toolkit = new FormToolkit(parent.getDisplay());
-
- Composite pageArea = new Composite(parent, SWT.NONE);
+// Color background = new Color(Display.getDefault(), 192, 192, 192);
+// Color background = new Color(Display.getDefault(), 232, 232, 232);
+ Color background = parent.getBackground();
+ final Composite pageArea = new Composite(parent, SWT.NONE);
pageArea.setBackground(parent.getBackground());
pageArea.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
- pageArea.setLayout(new GridLayout(1, false));
-
- SashForm bottomForm = new SashForm(pageArea, SWT.NONE);
- bottomForm.setOrientation(SWT.VERTICAL);
- GridLayout bottomLayout = new GridLayout();
- bottomLayout.numColumns = 1;
- bottomForm.setLayout(bottomLayout);
- GridData bottomLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
- bottomLayoutData.heightHint = 119;
- bottomLayoutData.widthHint = 200;
- bottomForm.setLayoutData(bottomLayoutData);
- int currentColumn = 1;
- int columnCount = 4;
-
- scrolledComposite = new ScrolledComposite(bottomForm, SWT.H_SCROLL | SWT.V_SCROLL) {
- @Override
- public Point computeSize(int hint, int hint2, boolean changed) {
- return new Point(64, 64);
- }
- };
+ pageArea.setLayout(new GridLayout(columnCount, false));
+
+ scrolledComposite = new ScrolledComposite(pageArea, SWT.H_SCROLL | SWT.V_SCROLL);
+ GridData scrolledCompositeData = new GridData(SWT.FILL, SWT.TOP, true, false, 4, 1);
+ scrolledComposite.setLayoutData(scrolledCompositeData);
scrolledComposite.setExpandHorizontal(true);
scrolledComposite.setExpandVertical(true);
+ scrolledComposite.setBackground(background);
scrolledBodyComposite = new Composite(scrolledComposite, SWT.NONE);
- scrolledBodyComposite.setBackground(pageArea.getBackground());
+ scrolledBodyComposite.setBackground(background);
scrolledBodyComposite.setForeground(scrolledBodyComposite.getDisplay()
.getSystemColor(SWT.COLOR_LIST_FOREGROUND));
- GridLayout layout = new GridLayout(4, false);
+ GridLayout layout = new GridLayout(columnCount, false);
scrolledBodyComposite.setLayout(layout);
scrolledComposite.setContent(scrolledBodyComposite);
+ createAttributeEditors(scrolledBodyComposite);
+ createCommentEditor(pageArea);
- Composite commentArea = new Composite(bottomForm, SWT.NONE);
- commentArea.setBackground(pageArea.getBackground());
- commentArea.setForeground(commentArea.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
- layout = new GridLayout(4, false);
- commentArea.setLayout(layout);
-
- createAttributeEditors(currentColumn, columnCount, scrolledBodyComposite);
- createCommentEditor(currentColumn, columnCount, commentArea);
- createFlagSection(scrolledBodyComposite);
- createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_URL), currentColumn,
- columnCount, scrolledBodyComposite);
- GridDataFactory.fillDefaults().grab(true, false).hint(200, SWT.DEFAULT).span(4, SWT.DEFAULT).applyTo(
- scrolledBodyComposite);
+ createAdvancedSection(pageArea);
runInBackgroundButton = new Button(pageArea, SWT.CHECK);
runInBackgroundButton.setText(Messages.BugzillaAttachmentWizardPage_RunInBackground);
+ setControl(pageArea);
+ Dialog.applyDialogFont(pageArea);
IDialogSettings settings = BugzillaUiPlugin.getDefault().getDialogSettings();
- IDialogSettings attachmentsSettings = settings.getSection(DIALOG_SETTINGS_SECTION_BUGZILLA_ATTACHMENTS_WIZARD);
+ IDialogSettings attachmentsSettings = settings.getSection(BugzillaUiPlugin.ATTACHMENT_WIZARD_SETTINGS_SECTION
+ + repositoryLabel);
+ boolean advancesExpanded = false;
if (attachmentsSettings != null) {
runInBackgroundButton.setSelection(attachmentsSettings.getBoolean(DIALOG_SETTING_RUN_IN_BACKGROUND));
+ try {
+ advancesExpanded = attachmentsSettings.getBoolean(DIALOG_SETTING_ADVANCED_EXPANDED);
+ } catch (Exception e) {
+ // ignore
+ }
+
}
- setControl(pageArea);
- Dialog.applyDialogFont(pageArea);
- bottomForm.setWeights(new int[] { 75, 25 });
+ advancedExpandComposite.setExpanded(advancesExpanded);
scrolledComposite.setMinSize(scrolledBodyComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true));
+
}
- private void createAttributeEditor(TaskAttribute attribute, int currentColumn, int columnCount,
- Composite attributeArea) {
+ private void createAttributeEditor(TaskAttribute attribute, Composite attributeArea) {
String type = attribute.getMetaData().getType();
if (type != null) {
AbstractAttributeEditor editor = factory.createEditor(type, attribute);
@@ -177,7 +170,8 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
} else {
editor.setReadOnly(false);
}
- if (editor.hasLabel() && !TaskAttribute.ATTACHMENT_IS_PATCH.equals(attribute.getId())) {
+ if (editor.hasLabel()
+ && (!TaskAttribute.ATTACHMENT_IS_PATCH.equals(attribute.getId()) && !TaskAttribute.ATTACHMENT_IS_DEPRECATED.equals(attribute.getId()))) {
editor.createLabelControl(attributeArea, toolkit);
Label label = editor.getLabelControl();
label.setBackground(attributeArea.getBackground());
@@ -185,8 +179,10 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
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();
+ 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;
@@ -198,13 +194,19 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
editor.createControl(attributeArea, toolkit);
GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
if (BugzillaAttribute.CTYPE.getKey().equals(attribute.getId())) {
- gd.horizontalSpan = 2;
- gd.widthHint = LABEL_WIDTH * 2;
- } else if (TaskAttribute.ATTACHMENT_IS_PATCH.equals(attribute.getId())) {
gd.horizontalSpan = 1;
- } else if (type.equals(TaskAttribute.TYPE_BOOLEAN) || type.equals(TaskAttribute.TYPE_SHORT_TEXT)
- || type.equals(TaskAttribute.TYPE_URL)) {
+ gd.widthHint = LABEL_WIDTH;
+ gd.grabExcessHorizontalSpace = true;
+ } else if (TaskAttribute.ATTACHMENT_IS_PATCH.equals(attribute.getId())
+ || TaskAttribute.ATTACHMENT_IS_DEPRECATED.equals(attribute.getId())) {
+ gd.horizontalSpan = 1;
+ } else if (TaskAttribute.ATTACHMENT_CONTENT_TYPE.equals(attribute.getId())) {
+ gd.horizontalSpan = 2;
+ } else if (type.equals(TaskAttribute.TYPE_BOOLEAN) || type.equals(TaskAttribute.TYPE_SHORT_TEXT)) {
gd.horizontalSpan = 3;
+ } else if (type.equals(TaskAttribute.TYPE_URL)) {
+ gd.horizontalSpan = 1;
+ gd.grabExcessHorizontalSpace = true;
} else {
gd.horizontalSpan = 1;
}
@@ -216,22 +218,19 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
}
}
- private void createAttributeEditors(int currentColumn, int columnCount, Composite attributeArea) {
+ private void createAttributeEditors(Composite attributeArea) {
createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_DESCRIPTION),
- currentColumn, columnCount, attributeArea);
- createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME), currentColumn,
- columnCount, attributeArea);
- createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_SIZE), currentColumn,
- columnCount, attributeArea);
+ attributeArea);
+ createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_FILENAME), attributeArea);
+ createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_SIZE), attributeArea);
createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_CONTENT_TYPE),
- currentColumn, columnCount, attributeArea);
- createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH), currentColumn,
- columnCount, attributeArea);
+ attributeArea);
+ createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_PATCH), attributeArea);
createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_IS_DEPRECATED),
- currentColumn, columnCount, attributeArea);
+ attributeArea);
}
- private void createCommentEditor(int currentColumn, int columnCount, Composite attributeArea) {
+ private void createCommentEditor(Composite attributeArea) {
TaskAttribute commentAttribute = attachmentAttribute.getAttribute("comment"); //$NON-NLS-1$
if (commentAttribute == null) {
return;
@@ -246,8 +245,10 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
Label label = commentEditor.getLabelControl();
label.setBackground(attributeArea.getBackground());
label.setForeground(attributeArea.getForeground());
- GridData gd = GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.TOP).hint(LABEL_WIDTH,
- SWT.DEFAULT).create();
+ GridData gd = GridDataFactory.fillDefaults()
+ .align(SWT.RIGHT, SWT.TOP)
+ .hint(LABEL_WIDTH, SWT.DEFAULT)
+ .create();
if (currentColumn > 1) {
gd.horizontalIndent = COLUMN_GAP;
gd.widthHint = LABEL_WIDTH + COLUMN_GAP;
@@ -269,7 +270,7 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
}
- private void createFlagSection(final Composite container) {
+ private void createAdvancedSection(final Composite container) {
boolean flagFound = false;
for (TaskAttribute attribute : attachmentAttribute.getAttributes().values()) {
if (!attribute.getId().startsWith("task.common.kind.flag")) { //$NON-NLS-1$
@@ -281,26 +282,36 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
if (!flagFound) {
return;
}
- flagExpandComposite = toolkit.createExpandableComposite(container, ExpandableComposite.COMPACT
+ advancedExpandComposite = toolkit.createExpandableComposite(container, ExpandableComposite.COMPACT
| ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
- flagExpandComposite.setFont(container.getFont());
- flagExpandComposite.setBackground(container.getBackground());
- flagExpandComposite.setText(Messages.BugzillaAttachmentWizardPage_Advanced);
- flagExpandComposite.setLayout(new GridLayout(4, false));
- GridDataFactory.fillDefaults().indent(0, 5).grab(true, false).span(4, SWT.DEFAULT).applyTo(flagExpandComposite);
-
- flagExpandComposite.addExpansionListener(new ExpansionAdapter() {
+ advancedExpandComposite.setFont(container.getFont());
+ advancedExpandComposite.setBackground(container.getBackground());
+ advancedExpandComposite.setText(Messages.BugzillaAttachmentWizardPage_Advanced);
+ advancedExpandComposite.setLayout(new GridLayout(4, false));
+ GridDataFactory.fillDefaults()
+ .indent(-6, 5)
+ .grab(true, false)
+ .span(4, SWT.DEFAULT)
+ .applyTo(advancedExpandComposite);
+
+ advancedExpandComposite.addExpansionListener(new ExpansionAdapter() {
@Override
public void expansionStateChanged(ExpansionEvent e) {
- scrolledComposite.setMinSize(scrolledBodyComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true));
- getControl().getShell().pack();
+ Shell shell = getControl().getShell();
+ Point size = shell.getSize();
+ size.x++;
+ shell.setSize(size);
+ size.x--;
+ shell.setSize(size);
}
});
- Composite flagBodyComposite = new Composite(flagExpandComposite, SWT.NONE);
- GridLayoutFactory.fillDefaults().margins(0, 0).numColumns(2).applyTo(flagBodyComposite);
- flagBodyComposite.setBackground(container.getBackground());
- createFlagEditors(2, flagBodyComposite);
- flagExpandComposite.setClient(flagBodyComposite);
+ Composite advancedBodyComposite = new Composite(advancedExpandComposite, SWT.NONE);
+ GridLayoutFactory.fillDefaults().margins(0, 0).numColumns(2).applyTo(advancedBodyComposite);
+ advancedBodyComposite.setBackground(container.getBackground());
+ createFlagEditors(2, advancedBodyComposite);
+ createAttributeEditor(attachmentAttribute.getMappedAttribute(TaskAttribute.ATTACHMENT_URL),
+ advancedBodyComposite);
+ advancedExpandComposite.setClient(advancedBodyComposite);
}
private void createFlagEditors(int columnCount, Composite flagBodyComposite) {
@@ -320,8 +331,10 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
label.setBackground(flagBodyComposite.getBackground());
label.setForeground(flagBodyComposite.getForeground());
- GridData gd = GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(
- LABEL_WIDTH - (4 * COLUMN_GAP), SWT.DEFAULT).create();
+ GridData gd = GridDataFactory.fillDefaults()
+ .align(SWT.RIGHT, SWT.CENTER)
+ .hint(LABEL_WIDTH - (4 * COLUMN_GAP), SWT.DEFAULT)
+ .create();
if (currentFlagColumn > 1) {
gd.horizontalIndent = COLUMN_GAP;
gd.widthHint = LABEL_WIDTH + COLUMN_GAP;
@@ -346,11 +359,14 @@ public class BugzillaAttachmentWizardPage extends WizardPage {
@Override
public void dispose() {
IDialogSettings settings = BugzillaUiPlugin.getDefault().getDialogSettings();
- IDialogSettings attachmentsSettings = settings.getSection(DIALOG_SETTINGS_SECTION_BUGZILLA_ATTACHMENTS_WIZARD);
+ IDialogSettings attachmentsSettings = settings.getSection(BugzillaUiPlugin.ATTACHMENT_WIZARD_SETTINGS_SECTION
+ + repositoryLabel);
if (attachmentsSettings == null) {
- attachmentsSettings = settings.addNewSection(DIALOG_SETTINGS_SECTION_BUGZILLA_ATTACHMENTS_WIZARD);
+ attachmentsSettings = settings.addNewSection(BugzillaUiPlugin.ATTACHMENT_WIZARD_SETTINGS_SECTION
+ + repositoryLabel);
}
attachmentsSettings.put(DIALOG_SETTING_RUN_IN_BACKGROUND, runInBackgroundButton.getSelection());
+ attachmentsSettings.put(DIALOG_SETTING_ADVANCED_EXPANDED, advancedExpandComposite.isExpanded());
super.dispose();
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
index 9cbad3f8a..9781cdd9d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/messages.properties
@@ -11,6 +11,6 @@
BugzillaAttachmentWizard_Attachment_Details_Dialog_Title=Attachment Details
BugzillaAttachmentWizard_Now_synchronize_the_Task=Updating Attachment: Now synchronize the Task
BugzillaAttachmentWizardPage_Advanced=Advanced
-BugzillaAttachmentWizardPage_Description=Show Attachment {0} Details for Bug {1}
+BugzillaAttachmentWizardPage_Description=Modify Attachment {0} on bug {1} of {2}
BugzillaAttachmentWizardPage_RunInBackground=Run in Background
BugzillaAttachmentWizardPage_Titel=Attachment Detail

Back to the top