Bugzilla Rest Connector: cleanup eclipse-mylyn#415

Task-Url: https://github.com/eclipse-mylyn/org.eclipse.mylyn/issues/415se.mylyn/issues/415pse.mylyn/issues/415mylyn/issues/415
Paranoja · Apr 27, 2024 · cfed374 · cfed374
1 parent 501899b
commit cfed374
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 35 deletions.
diff --git a/...a.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestTaskSchema.java b/...a.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestTaskSchema.java
@@ -140,20 +140,20 @@ public static BugzillaRestTaskSchema getDefault() {
 
 	public final Field DUPE_OF = createField("dupe_of", Messages.BugzillaRestTaskSchema_Dup_Of, TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID); //$NON-NLS-1$
 
-	public final Field DEPENDS_ON = createField("depends_on", Messages.BugzillaRestTaskSchema_13, TaskAttribute.TYPE_TASK_DEPENDENCY, //$NON-NLS-1$
+	public final Field DEPENDS_ON = createField("depends_on", Messages.BugzillaRestTaskSchema_Depends_On, TaskAttribute.TYPE_TASK_DEPENDENCY, //$NON-NLS-1$
 			Flag.ATTRIBUTE);
 
-	public final Field BLOCKS = createField("blocks", Messages.BugzillaRestTaskSchema_14, TaskAttribute.TYPE_TASK_DEPENDENCY, Flag.ATTRIBUTE); //$NON-NLS-1$
+	public final Field BLOCKS = createField("blocks", Messages.BugzillaRestTaskSchema_Blocks, TaskAttribute.TYPE_TASK_DEPENDENCY, Flag.ATTRIBUTE); //$NON-NLS-1$
 
-	public final Field KEYWORDS = createField("keywords", Messages.BugzillaRestTaskSchema_15, IBugzillaRestConstants.EDITOR_TYPE_KEYWORD, //$NON-NLS-1$
+	public final Field KEYWORDS = createField("keywords", Messages.BugzillaRestTaskSchema_Keywords, IBugzillaRestConstants.EDITOR_TYPE_KEYWORD, //$NON-NLS-1$
 			Flag.ATTRIBUTE);
 
 	public final Field DATE_MODIFICATION = inheritFrom(parent.DATE_MODIFICATION).create();
 
-	public final Field RESET_QA_CONTACT = createField("reset_qa_contact", Messages.BugzillaRestTaskSchema_16, //$NON-NLS-1$
+	public final Field RESET_QA_CONTACT = createField("reset_qa_contact", Messages.BugzillaRestTaskSchema_Reset_Qa_Contact, //$NON-NLS-1$
 			TaskAttribute.TYPE_BOOLEAN, Flag.PEOPLE);
 
-	public final Field RESET_ASSIGNED_TO = createField("reset_assigned_to", Messages.BugzillaRestTaskSchema_17, //$NON-NLS-1$
+	public final Field RESET_ASSIGNED_TO = createField("reset_assigned_to", Messages.BugzillaRestTaskSchema_Reset_Assigned_To, //$NON-NLS-1$
 			TaskAttribute.TYPE_BOOLEAN, Flag.PEOPLE);
 
 	@Override

diff --git a/....mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/Messages.java b/....mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/Messages.java
@@ -120,15 +120,15 @@ public class Messages extends NLS {
 
 	public static String BugzillaRestTaskDataHandler_SubmittingTask;
 
-	public static String BugzillaRestTaskSchema_13;
+	public static String BugzillaRestTaskSchema_Depends_On;
 
-	public static String BugzillaRestTaskSchema_14;
+	public static String BugzillaRestTaskSchema_Blocks;
 
-	public static String BugzillaRestTaskSchema_15;
+	public static String BugzillaRestTaskSchema_Keywords;
 
-	public static String BugzillaRestTaskSchema_16;
+	public static String BugzillaRestTaskSchema_Reset_Qa_Contact;
 
-	public static String BugzillaRestTaskSchema_17;
+	public static String BugzillaRestTaskSchema_Reset_Assigned_To;
 
 	public static String BugzillaRestTaskSchema_Add_CC;
 

diff --git a/....bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/messages.properties b/....bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/messages.properties
@@ -12,7 +12,7 @@ BugzillaRestAttachmentMapper_URL=URL:
 BugzillaRestClient_MissingValidCredentials=Authentication requested without valid credentials
 BugzillaRestConfiguration_OsAll=All
 BugzillaRestConfiguration_PlatformAll=All
-BugzillaRestConfiguration_UnknownCustomFieldType=unknown custom field type 
+BugzillaRestConfiguration_UnknownCustomFieldType=unknown custom field type
 BugzillaRestConnector_Bugzilla_5_OrLater=Bugzilla 5.0 or later with REST
 BugzillaRestConnector_BugzillaRestExceptionFromPerformQuery=BugzillaRestException from performQuery
 BugzillaRestConnector_CoreExceptionFromPerformQuery=CoreException from performQuery
@@ -50,11 +50,11 @@ BugzillaRestTaskDataHandler_ErrorPostTaskdata=Error post taskdata.\n\n
 BugzillaRestTaskDataHandler_PostTaskdata=post taskdata
 BugzillaRestTaskDataHandler_RetrieveTask=retrive_task
 BugzillaRestTaskDataHandler_SubmittingTask=Submitting_task
-BugzillaRestTaskSchema_13=Depends on:
-BugzillaRestTaskSchema_14=Blocks:
-BugzillaRestTaskSchema_15=Keywords
-BugzillaRestTaskSchema_16=Reset QA Contact to default
-BugzillaRestTaskSchema_17=Reassign to default assignee
+BugzillaRestTaskSchema_Depends_On=Depends on:
+BugzillaRestTaskSchema_Blocks=Blocks:
+BugzillaRestTaskSchema_Keywords=Keywords
+BugzillaRestTaskSchema_Reset_Qa_Contact=Reset QA Contact to default
+BugzillaRestTaskSchema_Reset_Assigned_To=Reassign to default assignee
 BugzillaRestTaskSchema_Add_CC=Add CC
 BugzillaRestTaskSchema_Alias=Alias
 BugzillaRestTaskSchema_Assigned_To=Assigned to

diff --git a/...st.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/BugzillaRestUiUtil.java b/...st.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/BugzillaRestUiUtil.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2015 Tasktop Technologies and others.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -39,7 +39,7 @@ protected static BugzillaRestSearchQueryPage createSimpleURLQueryPage(TaskData t
 		}
 		return new BugzillaRestSearchQueryPage(Messages.BugzillaRestUiUtil_CreateQueryFromURL, repository, null,
 				SimpleURLQueryPageSchema.getInstance(), taskData,
-				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_EnterQueryParameter, //$NON-NLS-1$
+				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_EnterQueryParameters, //$NON-NLS-1$
 						Messages.BugzillaRestUiUtil_EnterTitleAndURL,
 						"([a-zA-Z][a-zA-Z+.-]{0,10}://[a-zA-Z0-9%._~!$&?#'()*+,;:@/=-]+)", "SimpleURLQueryPage")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -59,7 +59,7 @@ protected static BugzillaRestSearchQueryPage createBugzillaRestSearchQueryPage(T
 		return new BugzillaRestSearchQueryPage(Messages.BugzillaRestUiUtil_CreateQueryFromForm, repository, null,
 				BugzillaRestSearchQueryPageSchema.getInstance(), taskData,
 				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_FillForm, //$NON-NLS-1$
-						Messages.BugzillaRestUiUtil_enterTitleAndFillForm,
+						Messages.BugzillaRestUiUtil_EnterTitleAndFillForm,
 						"([a-zA-Z][a-zA-Z+.-]{0,10}://[a-zA-Z0-9%._~!$&?#'()*+,;:@/=-]+)", null)); //$NON-NLS-1$
 	}
 
@@ -94,7 +94,7 @@ protected static BugzillaRestSearchQueryPage updateSimpleURLQueryPage(TaskData t
 		return new BugzillaRestSearchQueryPage(Messages.BugzillaRestUiUtil_CreateQueryFromURL, repository, query,
 				SimpleURLQueryPageSchema.getInstance(), taskData,
 				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_EnterQueryParameters, //$NON-NLS-1$
-						Messages.BugzillaRestUiUtil_EnterTitleAndURL1,
+						Messages.BugzillaRestUiUtil_EnterTitleAndURL,
 						"([a-zA-Z][a-zA-Z+.-]{0,10}://[a-zA-Z0-9%._~!$&?#'()*+,;:@/=-]+)", "SimpleURLQueryPage")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -103,15 +103,15 @@ protected static BugzillaRestSearchQueryPage updateBugzillaRestSearchQueryPage(T
 		try {
 			BugzillaRestSearchQueryPageSchema.getInstance().initialize(taskData);
 			connectorREST.getTaskDataHandler()
-					.initializeTaskData(repository, taskData, null, new NullProgressMonitor());
+			.initializeTaskData(repository, taskData, null, new NullProgressMonitor());
 			BugzillaRestSearchQueryPageSchema.getInstance().initialize(taskData);
 		} catch (CoreException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return new BugzillaRestSearchQueryPage(Messages.BugzillaRestUiUtil_CreateQueryFromForm, repository, query,
 				BugzillaRestSearchQueryPageSchema.getInstance(), taskData,
-				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_fillForm, //$NON-NLS-1$
+				new QueryPageDetails(true, "buglist.cgi?", Messages.BugzillaRestUiUtil_FillForm, //$NON-NLS-1$
 						Messages.BugzillaRestUiUtil_EnterTitleAndFillForm,
 						"([a-zA-Z][a-zA-Z+.-]{0,10}://[a-zA-Z0-9%._~!$&?#'()*+,;:@/=-]+)", null)); //$NON-NLS-1$
 	}

diff --git a/...ugzilla.rest.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/Messages.java b/...ugzilla.rest.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/Messages.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Frank Becker and others.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -36,16 +36,10 @@ public class Messages extends NLS {
 
 	public static String BugzillaRestUiUtil_EnterQueryParameters;
 
-	public static String BugzillaRestUiUtil_enterTitleAndFillForm;
-
 	public static String BugzillaRestUiUtil_EnterTitleAndFillForm;
 
 	public static String BugzillaRestUiUtil_EnterTitleAndURL;
 
-	public static String BugzillaRestUiUtil_EnterTitleAndURL1;
-
-	public static String BugzillaRestUiUtil_fillForm;
-
 	public static String BugzillaRestUiUtil_FillForm;
 	static {
 		// initialize resource bundle

diff --git a/...a.rest.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/messages.properties b/...a.rest.ui/src/org/eclipse/mylyn/internal/provisional/bugzilla/rest/ui/messages.properties
@@ -5,11 +5,7 @@ BugzillaRestQueryTypeWizardPage_Query=Query
 BugzillaRestQueryTypeWizardPage_SelectAvailableQueryTypes=Select from the available query types.
 BugzillaRestUiUtil_CreateQueryFromForm=Create query from a form
 BugzillaRestUiUtil_CreateQueryFromURL=Create query from URL
-BugzillaRestUiUtil_EnterQueryParameter=Enter query parameters
 BugzillaRestUiUtil_EnterQueryParameters=Enter query parameters
-BugzillaRestUiUtil_enterTitleAndFillForm=Please enter a title and fill the form
 BugzillaRestUiUtil_EnterTitleAndFillForm=Please enter a title and fill the form
 BugzillaRestUiUtil_EnterTitleAndURL=Please enter a title and an URL
-BugzillaRestUiUtil_EnterTitleAndURL1=Please anter a title and an URL
-BugzillaRestUiUtil_fillForm=fill the form
 BugzillaRestUiUtil_FillForm=fill the form