Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 198614
Collapse All | Expand All

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java (-37 lines)
Lines 12-20 Link Here
12
import java.util.ArrayList;
12
import java.util.ArrayList;
13
import java.util.Calendar;
13
import java.util.Calendar;
14
import java.util.Date;
14
import java.util.Date;
15
import java.util.HashSet;
16
import java.util.List;
15
import java.util.List;
17
import java.util.Set;
18
16
19
import org.eclipse.core.runtime.CoreException;
17
import org.eclipse.core.runtime.CoreException;
20
import org.eclipse.jface.dialogs.Dialog;
18
import org.eclipse.jface.dialogs.Dialog;
Lines 29-41 Link Here
29
import org.eclipse.mylyn.tasks.core.AbstractTask;
27
import org.eclipse.mylyn.tasks.core.AbstractTask;
30
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
28
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
31
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
29
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
32
import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
33
import org.eclipse.mylyn.tasks.ui.DatePicker;
30
import org.eclipse.mylyn.tasks.ui.DatePicker;
34
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
31
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
35
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
32
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
36
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
33
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
37
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
34
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
38
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
39
import org.eclipse.swt.SWT;
35
import org.eclipse.swt.SWT;
40
import org.eclipse.swt.events.ModifyEvent;
36
import org.eclipse.swt.events.ModifyEvent;
41
import org.eclipse.swt.events.ModifyListener;
37
import org.eclipse.swt.events.ModifyListener;
Lines 606-644 Link Here
606
	}
602
	}
607
603
608
	/**
604
	/**
609
	 * This method is duplicated in NewBugzillaTaskEditor for now.
610
	 */
611
	@Override
612
	public SearchHitCollector getDuplicateSearchCollector(String name) {
613
		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
614
		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
615
616
		for (AbstractDuplicateDetector detector : allDetectors) {
617
			if (detector.getName().equals(duplicateDetectorName)) {
618
				return detector.getSearchHitCollector(repository, taskData);
619
			}
620
		}
621
		// didn't find it
622
		return null;
623
	}
624
625
	/**
626
	 * This method is duplicated in BugzillaTaskEditor for now.
627
	 */
628
	@Override
629
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
630
		Set<AbstractDuplicateDetector> bugzillaDuplicateDetectors = new HashSet<AbstractDuplicateDetector>();
631
		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
632
				.getDuplicateSearchCollectorsList()) {
633
			if (abstractDuplicateDetector.getKind() == null
634
					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
635
				bugzillaDuplicateDetectors.add(abstractDuplicateDetector);
636
			}
637
		}
638
		return bugzillaDuplicateDetectors;
639
	}
640
641
	/**
642
	 * @author Frank Becker (bug 198027)
605
	 * @author Frank Becker (bug 198027)
643
	 */
606
	 */
644
	@Override
607
	@Override
(-)src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java (-39 lines)
Lines 7-15 Link Here
7
 *******************************************************************************/
7
 *******************************************************************************/
8
package org.eclipse.mylyn.internal.bugzilla.ui.editor;
8
package org.eclipse.mylyn.internal.bugzilla.ui.editor;
9
9
10
import java.util.HashSet;
11
import java.util.Set;
12
13
import org.eclipse.core.runtime.IProgressMonitor;
10
import org.eclipse.core.runtime.IProgressMonitor;
14
import org.eclipse.jface.dialogs.MessageDialog;
11
import org.eclipse.jface.dialogs.MessageDialog;
15
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
12
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
Lines 17-26 Link Here
17
import org.eclipse.jface.viewers.ILabelProvider;
14
import org.eclipse.jface.viewers.ILabelProvider;
18
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
15
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
19
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
16
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
20
import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
21
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
22
import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
17
import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
23
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
24
import org.eclipse.swt.SWT;
18
import org.eclipse.swt.SWT;
25
import org.eclipse.swt.layout.GridLayout;
19
import org.eclipse.swt.layout.GridLayout;
26
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Composite;
Lines 98-136 Link Here
98
		toolkit.paintBordersFor(peopleComposite);
