Attachment #42676 for bug #139314

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




	 * @param title
	 * @param titleImage
	 */
	protected FilterSummaryPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
		super("summaryPage", "Filter Summary", null);
		super(pageName, title, titleImage);
		this.repository = repository;

		this.server = JiraServerFacade.getDefault().getJiraServer(repository);

		});
		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");

			}

		});
		
		// Need to turn off validation here
		if (isNew) {
			loadFromDefaults();
		} else {
			loadFromWorkingCopy();
		}
		
		setControl(c);
	}

	public IWizardPage getNextPage() {
		if (issueAttributesPage == null) {
			issueAttributesPage = new IssueAttributesPage(repository, workingCopy, isNew);
					workingCopy, isNew);
			issueAttributesPage.setWizard(getWizard());
		}


Lines 118-127 Link Here

(-)src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java (-4 / +2 lines)
118	* @param titleImage	118	* @param titleImage
119	* @param server	119	* @param server
120	*/	120	*/
121	protected IssueAttributesPage(TaskRepository repository, String pageName, String title, ImageDescriptor titleImage,	121	protected IssueAttributesPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
122	FilterDefinition workingCopy, boolean isNew) {	122	super("issueAttributes", "Issue Attributes", null);
123	super(pageName, title, titleImage);
124	// this.repository = repository;
125	this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);	123	this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);
126	this.workingCopy = workingCopy;	124	this.workingCopy = workingCopy;
127	this.isNew = isNew;	125	this.isNew = isNew;




	private AbstractRepositoryQuery query;

	public JiraQueryWizardPage(TaskRepository repository) {
		this(repository, null);
		this.repository = repository;
		setTitle(TITLE);
		setDescription(DESCRIPTION);
		setPageComplete(false);
	}

	public JiraQueryWizardPage(TaskRepository repository, AbstractRepositoryQuery query) {

			return null;
		}
		if (filterSummaryPage == null) {
			FilterDefinition workingCopy;
			boolean isNew;
			if(query instanceof JiraCustomQuery) {
				workingCopy = ((JiraCustomQuery) query).getFilterDefinition();
				isNew = false;
			} else {
				workingCopy = new FilterDefinition();
				isNew = true;
			}

			filterSummaryPage = new FilterSummaryPage(repository, workingCopy, isNew);
					isAdd);
			filterSummaryPage.setWizard(getWizard());
		}
		return filterSummaryPage;

		}

		filterCombo.select(n);
		filterCombo.showSelection();
		setPageComplete(true);
	}


Return to bug 139314

Lines 76-86 Link Here

(-)src/org/eclipse/mylar/internal/jira/ui/wizards/JiraQueryWizardPage.java (-9 / +12 lines)
76	private AbstractRepositoryQuery query;	76	private AbstractRepositoryQuery query;
77		77
78	public JiraQueryWizardPage(TaskRepository repository) {	78	public JiraQueryWizardPage(TaskRepository repository) {
79	super(TITLE);	79	this(repository, null);
80	this.repository = repository;
81	setTitle(TITLE);
82	setDescription(DESCRIPTION);
83	setPageComplete(false);
84	}	80	}
85		81
86	public JiraQueryWizardPage(TaskRepository repository, AbstractRepositoryQuery query) {	82	public JiraQueryWizardPage(TaskRepository repository, AbstractRepositoryQuery query) {
Lines 157-167 Link Here
157	return null;	153	return null;
158	}	154	}
159	if (filterSummaryPage == null) {	155	if (filterSummaryPage == null) {
160	FilterDefinition workingCopy = new FilterDefinition();	156	FilterDefinition workingCopy;
161	boolean isAdd = true;	157	boolean isNew;
		158	if(query instanceof JiraCustomQuery) {
		159	workingCopy = ((JiraCustomQuery) query).getFilterDefinition();
		160	isNew = false;
		161	} else {
		162	workingCopy = new FilterDefinition();
		163	isNew = true;
		164	}
162		165
163	filterSummaryPage = new FilterSummaryPage(repository, "summaryPage", "Filter Summary", null, workingCopy,	166	filterSummaryPage = new FilterSummaryPage(repository, workingCopy, isNew);
164	isAdd);
165	filterSummaryPage.setWizard(getWizard());	167	filterSummaryPage.setWizard(getWizard());
166	}	168	}
167	return filterSummaryPage;	169	return filterSummaryPage;
Lines 220-225 Link Here
220	}	222	}
221		223
222	filterCombo.select(n);	224	filterCombo.select(n);
		225	filterCombo.showSelection();
223	setPageComplete(true);	226	setPageComplete(true);
224	}	227	}
225		228

Lines 119-127 Link Here

(-)src/org/eclipse/mylar/internal/jira/ui/wizards/FilterSummaryPage.java (-14 / +12 lines)
119	* @param title	119	* @param title
120	* @param titleImage	120	* @param titleImage
121	*/	121	*/
122	protected FilterSummaryPage(TaskRepository repository, String pageName, String title, ImageDescriptor titleImage,	122	protected FilterSummaryPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
123	FilterDefinition workingCopy, boolean isNew) {	123	super("summaryPage", "Filter Summary", null);
124	super(pageName, title, titleImage);
125	this.repository = repository;	124	this.repository = repository;
126		125
127	this.server = JiraServerFacade.getDefault().getJiraServer(repository);	126	this.server = JiraServerFacade.getDefault().getJiraServer(repository);
Lines 241-255 Link Here
241	});	240	});
242	new Label(c, SWT.NONE);	241	new Label(c, SWT.NONE);
243		242
244	// Need to turn off validation here
245	if (isNew) {
246	loadFromDefaults();
247	} else {
248	loadFromWorkingCopy();
249	}
250
251	setControl(c);
252
253	searchComments = new Button(c, SWT.CHECK);	243	searchComments = new Button(c, SWT.CHECK);
254	searchComments.setLayoutData(new GridData());	244	searchComments.setLayoutData(new GridData());
255	searchComments.setText("Comments");	245	searchComments.setText("Comments");
Lines 271-282 Link Here
271	}	261	}
272		262
273	});	263	});
		264
		265	// Need to turn off validation here
		266	if (isNew) {
		267	loadFromDefaults();
		268	} else {
		269	loadFromWorkingCopy();
		270	}
		271
		272	setControl(c);
274	}	273	}
275		274
276	public IWizardPage getNextPage() {	275	public IWizardPage getNextPage() {
277	if (issueAttributesPage == null) {	276	if (issueAttributesPage == null) {
278	issueAttributesPage = new IssueAttributesPage(repository, "issueAttributes", "Issue Attributes", null,	277	issueAttributesPage = new IssueAttributesPage(repository, workingCopy, isNew);
279	workingCopy, isNew);
280	issueAttributesPage.setWizard(getWizard());	278	issueAttributesPage.setWizard(getWizard());
281	}	279	}
282		280