Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-06-03 15:25:48 -0400
committerFrank Becker2013-06-03 15:25:48 -0400
commit31fba80064e2deaaa304a17b5ce53e27ed0be55d (patch)
treef3ffd0f9b6833f41f18eeb574ae59cd2be9ec9f2 /org.eclipse.mylyn.bugzilla.ui
parent4df8e40de32fb67695bd3413913feebc06eec2df (diff)
downloadorg.eclipse.mylyn.tasks-31fba80064e2deaaa304a17b5ce53e27ed0be55d.tar.gz
org.eclipse.mylyn.tasks-31fba80064e2deaaa304a17b5ce53e27ed0be55d.tar.xz
org.eclipse.mylyn.tasks-31fba80064e2deaaa304a17b5ce53e27ed0be55d.zip
Revert "403024: Ability to reopen a task when 'REOPENED' state is not available."
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.ui')
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryMigrator.java10
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java53
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java8
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties6
4 files changed, 12 insertions, 65 deletions
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 4eea2cf02..1f3189877 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,7 +12,6 @@
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;
@@ -41,15 +40,6 @@ 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 c1b47a743..eabb20130 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.4"; //$NON-NLS-1$
+ private static final String LABEL_VERSION_NUMBER = "3.0 - 4.0"; //$NON-NLS-1$
private static final String TITLE = Messages.BugzillaRepositorySettingsPage_bugzilla_repository_settings;
@@ -104,11 +104,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
private Combo languageSettingCombo;
- private Button useXMLRPC;
-
- private Button useXMLRPCWorkflowTransitions;
-
- private Button useXMLRPCDefaultMilestones;
+ private Button useXMLRPCstatusTransitions;
private Button autodetectXMLRPCFile;
@@ -287,7 +283,9 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
.align(SWT.FILL, SWT.CENTER)
.hint(300, SWT.DEFAULT)
.applyTo(descriptorFile);
- new Label(workflowGroup, SWT.NONE);
+ useXMLRPCstatusTransitions = new Button(workflowGroup, SWT.CHECK | SWT.LEFT);
+ useXMLRPCstatusTransitions.setText(Messages.BugzillaRepositorySettingsPage_UseXmlRpc);
+ useXMLRPCstatusTransitions.setToolTipText(Messages.BugzillaRepositorySettingsPage_RequiresBugzilla3_6);
Composite descriptorComposite = new Composite(workflowGroup, SWT.NONE);
gridLayout = new GridLayout(2, false);
gridLayout.marginWidth = 0;
@@ -394,22 +392,6 @@ 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);
@@ -470,7 +452,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
use_see_also.setSelection(!value);
value = Boolean.parseBoolean(myTemplate.getAttribute("useXMLRPC")); //$NON-NLS-1$
- useXMLRPC.setSelection(value);
+ useXMLRPCstatusTransitions.setSelection(value);
} else {
useclassification.setSelection(true);
usetargetmilestone.setSelection(false);
@@ -478,9 +460,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
usestatuswhiteboard.setSelection(false);
usebugaliases.setSelection(true);
use_see_also.setSelection(true);
- useXMLRPC.setSelection(false);
- useXMLRPCWorkflowTransitions.setSelection(false);
- useXMLRPCDefaultMilestones.setSelection(false);
+ useXMLRPCstatusTransitions.setSelection(false);
}
} else {
// we use the repository values
@@ -498,11 +478,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
use_see_also.setSelection(!value);
value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC));
- 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);
+ useXMLRPCstatusTransitions.setSelection(value);
}
}
}
@@ -563,11 +539,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
changed = changed || repositoryAuth.getPassword().compareTo(getPassword()) != 0;
}
changed = changed
- || 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();
+ || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPCstatusTransitions.getSelection();
changed = changed
|| !equals(repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE),
descriptorFile.getText());
@@ -695,11 +667,8 @@ 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(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_USE_XMLRPC,
+ Boolean.toString(useXMLRPCstatusTransitions.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 40810483d..f30aa009e 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,14 +119,6 @@ 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 b76360c8b..c547c8413 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=To use XMLRPC you need Bugzilla > 3.6
+BugzillaRepositorySettingsPage_RequiresBugzilla3_6=Requires Bugzilla > 3.6\nThe description file is not used
BugzillaRepositorySettingsPage_Retrieving_repository_configuration=Retrieving repository configuration
BugzillaRepositorySettingsPage_SelectDescriptorFile=Select descriptor file
BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.
@@ -58,8 +58,4 @@ 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

Back to the top