92
		toolkit.paintBordersFor(peopleComposite);
99
	}
93
	}
100
94
101
	@Override
102
	/**
103
	 * This method is duplicated in BugzillaTaskEditor for now.
104
	 */
105
	public SearchHitCollector getDuplicateSearchCollector(String name) {
106
		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
107
		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
108
109
		for (AbstractDuplicateDetector detector : allDetectors) {
110
			if (detector.getName().equals(duplicateDetectorName)) {
111
				return detector.getSearchHitCollector(repository, taskData);
112
			}
113
		}
114
		// didn't find it
115
		return null;
116
	}
117
118
	@Override
119
	/**
120
	 * This method is duplicated in BugzillaTaskEditor for now.
121
	 */
122
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
123
		Set<AbstractDuplicateDetector> bugzillaDuplicateDetectors = new HashSet<AbstractDuplicateDetector>();
124
		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
125
				.getDuplicateSearchCollectorsList()) {
126
127
			if (abstractDuplicateDetector.getKind() == null
128
					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
129
				bugzillaDuplicateDetectors.add(abstractDuplicateDetector);
130
			}
131
		}
132
		return bugzillaDuplicateDetectors;
133
	}
134
95
135
	@Override
96
	@Override
136
	public void submitToRepository() {
97
	public void submitToRepository() {
(-)src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java (-38 / +1 lines)
Lines 8-20 Link Here
8
8
9
package org.eclipse.mylyn.internal.jira.ui.editor;
9
package org.eclipse.mylyn.internal.jira.ui.editor;
10
10
11
import java.util.HashSet;
12
import java.util.Set;
13
14
import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
15
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
16
import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
11
import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
17
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
18
import org.eclipse.ui.IEditorInput;
12
import org.eclipse.ui.IEditorInput;
19
import org.eclipse.ui.IEditorSite;
13
import org.eclipse.ui.IEditorSite;
20
import org.eclipse.ui.forms.editor.FormEditor;
14
import org.eclipse.ui.forms.editor.FormEditor;
Lines 33-68 Link Here
33
		super.init(site, input);
27
		super.init(site, input);
34
28
35
		setExpandAttributeSection(true);
29
		setExpandAttributeSection(true);
36
	}
30
	}	
37
	
38
	/**
39
	 * This method is duplicated in JiraTaskEditor for now.
40
	 */
41
	@Override
42
	public SearchHitCollector getDuplicateSearchCollector(String name) {
43
		String duplicateDetectorName = "default".equals(name) ? "Stack Trace" : name;
44
		Set<AbstractDuplicateDetector> detectors = getDuplicateSearchCollectorsList();
45
46
		for (AbstractDuplicateDetector detector : detectors) {
47
			if (duplicateDetectorName.equals(detector.getName())) {
48
				return detector.getSearchHitCollector(repository, taskData);
49
			}
50
		}
51
		return null;
52
	}
53
54
	/**
55
	 * This method is duplicated in JiraTaskEditor for now.
56
	 */
57
	@Override
58
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
59
		Set<AbstractDuplicateDetector> detectors = new HashSet<AbstractDuplicateDetector>();
60
		for (AbstractDuplicateDetector detector : TasksUiPlugin.getDefault().getDuplicateSearchCollectorsList()) {
61
			if (detector.getKind() == null || detector.getKind().equals(getConnector().getConnectorKind())) {
62
				detectors.add(detector);
63
			}
64
		}
65
		return detectors;
66
	}
67
	
