Attachment #42840 for bug #139314

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




import java.util.Iterator;
import java.util.List;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IColorProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;

import org.eclipse.mylar.provisional.tasklist.MylarTaskListPlugin;
import org.eclipse.mylar.provisional.tasklist.TaskRepository;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.ModifyEvent;

	 * @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);

	}

	public void createControl(Composite parent) {
		GridData gd;
		Composite c = new Composite(parent, SWT.NONE);
		c.setLayout(new GridLayout(5, false));

		Label lblName = new Label(c, SWT.NONE);
		final GridData gridData = new GridData();

		lblName.setText("Name:");

		name = new Text(c, SWT.BORDER);
		name.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 4, 1));
		name.addModifyListener(new ModifyListener() {

			public void modifyText(ModifyEvent e) {

		lblDescription.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));

		description = new Text(c, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
		GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false, 4, 1);
		gd.heightHint = 40;
		description.setLayoutData(gd);
		description.addFocusListener(new FocusAdapter() {

		});

		{
			SashForm cc = new SashForm(c, SWT.HORIZONTAL);
			cc.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true, 5, 1));
			cc.setLayoutData(gridData_1);
			cc.setLayout(new GridLayout(4, false));

			Label lblProject = new Label(cc, SWT.NONE);
			lblProject.setText("Project:");

			Label lblFixFor = new Label(cc, SWT.NONE);
			lblFixFor.setText("Fix For:");
			lblFixFor.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));

			Label lblComponent = new Label(cc, SWT.NONE);
			lblComponent.setText("In Components:");
			lblComponent.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));

			Label lblReportedIn = new Label(cc, SWT.NONE);
			lblReportedIn.setText("Reported In:");
			lblReportedIn.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));

			createProjectsViewer(cc);
			createFixForViewer(cc);
			createComponentsViewer(cc);
			createReportedInViewer(cc);

			{
				Composite comp = new Composite(cc, SWT.NONE);
				GridLayout gridLayout = new GridLayout(1, false);
				gridLayout.marginWidth = 0;
				gridLayout.marginHeight = 0;
				comp.setLayout(gridLayout);
				
				Label label = new Label(comp, SWT.NONE);
				label.setText("Project:");
				createProjectsViewer(comp);
			}

			{
				Composite comp = new Composite(cc, SWT.NONE);
				GridLayout gridLayout = new GridLayout(1, false);
				gridLayout.marginWidth = 0;
				gridLayout.marginHeight = 0;
				comp.setLayout(gridLayout);
				
				new Label(comp, SWT.NONE).setText("Fix For:");
				createFixForViewer(comp);
			}

			{
				Composite comp = new Composite(cc, SWT.NONE);
				GridLayout gridLayout = new GridLayout(1, false);
				gridLayout.marginWidth = 0;
				gridLayout.marginHeight = 0;
				comp.setLayout(gridLayout);
				
				new Label(comp, SWT.NONE).setText("In Components:");
				createComponentsViewer(comp);
			}

			{
				Composite comp = new Composite(cc, SWT.NONE);
				GridLayout gridLayout = new GridLayout(1, false);
				gridLayout.marginWidth = 0;
				gridLayout.marginHeight = 0;
				comp.setLayout(gridLayout);

				Label label = new Label(comp, SWT.NONE);
				label.setText("Reported In:");
				createReportedInViewer(comp);
			}
			// cc.setWeights(new int[] {1,1,1,1});
		}

		Label lblQuery = new Label(c, SWT.NONE);
		lblQuery.setLayoutData(new GridData());
		lblQuery.setText("Query:");
		queryString = new Text(c, SWT.BORDER);
		queryString.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 4, 1));
		// TODO put content assist here and a label describing what is available

		queryString.addFocusListener(new FocusAdapter() {

			}

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

		});

		searchEnvironment = new Button(c, SWT.CHECK);
		searchEnvironment.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
		searchEnvironment.setText("Environment");
		searchEnvironment.addSelectionListener(new SelectionAdapter() {


			}

		});
		
		// 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());
		}


	}

	private void createReportedInViewer(Composite c) {
		reportedIn = new ListViewer(c, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.H_SCROLL);
		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
		gridData.heightHint = 200;
		gridData.widthHint = 80;
		reportedIn.getControl().setLayoutData(gridData);

		reportedIn.setContentProvider(new IStructuredContentProvider() {
			private Project project;

	}

	private void createComponentsViewer(Composite c) {
		components = new ListViewer(c, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.H_SCROLL);
		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
		gridData.heightHint = 200;
		gridData.widthHint = 80;
		components.getControl().setLayoutData(gridData);

		components.setContentProvider(new IStructuredContentProvider() {
			private Project project;

	}

	private void createFixForViewer(Composite c) {
		fixFor = new ListViewer(c, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.H_SCROLL);
		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
		gridData.heightHint = 200;
		gridData.widthHint = 80;
		fixFor.getControl().setLayoutData(gridData);

		fixFor.setContentProvider(new IStructuredContentProvider() {
			private Project project;

	}

	private void createProjectsViewer(Composite c) {
		project = new ListViewer(c, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.H_SCROLL);
		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
		gridData.heightHint = 200;
		gridData.widthHint = 120;
		project.getControl().setLayoutData(gridData);
		
		project.setContentProvider(new IStructuredContentProvider() {

			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

Lines 27-32 Link Here

(-)src/org/eclipse/mylar/internal/jira/ui/wizards/EditJiraQueryWizard.java (+1 lines)
27		27
28	public EditJiraQueryWizard(TaskRepository repository, AbstractRepositoryQuery query) {	28	public EditJiraQueryWizard(TaskRepository repository, AbstractRepositoryQuery query) {
29	super(repository, query);	29	super(repository, query);
		30	setForcePreviousAndNextButtons(true);
30	// this.repository = repository;	31	// this.repository = repository;
31	// this.query = query;	32	// this.query = query;
32	// setNeedsProgressMonitor(true);	33	// setNeedsProgressMonitor(true);




import java.util.Iterator;
import java.util.List;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;

	 * @param titleImage
	 * @param server
	 */
	protected IssueAttributesPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
		super("issueAttributes", "Issue Attributes", null);
		super(pageName, title, titleImage);
//		this.repository = repository;
		this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);
		this.workingCopy = workingCopy;
		this.isNew = isNew;


			Label lblIssueType = new Label(c, SWT.NONE);
			lblIssueType.setText("Type:");
			lblIssueType.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));

			Label lblStatus = new Label(c, SWT.NONE);
			lblStatus.setText("Status:");
			lblStatus.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));

			Label lblResolution = new Label(c, SWT.NONE);
			lblResolution.setText("Resolution:");
			lblResolution.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));

			Label lblPriority = new Label(c, SWT.NONE);
			lblPriority.setText("Priority:");
			lblPriority.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
			
			issueType = new ListViewer(c, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
			gd = new GridData(SWT.FILL, SWT.FILL, true, true);




	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 15-21 Link Here

(-)src/org/eclipse/mylar/internal/jira/ui/wizards/IssueAttributesPage.java (-9 / +2 lines)
15	import java.util.Iterator;	15	import java.util.Iterator;
16	import java.util.List;	16	import java.util.List;
17		17
18	import org.eclipse.jface.resource.ImageDescriptor;
19	import org.eclipse.jface.viewers.ComboViewer;	18	import org.eclipse.jface.viewers.ComboViewer;
20	import org.eclipse.jface.viewers.ISelectionChangedListener;	19	import org.eclipse.jface.viewers.ISelectionChangedListener;
21	import org.eclipse.jface.viewers.IStructuredContentProvider;	20	import org.eclipse.jface.viewers.IStructuredContentProvider;
Lines 118-127 Link Here
118	* @param titleImage	117	* @param titleImage
119	* @param server	118	* @param server
120	*/	119	*/
121	protected IssueAttributesPage(TaskRepository repository, String pageName, String title, ImageDescriptor titleImage,	120	protected IssueAttributesPage(TaskRepository repository, FilterDefinition workingCopy, boolean isNew) {
122	FilterDefinition workingCopy, boolean isNew) {	121	super("issueAttributes", "Issue Attributes", null);
123	super(pageName, title, titleImage);
124	// this.repository = repository;
125	this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);	122	this.jiraServer = JiraServerFacade.getDefault().getJiraServer(repository);
126	this.workingCopy = workingCopy;	123	this.workingCopy = workingCopy;
127	this.isNew = isNew;	124	this.isNew = isNew;
Lines 277-295 Link Here
277		274
278	Label lblIssueType = new Label(c, SWT.NONE);	275	Label lblIssueType = new Label(c, SWT.NONE);
279	lblIssueType.setText("Type:");	276	lblIssueType.setText("Type:");
280	lblIssueType.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
281		277
282	Label lblStatus = new Label(c, SWT.NONE);	278	Label lblStatus = new Label(c, SWT.NONE);
283	lblStatus.setText("Status:");	279	lblStatus.setText("Status:");
284	lblStatus.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
285		280
286	Label lblResolution = new Label(c, SWT.NONE);	281	Label lblResolution = new Label(c, SWT.NONE);
287	lblResolution.setText("Resolution:");	282	lblResolution.setText("Resolution:");
288	lblResolution.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
289		283
290	Label lblPriority = new Label(c, SWT.NONE);	284	Label lblPriority = new Label(c, SWT.NONE);
291	lblPriority.setText("Priority:");	285	lblPriority.setText("Priority:");
292	lblPriority.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
293		286
294	issueType = new ListViewer(c, SWT.MULTI \| SWT.BORDER \| SWT.V_SCROLL);	287	issueType = new ListViewer(c, SWT.MULTI \| SWT.BORDER \| SWT.V_SCROLL);
295	gd = new GridData(SWT.FILL, SWT.FILL, true, true);	288	gd = new GridData(SWT.FILL, SWT.FILL, true, true);

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