Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Davis2016-11-21 16:31:47 -0500
committerFrank Becker2016-11-22 12:02:38 -0500
commit03c7506d479db971747d03a02a323191676226a2 (patch)
tree30b78fdda9a64c85c8ef8ce9f73a3a8ef257e356
parent230d3053afae0f2a6ae9b8344f66ac994779dd3b (diff)
downloadorg.eclipse.mylyn.tasks-03c7506d479db971747d03a02a323191676226a2.tar.gz
org.eclipse.mylyn.tasks-03c7506d479db971747d03a02a323191676226a2.tar.xz
org.eclipse.mylyn.tasks-03c7506d479db971747d03a02a323191676226a2.zip
507785: Inconsistent text in "Add task repositories" wizard for the
Mylyn Bugzilla connector. Change-Id: I06690187a434fb16e2c0e0ccacfb05eb85daee67 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=507785
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java52
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/Messages.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties3
3 files changed, 29 insertions, 28 deletions
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 b2940733f..e584092a8 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
@@ -16,7 +16,6 @@ import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
-import java.text.MessageFormat;
import java.util.List;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -78,13 +77,9 @@ 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 TITLE = Messages.BugzillaRepositorySettingsPage_bugzilla_repository_settings;
- private static final String DESCRIPTION = MessageFormat.format(
- Messages.BugzillaRepositorySettingsPage_supports_bugzilla_X, LABEL_VERSION_NUMBER)
- + Messages.BugzillaRepositorySettingsPage_example_do_not_include;
+ private static final String DESCRIPTION = Messages.BugzillaRepositorySettingsPage_example_do_not_include;
protected Button autodetectPlatformOS;
@@ -163,12 +158,14 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
shortLoginLabel.setText(LABEL_SHORT_LOGINS);
cleanQAContact = new Button(parent, SWT.CHECK | SWT.LEFT);
if (repository != null) {
- boolean shortLogin = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.REPOSITORY_SETTING_SHORT_LOGIN));
+ boolean shortLogin = Boolean
+ .parseBoolean(repository.getProperty(IBugzillaConstants.REPOSITORY_SETTING_SHORT_LOGIN));
cleanQAContact.setSelection(shortLogin);
}
if (null != repository) {
- BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi.getRepositoryConnector(repository.getConnectorKind());
+ BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi
+ .getRepositoryConnector(repository.getConnectorKind());
repositoryConfiguration = connector.getRepositoryConfiguration(repository.getRepositoryUrl());
platform = repository.getProperty(IBugzillaConstants.BUGZILLA_DEF_PLATFORM);
os = repository.getProperty(IBugzillaConstants.BUGZILLA_DEF_OS);
@@ -198,13 +195,14 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
try {
getWizard().getContainer().run(true, false, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException,
- InterruptedException {
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
try {
monitor.beginTask(
Messages.BugzillaRepositorySettingsPage_Retrieving_repository_configuration,
IProgressMonitor.UNKNOWN);
- BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi.getRepositoryConnector(repository.getConnectorKind());
+ BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi
+ .getRepositoryConnector(repository.getConnectorKind());
repositoryConfiguration = connector.getRepositoryConfiguration(repository, false,
monitor);
if (repositoryConfiguration != null) {
@@ -324,8 +322,8 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
final String[] fileName = new String[1];
try {
getWizard().getContainer().run(true, true, new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException,
- InterruptedException {
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
@@ -334,7 +332,8 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
try {
BugzillaClient client = null;
- BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi.getRepositoryConnector(repository.getConnectorKind());
+ BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi
+ .getRepositoryConnector(repository.getConnectorKind());
client = BugzillaClientFactory.createClient(repository, connector);
client.downloadXMLTransFile(transFile, monitor);
fileName[0] = transFile;
@@ -464,13 +463,16 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
}
} else {
// we use the repository values
- boolean value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION));
+ boolean value = Boolean
+ .parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USECLASSIFICATION));
useclassification.setSelection(!value);
- value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE));
+ value = Boolean
+ .parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE));
usetargetmilestone.setSelection(!value);
value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT));
useqacontact.setSelection(!value);
- value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD));
+ value = Boolean
+ .parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD));
usestatuswhiteboard.setSelection(!value);
value = Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEBUGALIASES));
usebugaliases.setSelection(!value);
@@ -538,11 +540,11 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
changed = changed || repositoryAuth.getUserName().compareTo(getUserName()) != 0;
changed = changed || repositoryAuth.getPassword().compareTo(getPassword()) != 0;
}
- changed = changed
- || Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPCstatusTransitions.getSelection();
- changed = changed
- || !equals(repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE),
- descriptorFile.getText());
+ changed = changed || Boolean.parseBoolean(
+ repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPCstatusTransitions
+ .getSelection();
+ changed = changed || !equals(repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE),
+ descriptorFile.getText());
if (httpAuth != null) {
changed = changed || httpAuth.getUserName().compareTo(getHttpAuthUserId()) != 0
|| httpAuth.getPassword().compareTo(getHttpAuthPassword()) != 0
@@ -625,7 +627,8 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
IProgressMonitor.UNKNOWN);
BugzillaClient client = null;
- BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi.getRepositoryConnector(repository.getConnectorKind());
+ BugzillaRepositoryConnector connector = (BugzillaRepositoryConnector) TasksUi
+ .getRepositoryConnector(repository.getConnectorKind());
client = BugzillaClientFactory.createClient(repository, connector);
client.validate(monitor);
} finally {
@@ -691,7 +694,8 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
Boolean.toString(!usebugaliases.getSelection()));
repository.setProperty(IBugzillaConstants.BUGZILLA_PARAM_USE_SEE_ALSO,
Boolean.toString(!use_see_also.getSelection()));
- repository.setProperty(IBugzillaConstants.BUGZILLA_INSIDER_GROUP, Boolean.toString(insidergroup.getSelection()));
+ repository.setProperty(IBugzillaConstants.BUGZILLA_INSIDER_GROUP,
+ Boolean.toString(insidergroup.getSelection()));
}
@Override
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 6c68f6fe4..bf5306eba 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
@@ -95,8 +95,6 @@ public class Messages extends NLS {
public static String BugzillaRepositorySettingsPage_Server_URL_is_invalid;
- public static String BugzillaRepositorySettingsPage_supports_bugzilla_X;
-
public static String BugzillaRepositorySettingsPage_suppressToolTip;
public static String BugzillaRepositorySettingsPage_use_see_also;
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 b223ce11b..b152bd97c 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
@@ -32,7 +32,7 @@ BugzillaRepositorySettingsPage_Browse_descriptor=Browse
BugzillaRepositorySettingsPage_browseToolTip=Select an local File
BugzillaRepositorySettingsPage_bugzilla_repository_settings=Bugzilla Repository Settings
BugzillaRepositorySettingsPage_Custom_Workflow=Custom Workflow
-BugzillaRepositorySettingsPage_example_do_not_include=\nExample: https://bugs.eclipse.org/bugs (do not include index.cgi)
+BugzillaRepositorySettingsPage_example_do_not_include=Example: https://bugs.eclipse.org/bugs (do not include index.cgi)
BugzillaRepositorySettingsPage_Language_=Language:
BugzillaRepositorySettingsPage_descriptor_file=Description file:
BugzillaRepositorySettingsPage_DescriptorFileNotExists=Descriptor File does not exist
@@ -46,7 +46,6 @@ BugzillaRepositorySettingsPage_RequiresBugzilla3_6=Requires Bugzilla > 3.6\nThe
BugzillaRepositorySettingsPage_Retrieving_repository_configuration=Retrieving repository configuration
BugzillaRepositorySettingsPage_SelectDescriptorFile=Select descriptor file
BugzillaRepositorySettingsPage_Server_URL_is_invalid=Server URL is invalid.
-BugzillaRepositorySettingsPage_supports_bugzilla_X=Supports Bugzilla {0}
BugzillaRepositorySettingsPage_suppressToolTip=set checked to suppress
BugzillaRepositorySettingsPage_use_see_also=See also
BugzillaRepositorySettingsPage_usebugaliases=Bug Aliases

Back to the top