68
}
31
}
(-)src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditor.java (-35 lines)
Lines 10-17 Link Here
10
10
11
import java.util.Arrays;
11
import java.util.Arrays;
12
import java.util.Collection;
12
import java.util.Collection;
13
import java.util.HashSet;
14
import java.util.Set;
15
13
16
import org.eclipse.jface.action.IToolBarManager;
14
import org.eclipse.jface.action.IToolBarManager;
17
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
15
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
Lines 25-34 Link Here
25
import org.eclipse.mylyn.internal.jira.ui.actions.NewSubTaskAction;
23
import org.eclipse.mylyn.internal.jira.ui.actions.NewSubTaskAction;
26
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
24
import org.eclipse.mylyn.tasks.core.RepositoryOperation;
27
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
25
import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
28
import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
29
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
30
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
26
import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
31
import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
32
import org.eclipse.swt.SWT;
27
import org.eclipse.swt.SWT;
33
import org.eclipse.swt.custom.CCombo;
28
import org.eclipse.swt.custom.CCombo;
34
import org.eclipse.swt.custom.StyledText;
29
import org.eclipse.swt.custom.StyledText;
Lines 398-433 Link Here
398
		return super.hasContentAssist(repositoryOperation);
393
		return super.hasContentAssist(repositoryOperation);
399
	}
394
	}
400
395
401
	/**
402
	 * This method is duplicated in NewJiraTaskEditor for now.
403
	 */
404
	@Override
405
	public SearchHitCollector getDuplicateSearchCollector(String name) {
406
		String duplicateDetectorName = "default".equals(name) ? "Stack Trace" : name;
407
		Set<AbstractDuplicateDetector> detectors = getDuplicateSearchCollectorsList();
408
409
		for (AbstractDuplicateDetector detector : detectors) {
410
			if (duplicateDetectorName.equals(detector.getName())) {
411
				return detector.getSearchHitCollector(repository, taskData);
412
			}
413
		}
414
		return null;
415
	}
416
417
	/**
418
	 * This method is duplicated in NewJiraTaskEditor for now.
419
	 */
420
	@Override
421
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
422
		Set<AbstractDuplicateDetector> detectors = new HashSet<AbstractDuplicateDetector>();
423
		for (AbstractDuplicateDetector detector : TasksUiPlugin.getDefault().getDuplicateSearchCollectorsList()) {
424
			if (detector.getKind() == null || detector.getKind().equals(getConnector().getConnectorKind())) {
425
				detectors.add(detector);
426
			}
427
		}
428
		return detectors;
429
	}
430
431
	@Override
396
	@Override
432
	protected void fillToolBar(IToolBarManager toolBarManager) {
397
	protected void fillToolBar(IToolBarManager toolBarManager) {
433
		if (taskData != null && !taskData.isNew()) {
398
		if (taskData != null && !taskData.isNew()) {
(-)src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java (-1 / +18 lines)
Lines 1143-1153 Link Here
1143
	}
1143
	}
1144
1144
1145
	protected SearchHitCollector getDuplicateSearchCollector(String name) {
1145
	protected SearchHitCollector getDuplicateSearchCollector(String name) {
1146
		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
1147
		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
1148
1149
		for (AbstractDuplicateDetector detector : allDetectors) {
1150
			if (detector.getName().equals(duplicateDetectorName)) {
1151
				return detector.getSearchHitCollector(repository, taskData);
1152
			}
1153
		}
1154
		// didn't find it
1146
		return null;
1155
		return null;
1147
	}
1156
	}
1148
1157
1149
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
1158
	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
1150
		return null;
1159
		Set<AbstractDuplicateDetector> duplicateDetectors = new HashSet<AbstractDuplicateDetector>();
1160
		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
1161
				.getDuplicateSearchCollectorsList()) {
1162
			if (abstractDuplicateDetector.getKind() == null
1163
					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
1164
				duplicateDetectors.add(abstractDuplicateDetector);
1165
			}
1166
		}
1167
		return duplicateDetectors;
1151
	}
1168
	}
1152
1169
1153
	public boolean searchForDuplicates() {
1170
	public boolean searchForDuplicates() {

Return to bug 198614