From 4df8e40de32fb67695bd3413913feebc06eec2df Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Mon, 3 Jun 2013 21:18:12 +0200 Subject: 403024: Ability to reopen a task when 'REOPENED' state is not available. Change-Id: I0fb34dc4017a82ec8381d7f7cf78a330f305adb9 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=403024 --- .../ui/tasklist/BugzillaRepositoryMigrator.java | 10 ++++ .../tasklist/BugzillaRepositorySettingsPage.java | 53 +++++++++++++++++----- .../internal/bugzilla/ui/tasklist/Messages.java | 8 ++++ .../bugzilla/ui/tasklist/messages.properties | 6 ++- 4 files changed, 65 insertions(+), 12 deletions(-) (limited to 'org.eclipse.mylyn.bugzilla.ui') diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java index 1f3189877..4eea2cf02 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java @@ -12,6 +12,7 @@ package org.eclipse.mylyn.internal.bugzilla.ui.tasklist; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; +import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensions; import org.eclipse.mylyn.tasks.core.AbstractRepositoryMigrator; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -40,6 +41,15 @@ public class BugzillaRepositoryMigrator extends AbstractRepositoryMigrator { repository.setProperty(TaskEditorExtensions.REPOSITORY_PROPERTY_AVATAR_SUPPORT, Boolean.TRUE.toString()); migrated = true; } + if (repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_DEFAULT_MILESTONE) == null + && repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC) == null + && repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW) != null) { + repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC, + repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW)); + repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_DEFAULT_MILESTONE, + repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW)); + migrated = true; + } return migrated; } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java index eabb20130..c1b47a743 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java @@ -78,7 +78,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa private static final String LABEL_SHORT_LOGINS = Messages.BugzillaRepositorySettingsPage_local_users_enabled; - private static final String LABEL_VERSION_NUMBER = "3.0 - 4.0"; //$NON-NLS-1$ + private static final String LABEL_VERSION_NUMBER = "3.0 - 4.4"; //$NON-NLS-1$ private static final String TITLE = Messages.BugzillaRepositorySettingsPage_bugzilla_repository_settings; @@ -104,7 +104,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa private Combo languageSettingCombo; - private Button useXMLRPCstatusTransitions; + private Button useXMLRPC; + + private Button useXMLRPCWorkflowTransitions; + + private Button useXMLRPCDefaultMilestones; private Button autodetectXMLRPCFile; @@ -283,9 +287,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa .align(SWT.FILL, SWT.CENTER) .hint(300, SWT.DEFAULT) .applyTo(descriptorFile); - useXMLRPCstatusTransitions = new Button(workflowGroup, SWT.CHECK | SWT.LEFT); - useXMLRPCstatusTransitions.setText(Messages.BugzillaRepositorySettingsPage_UseXmlRpc); - useXMLRPCstatusTransitions.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6); + new Label(workflowGroup, SWT.NONE); Composite descriptorComposite = new Composite(workflowGroup, SWT.NONE); gridLayout = new GridLayout(2, false); gridLayout.marginWidth = 0; @@ -392,6 +394,22 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa languageSettingCombo.select(languageSettingCombo.indexOf(IBugzillaConstants.DEFAULT_LANG)); } } + + Group xmlrpcGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); + xmlrpcGroup.setLayout(new GridLayout(3, false)); + xmlrpcGroup.setText(Messages.BugzillaRepositorySettingsPage_XMLRPC); + xmlrpcGroup.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6); + GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.CENTER).span(2, 1).applyTo(xmlrpcGroup); + useXMLRPC = new Button(xmlrpcGroup, SWT.CHECK | SWT.LEFT); + useXMLRPC.setText(Messages.BugzillaRepositorySettingsPage_XMLRPC_Active); + useXMLRPC.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6); + useXMLRPCWorkflowTransitions = new Button(xmlrpcGroup, SWT.CHECK | SWT.LEFT); + useXMLRPCWorkflowTransitions.setText(Messages.BugzillaRepositorySettingsPage_XMLRPC_WorkflowTransitions); + useXMLRPCWorkflowTransitions.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6); + useXMLRPCDefaultMilestones = new Button(xmlrpcGroup, SWT.CHECK | SWT.LEFT); + useXMLRPCDefaultMilestones.setText(Messages.BugzillaRepositorySettingsPage_XMLRPC_DefaultMilestones); + useXMLRPCDefaultMilestones.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6); + Group adminGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); adminGroup.setLayout(new GridLayout(3, true)); adminGroup.setText(Messages.BugzillaRepositorySettingsPage_admin_parameter); @@ -452,7 +470,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa use_see_also.setSelection(!value); value = Boolean.parseBoolean(myTemplate.getAttribute("useXMLRPC")); //$NON-NLS-1$ - useXMLRPCstatusTransitions.setSelection(value); + useXMLRPC.setSelection(value); } else { useclassification.setSelection(true); usetargetmilestone.setSelection(false); @@ -460,7 +478,9 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa usestatuswhiteboard.setSelection(false); usebugaliases.setSelection(true); use_see_also.setSelection(true); - useXMLRPCstatusTransitions.setSelection(false); + useXMLRPC.setSelection(false); + useXMLRPCWorkflowTransitions.setSelection(false); + useXMLRPCDefaultMilestones.setSelection(false); } } else { // we use the repository values @@ -478,7 +498,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa use_see_also.setSelection(!value); value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)); - useXMLRPCstatusTransitions.setSelection(value); + useXMLRPC.setSelection(value); + value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW)); + useXMLRPCWorkflowTransitions.setSelection(value); + value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_DEFAULT_MILESTONE)); + useXMLRPCDefaultMilestones.setSelection(value); } } } @@ -539,7 +563,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa changed = changed || repositoryAuth.getPassword().compareTo(getPassword()) != 0; } changed = changed - || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPCstatusTransitions.getSelection(); + || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPC.getSelection(); + changed = changed + || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW)) != useXMLRPCWorkflowTransitions.getSelection(); + changed = changed + || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_DEFAULT_MILESTONE)) != useXMLRPCDefaultMilestones.getSelection(); changed = changed || !equals(repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE), descriptorFile.getText()); @@ -667,8 +695,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa repository.setProperty(IBugzillaConstants.REPOSITORY_SETTING_SHORT_LOGIN, String.valueOf(cleanQAContact.getSelection())); repository.setProperty(IBugzillaConstants.BUGZILLA_LANGUAGE_SETTING, languageSettingCombo.getText()); - repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC, - Boolean.toString(useXMLRPCstatusTransitions.getSelection())); + repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC, Boolean.toString(useXMLRPC.getSelection())); + repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_WORKFLOW, + Boolean.toString(useXMLRPCWorkflowTransitions.getSelection())); + repository.setProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC_DEFAULT_MILESTONE, + Boolean.toString(useXMLRPCDefaultMilestones.getSelection())); repository.setProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE, descriptorFile.getText()); if (!autodetectPlatformOS.getSelection()) { repository.setProperty(IBugzillaConstants.BUGZILLA_DEF_PLATFORM, diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java index f30aa009e..40810483d 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java @@ -119,6 +119,14 @@ public class Messages extends NLS { public static String BugzillaRepositorySettingsPage_Validating_server_settings; + public static String BugzillaRepositorySettingsPage_XMLRPC; + + public static String BugzillaRepositorySettingsPage_XMLRPC_Active; + + public static String BugzillaRepositorySettingsPage_XMLRPC_DefaultMilestones; + + public static String BugzillaRepositorySettingsPage_XMLRPC_WorkflowTransitions; + public static String BugzillaTaskAttachmentPage_Advanced; } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties index c547c8413..b76360c8b 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties @@ -43,7 +43,7 @@ BugzillaRepositorySettingsPage_insiderGroup=Enable private comments: BugzillaRepositorySettingsPage_insiderGroup_ToolTip=User ID is member of the insider group\nso private comments are supported BugzillaRepositorySettingsPage_local_users_enabled=Local users enabled: BugzillaRepositorySettingsPage_override_auto_detection_of_platform=Override auto detection of Platform and OS for new bug reports. -BugzillaRepositorySettingsPage_RequiresBugzilla3_6=Requires Bugzilla > 3.6\nThe description file is not used +BugzillaRepositorySettingsPage_RequiresBugzilla3_6=To use XMLRPC you need Bugzilla > 3.6 BugzillaRepositorySettingsPage_Retrieving_repository_configuration=Retrieving repository configuration BugzillaRepositorySettingsPage_SelectDescriptorFile=Select descriptor file BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid. @@ -58,4 +58,8 @@ BugzillaRepositorySettingsPage_usetargetmilestone=Target Milestone BugzillaRepositorySettingsPage_Updating_repository_configuration_for_X=Updating repository configuration for {0} BugzillaRepositorySettingsPage_UseXmlRpc=Use xmlrpc.cgi BugzillaRepositorySettingsPage_Validating_server_settings=Validating server settings +BugzillaRepositorySettingsPage_XMLRPC=XMLRPC +BugzillaRepositorySettingsPage_XMLRPC_Active=Active +BugzillaRepositorySettingsPage_XMLRPC_DefaultMilestones=Default Milestones +BugzillaRepositorySettingsPage_XMLRPC_WorkflowTransitions=Workflow Transitions BugzillaTaskAttachmentPage_Advanced=Advanced -- cgit v1.2.3