Attachment 78792 Details for Bug 198614 – Patch

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

[patch] Patch

patch198614.txt (text/plain), 12.13 KB, created by Frank Becker

on 2007-09-19 17:16:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-09-19 17:16:46 EDT

Size: 12.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java,v
>retrieving revision 1.79
>diff -u -r1.79 BugzillaTaskEditor.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java	22 Aug 2007 20:50:02 -0000	1.79
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java	19 Sep 2007 20:55:05 -0000
>@@ -12,9 +12,7 @@
> import java.util.ArrayList;
> import java.util.Calendar;
> import java.util.Date;
>-import java.util.HashSet;
> import java.util.List;
>-import java.util.Set;
> 
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jface.dialogs.Dialog;
>@@ -29,13 +27,11 @@
> import org.eclipse.mylyn.tasks.core.AbstractTask;
> import org.eclipse.mylyn.tasks.core.RepositoryOperation;
> import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
>-import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
> import org.eclipse.mylyn.tasks.ui.DatePicker;
> import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
> import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
>-import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>@@ -606,39 +602,6 @@
> 	}
> 
> 	/**
>-	 * This method is duplicated in NewBugzillaTaskEditor for now.
>-	 */
>-	@Override
>-	public SearchHitCollector getDuplicateSearchCollector(String name) {
>-		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
>-		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
>-
>-		for (AbstractDuplicateDetector detector : allDetectors) {
>-			if (detector.getName().equals(duplicateDetectorName)) {
>-				return detector.getSearchHitCollector(repository, taskData);
>-			}
>-		}
>-		// didn't find it
>-		return null;
>-	}
>-
>-	/**
>-	 * This method is duplicated in BugzillaTaskEditor for now.
>-	 */
>-	@Override
>-	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
>-		Set<AbstractDuplicateDetector> bugzillaDuplicateDetectors = new HashSet<AbstractDuplicateDetector>();
>-		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
>-				.getDuplicateSearchCollectorsList()) {
>-			if (abstractDuplicateDetector.getKind() == null
>-					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
>-				bugzillaDuplicateDetectors.add(abstractDuplicateDetector);
>-			}
>-		}
>-		return bugzillaDuplicateDetectors;
>-	}
>-
>-	/**
> 	 * @author Frank Becker (bug 198027)
> 	 */
> 	@Override
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java,v
>retrieving revision 1.41
>diff -u -r1.41 NewBugzillaTaskEditor.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java	17 Aug 2007 22:51:28 -0000	1.41
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugzillaTaskEditor.java	19 Sep 2007 20:55:07 -0000
>@@ -7,9 +7,6 @@
>  *******************************************************************************/
> package org.eclipse.mylyn.internal.bugzilla.ui.editor;
> 
>-import java.util.HashSet;
>-import java.util.Set;
>-
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.fieldassist.ContentProposalAdapter;
>@@ -17,10 +14,7 @@
> import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
> import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
>-import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
>-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
>-import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
>@@ -98,39 +92,6 @@
> 		toolkit.paintBordersFor(peopleComposite);
> 	}
> 
>-	@Override
>-	/**
>-	 * This method is duplicated in BugzillaTaskEditor for now.
>-	 */
>-	public SearchHitCollector getDuplicateSearchCollector(String name) {
>-		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
>-		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
>-
>-		for (AbstractDuplicateDetector detector : allDetectors) {
>-			if (detector.getName().equals(duplicateDetectorName)) {
>-				return detector.getSearchHitCollector(repository, taskData);
>-			}
>-		}
>-		// didn't find it
>-		return null;
>-	}
>-
>-	@Override
>-	/**
>-	 * This method is duplicated in BugzillaTaskEditor for now.
>-	 */
>-	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
>-		Set<AbstractDuplicateDetector> bugzillaDuplicateDetectors = new HashSet<AbstractDuplicateDetector>();
>-		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
>-				.getDuplicateSearchCollectorsList()) {
>-
>-			if (abstractDuplicateDetector.getKind() == null
>-					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
>-				bugzillaDuplicateDetectors.add(abstractDuplicateDetector);
>-			}
>-		}
>-		return bugzillaDuplicateDetectors;
>-	}
> 
> 	@Override
> 	public void submitToRepository() {
>#P org.eclipse.mylyn.jira.ui
>Index: src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java,v
>retrieving revision 1.13
>diff -u -r1.13 NewJiraTaskEditor.java
>--- src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java	2 Aug 2007 05:06:40 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/jira/ui/editor/NewJiraTaskEditor.java	19 Sep 2007 20:55:22 -0000
>@@ -8,13 +8,7 @@
> 
> package org.eclipse.mylyn.internal.jira.ui.editor;
> 
>-import java.util.HashSet;
>-import java.util.Set;
>-
>-import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
>-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
>-import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
> import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.IEditorSite;
> import org.eclipse.ui.forms.editor.FormEditor;
>@@ -33,36 +27,5 @@
> 		super.init(site, input);
> 
> 		setExpandAttributeSection(true);
>-	}
>-	
>-	/**
>-	 * This method is duplicated in JiraTaskEditor for now.
>-	 */
>-	@Override
>-	public SearchHitCollector getDuplicateSearchCollector(String name) {
>-		String duplicateDetectorName = "default".equals(name) ? "Stack Trace" : name;
>-		Set<AbstractDuplicateDetector> detectors = getDuplicateSearchCollectorsList();
>-
>-		for (AbstractDuplicateDetector detector : detectors) {
>-			if (duplicateDetectorName.equals(detector.getName())) {
>-				return detector.getSearchHitCollector(repository, taskData);
>-			}
>-		}
>-		return null;
>-	}
>-
>-	/**
>-	 * This method is duplicated in JiraTaskEditor for now.
>-	 */
>-	@Override
>-	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
>-		Set<AbstractDuplicateDetector> detectors = new HashSet<AbstractDuplicateDetector>();
>-		for (AbstractDuplicateDetector detector : TasksUiPlugin.getDefault().getDuplicateSearchCollectorsList()) {
>-			if (detector.getKind() == null || detector.getKind().equals(getConnector().getConnectorKind())) {
>-				detectors.add(detector);
>-			}
>-		}
>-		return detectors;
>-	}
>-	
>+	}	
> }
>Index: src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditor.java,v
>retrieving revision 1.41
>diff -u -r1.41 JiraTaskEditor.java
>--- src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditor.java	15 Sep 2007 01:31:14 -0000	1.41
>+++ src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditor.java	19 Sep 2007 20:55:22 -0000
>@@ -10,8 +10,6 @@
> 
> import java.util.Arrays;
> import java.util.Collection;
>-import java.util.HashSet;
>-import java.util.Set;
> 
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.fieldassist.ContentProposalAdapter;
>@@ -25,10 +23,7 @@
> import org.eclipse.mylyn.internal.jira.ui.actions.NewSubTaskAction;
> import org.eclipse.mylyn.tasks.core.RepositoryOperation;
> import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
>-import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
>-import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
>-import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.CCombo;
> import org.eclipse.swt.custom.StyledText;
>@@ -398,36 +393,6 @@
> 		return super.hasContentAssist(repositoryOperation);
> 	}
> 
>-	/**
>-	 * This method is duplicated in NewJiraTaskEditor for now.
>-	 */
>-	@Override
>-	public SearchHitCollector getDuplicateSearchCollector(String name) {
>-		String duplicateDetectorName = "default".equals(name) ? "Stack Trace" : name;
>-		Set<AbstractDuplicateDetector> detectors = getDuplicateSearchCollectorsList();
>-
>-		for (AbstractDuplicateDetector detector : detectors) {
>-			if (duplicateDetectorName.equals(detector.getName())) {
>-				return detector.getSearchHitCollector(repository, taskData);
>-			}
>-		}
>-		return null;
>-	}
>-
>-	/**
>-	 * This method is duplicated in NewJiraTaskEditor for now.
>-	 */
>-	@Override
>-	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
>-		Set<AbstractDuplicateDetector> detectors = new HashSet<AbstractDuplicateDetector>();
>-		for (AbstractDuplicateDetector detector : TasksUiPlugin.getDefault().getDuplicateSearchCollectorsList()) {
>-			if (detector.getKind() == null || detector.getKind().equals(getConnector().getConnectorKind())) {
>-				detectors.add(detector);
>-			}
>-		}
>-		return detectors;
>-	}
>-
> 	@Override
> 	protected void fillToolBar(IToolBarManager toolBarManager) {
> 		if (taskData != null && !taskData.isNew()) {
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java,v
>retrieving revision 1.225
>diff -u -r1.225 AbstractRepositoryTaskEditor.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	14 Sep 2007 01:11:49 -0000	1.225
>+++ src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	19 Sep 2007 20:55:58 -0000
>@@ -1143,11 +1143,28 @@
> 	}
> 
> 	protected SearchHitCollector getDuplicateSearchCollector(String name) {
>+		String duplicateDetectorName = name.equals("default") ? "Stack Trace" : name;
>+		Set<AbstractDuplicateDetector> allDetectors = getDuplicateSearchCollectorsList();
>+
>+		for (AbstractDuplicateDetector detector : allDetectors) {
>+			if (detector.getName().equals(duplicateDetectorName)) {
>+				return detector.getSearchHitCollector(repository, taskData);
>+			}
>+		}
>+		// didn't find it
> 		return null;
> 	}
> 
> 	protected Set<AbstractDuplicateDetector> getDuplicateSearchCollectorsList() {
>-		return null;
>+		Set<AbstractDuplicateDetector> duplicateDetectors = new HashSet<AbstractDuplicateDetector>();
>+		for (AbstractDuplicateDetector abstractDuplicateDetector : TasksUiPlugin.getDefault()
>+				.getDuplicateSearchCollectorsList()) {
>+			if (abstractDuplicateDetector.getKind() == null
>+					|| abstractDuplicateDetector.getKind().equals(getConnector().getConnectorKind())) {
>+				duplicateDetectors.add(abstractDuplicateDetector);
>+			}
>+		}
>+		return duplicateDetectors;
> 	}
> 
> 	public boolean searchForDuplicates() {

Actions: View | Diff

Attachments on bug 198614: 78792 | 78793