Attachment 42676 Details for Bug 139314 – Fixed issue with editing Jira query

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fixed issue with editing Jira query

mylar.jira.query.editor.patch (text/plain), 4.91 KB, created by Eugene Kuleshov

on 2006-05-25 23:59:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Kuleshov

Created: 2006-05-25 23:59:26 EDT

Size: 4.91 KB

patch

obsolete

>Index: src/org/eclipse/mylar/internal/jira/ui/wizards/FilterSummaryPage.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.jira/src/org/eclipse/mylar/internal/jira/ui/wizards/FilterSummaryPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 FilterSummaryPage.java
>--- src/org/eclipse/mylar/internal/jira/ui/wizards/FilterSummaryPage.java	28 Apr 2006 17:49:36 -0000	1.1
>+++ src/org/eclipse/mylar/internal/jira/ui/wizards/FilterSummaryPage.java	26 May 2006 04:00:04 -0000
>@@ -119,9 +119,8 @@
> 	 * @param title
> 	 * @param titleImage
> 	 */
>-	protected FilterSummaryPage(TaskRepository repository, String pageName, String title, ImageDescriptor titleImage,
>-			FilterDefinition workingCopy, boolean isNew) {
>-		super(pageName, title, titleImage);
>+	protected FilterSummaryPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
>+		super("summaryPage", "Filter Summary", null);
> 		this.repository = repository;
> 
> 		this.server = JiraServerFacade.getDefault().getJiraServer(repository);
>@@ -241,15 +240,6 @@
> 		});
> 		new Label(c, SWT.NONE);
> 
>-		// Need to turn off validation here
>-		if (isNew) {
>-			loadFromDefaults();
>-		} else {
>-			loadFromWorkingCopy();
>-		}
>-
>-		setControl(c);
>-
> 		searchComments = new Button(c, SWT.CHECK);
> 		searchComments.setLayoutData(new GridData());
> 		searchComments.setText("Comments");
>@@ -271,12 +261,20 @@
> 			}
> 
> 		});
>+		
>+		// Need to turn off validation here
>+		if (isNew) {
>+			loadFromDefaults();
>+		} else {
>+			loadFromWorkingCopy();
>+		}
>+		
>+		setControl(c);
> 	}
> 
> 	public IWizardPage getNextPage() {
> 		if (issueAttributesPage == null) {
>-			issueAttributesPage = new IssueAttributesPage(repository, "issueAttributes", "Issue Attributes", null,
>-					workingCopy, isNew);
>+			issueAttributesPage = new IssueAttributesPage(repository, workingCopy, isNew);
> 			issueAttributesPage.setWizard(getWizard());
> 		}
> 
>Index: src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.jira/src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 IssueAttributesPage.java
>--- src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java	28 Apr 2006 17:49:36 -0000	1.1
>+++ src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java	26 May 2006 04:00:04 -0000
>@@ -118,10 +118,8 @@
> 	 * @param titleImage
> 	 * @param server
> 	 */
>-	protected IssueAttributesPage(TaskRepository repository, String pageName, String title, ImageDescriptor titleImage,
>-			FilterDefinition workingCopy, boolean isNew) {
>-		super(pageName, title, titleImage);
>-//		this.repository = repository;
>+	protected IssueAttributesPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
>+		super("issueAttributes", "Issue Attributes", null);
> 		this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);
> 		this.workingCopy = workingCopy;
> 		this.isNew = isNew;
>Index: src/org/eclipse/mylar/internal/jira/ui/wizards/JiraQueryWizardPage.java
>===================================================================
>RCS file: /home/technology/org.eclipse.mylar/org.eclipse.mylar.jira/src/org/eclipse/mylar/internal/jira/ui/wizards/JiraQueryWizardPage.java,v
>retrieving revision 1.9
>diff -u -r1.9 JiraQueryWizardPage.java
>--- src/org/eclipse/mylar/internal/jira/ui/wizards/JiraQueryWizardPage.java	28 Apr 2006 17:49:36 -0000	1.9
>+++ src/org/eclipse/mylar/internal/jira/ui/wizards/JiraQueryWizardPage.java	26 May 2006 04:00:05 -0000
>@@ -76,11 +76,7 @@
> 	private AbstractRepositoryQuery query;
> 
> 	public JiraQueryWizardPage(TaskRepository repository) {
>-		super(TITLE);
>-		this.repository = repository;
>-		setTitle(TITLE);
>-		setDescription(DESCRIPTION);
>-		setPageComplete(false);
>+		this(repository, null);
> 	}
> 
> 	public JiraQueryWizardPage(TaskRepository repository, AbstractRepositoryQuery query) {
>@@ -157,11 +153,17 @@
> 			return null;
> 		}
> 		if (filterSummaryPage == null) {
>-			FilterDefinition workingCopy = new FilterDefinition();
>-			boolean isAdd = true;
>+			FilterDefinition workingCopy;
>+			boolean isNew;
>+			if(query instanceof JiraCustomQuery) {
>+				workingCopy = ((JiraCustomQuery) query).getFilterDefinition();
>+				isNew = false;
>+			} else {
>+				workingCopy = new FilterDefinition();
>+				isNew = true;
>+			}
> 
>-			filterSummaryPage = new FilterSummaryPage(repository, "summaryPage", "Filter Summary", null, workingCopy,
>-					isAdd);
>+			filterSummaryPage = new FilterSummaryPage(repository, workingCopy, isNew);
> 			filterSummaryPage.setWizard(getWizard());
> 		}
> 		return filterSummaryPage;
>@@ -220,6 +222,7 @@
> 		}
> 
> 		filterCombo.select(n);
>+		filterCombo.showSelection();
> 		setPageComplete(true);
> 	}
>

Actions: View | Diff

Attachments on bug 139314: 42676 | 42840