diff options
author | Tomasz Zarna | 2013-05-16 18:31:53 -0400 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2013-05-21 19:58:38 -0400 |
commit | db4f4aec09501a601b2cc388524844a9c058021f (patch) | |
tree | 6c33f99172b155aa6f2eb823e20835fb197a6f1a | |
parent | d44163c9b96548867b2422e38223782e0c13a59a (diff) | |
download | org.eclipse.mylyn.reviews-db4f4aec09501a601b2cc388524844a9c058021f.zip org.eclipse.mylyn.reviews-db4f4aec09501a601b2cc388524844a9c058021f.tar.gz org.eclipse.mylyn.reviews-db4f4aec09501a601b2cc388524844a9c058021f.tar.xz |
remove unnecessary code, organize imports etc
Change-Id: I7afc56ba85c856a1101377057fa63c35dd770388
19 files changed, 10 insertions, 118 deletions
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritLabel.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritLabel.java deleted file mode 100644 index ad4f085..0000000 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritLabel.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Tasktop Technologies and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Tasktop Technologies - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylyn.internal.gerrit.core.client.data; - -/** - * @author Steffen Pingel - */ -public class GerritLabel { - - private GerritPerson disliked; - -} diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritQueryResult.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritQueryResult.java index 40c8e2c..4674c95 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritQueryResult.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritQueryResult.java @@ -12,7 +12,6 @@ package org.eclipse.mylyn.internal.gerrit.core.client.data; import java.sql.Timestamp; -import java.util.Map; import org.eclipse.mylyn.internal.gerrit.core.GerritUtil; @@ -32,8 +31,6 @@ public class GerritQueryResult { private String id; - private Map<String, GerritLabel> labels; - private GerritPerson owner; private String project; @@ -73,10 +70,6 @@ public class GerritQueryResult { return id; } - public Map<String, GerritLabel> getLabels() { - return labels; - } - public int getNumber() { return _number; } diff --git a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteFactoryTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteFactoryTest.java index 85b32ed..83165bd 100644 --- a/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteFactoryTest.java +++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/internal/gerrit/core/remote/GerritRemoteFactoryTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Tasktop Technologies and others. + * Copyright (c) 2012, 2013 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -378,7 +378,6 @@ public class GerritRemoteFactoryTest extends TestCase { IReviewItemSet testPatchSet = getReview().getSets().get(1); PatchSetContentIdRemoteFactory patchFactory = factoryProvider.getReviewItemSetContentFactory(); - List<IFileItem> fileItems = testPatchSet.getItems(); TestRemoteObserver<IReviewItemSet, List<IFileItem>> patchSetListener = new TestRemoteObserver<IReviewItemSet, List<IFileItem>>( patchFactory); RemoteEmfConsumer<IReviewItemSet, List<IFileItem>, PatchSetContent, String, String> patchSetConsumer = patchFactory.getConsumerForRemoteKey( diff --git a/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/GerritCommentLinkDetectorTest.java b/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/GerritCommentLinkDetectorTest.java index e842485..c30d197 100644 --- a/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/GerritCommentLinkDetectorTest.java +++ b/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/GerritCommentLinkDetectorTest.java @@ -69,7 +69,6 @@ public class GerritCommentLinkDetectorTest { public void testTaskPatternInvalid() { commentLinks.add(COMMENT_LINK_TASK_INVALID); GerritCommentLinkDetector detector = new GerritCommentLinkDetector(repository, commentLinks); - UrlHyperlink expected = new UrlHyperlink(new Region(0, 9), "http://tracker.mylyn.org/123"); assertEquals("null", String.valueOf(detector.findHyperlinks("Task: 123", 0, 0))); } diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenCommitUiFactory.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenCommitUiFactory.java index 4ee03cf..8b37a54 100644 --- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenCommitUiFactory.java +++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/factories/OpenCommitUiFactory.java @@ -21,18 +21,12 @@ import org.eclipse.mylyn.reviews.core.model.IReviewItemSet; import org.eclipse.mylyn.reviews.ui.spi.factories.IUiContext; import org.eclipse.swt.widgets.Display; -import com.google.gerrit.reviewdb.PatchSet; - /** * @author Steffen Pingel * @author Miles Parker */ public class OpenCommitUiFactory extends AbstractPatchSetUiFactory { - private PatchSet base; - - private PatchSet target; - public OpenCommitUiFactory(IUiContext context, IReviewItemSet set) { super("Open Commit", context, set); } diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java index a13b9eb..bb2649b 100644 --- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java +++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java @@ -14,7 +14,6 @@ package org.eclipse.mylyn.internal.gerrit.ui.operations; import org.eclipse.mylyn.internal.gerrit.core.operations.GerritOperation; import org.eclipse.mylyn.internal.gerrit.core.operations.SubmitRequest; import org.eclipse.mylyn.internal.gerrit.ui.GerritUiPlugin; -import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextEditor; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -33,8 +32,6 @@ public class SubmitDialog extends GerritOperationDialog { private final PatchSet patchSet; - private RichTextEditor messageEditor; - public SubmitDialog(Shell parentShell, ITask task, PatchSet patchSet) { super(parentShell, task); this.patchSet = patchSet; diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/providers/OpenCompareEditorProvider.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/providers/OpenCompareEditorProvider.java index 9043114..16810b2 100644 --- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/providers/OpenCompareEditorProvider.java +++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/providers/OpenCompareEditorProvider.java @@ -20,10 +20,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylyn.internal.gerrit.ui.GerritReviewBehavior; import org.eclipse.mylyn.internal.reviews.ui.compare.FileItemCompareEditorInput; import org.eclipse.mylyn.internal.reviews.ui.views.ReviewExplorer; +import org.eclipse.mylyn.reviews.core.model.IComment; import org.eclipse.mylyn.reviews.core.model.IFileItem; import org.eclipse.mylyn.reviews.core.model.IFileVersion; -import org.eclipse.mylyn.reviews.core.model.IReview; -import org.eclipse.mylyn.reviews.core.model.IComment; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; import org.eclipse.ui.IActionBars; @@ -101,19 +100,6 @@ public class OpenCompareEditorProvider extends CommonActionProvider { return null; } - private static IReview getReviewFor(Object element) { - if (element instanceof IComment) { - return ((IComment) element).getReview(); - } - if (element instanceof IFileVersion) { - return ((IFileVersion) element).getReview(); - } - if (element instanceof IFileItem) { - return ((IFileItem) element).getReview(); - } - return null; - } - @Override public void fillActionBars(IActionBars actionBars) { if (openAction.isEnabled()) { diff --git a/org.eclipse.mylyn.reviews.core.tests/src/org/eclipse/mylyn/reviews/core/remote/RemoteEmfFactoryTest.java b/org.eclipse.mylyn.reviews.core.tests/src/org/eclipse/mylyn/reviews/core/remote/RemoteEmfFactoryTest.java index 10df960..a0370e0 100644 --- a/org.eclipse.mylyn.reviews.core.tests/src/org/eclipse/mylyn/reviews/core/remote/RemoteEmfFactoryTest.java +++ b/org.eclipse.mylyn.reviews.core.tests/src/org/eclipse/mylyn/reviews/core/remote/RemoteEmfFactoryTest.java @@ -168,7 +168,6 @@ public class RemoteEmfFactoryTest { public void testGetConsumerForDifferentParentSameLocalKey() throws CoreException { EPackage parent1 = EcoreFactory.eINSTANCE.createEPackage(); TestRemoteFactory factory = new TestRemoteFactory(); - TestIRemoteEmfObserver<EPackage, EClass> listener1 = new TestIRemoteEmfObserver<EPackage, EClass>(factory); RemoteEmfConsumer<EPackage, EClass, TestRemoteObject, String, String> consumer1 = factory.getConsumerForRemoteKey( parent1, "remoteKeyFor Object 1"); diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java index 8a8a436..9c4ed31 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java @@ -27,7 +27,6 @@ import org.eclipse.mylyn.internal.reviews.ui.IReviewAction; import org.eclipse.mylyn.internal.reviews.ui.IReviewActionListener; import org.eclipse.mylyn.reviews.core.model.IComment; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; @@ -310,22 +309,6 @@ public abstract class ExpandablePart<T extends IComment, V extends ExpandablePar return isIncomming; } - private void highlightControl(Control client, Color highlightColor) { - if (highlightColor == null || highlightColor.isDisposed()) { - return; - } - if (!client.isDisposed()) { - if (highlightColor != null) { - client.setBackground(highlightColor); - } - if (client instanceof Composite) { - for (Control child : ((Composite) client).getChildren()) { - highlightControl(child, highlightColor); - } - } - } - } - public void dispose() { if (getSection() != null) { getSection().dispose(); diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java index 9d8018f..bb24c0f 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java @@ -42,7 +42,6 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.internal.texteditor.PropertyEventDispatcher; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.AnnotationPreferenceLookup; -import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.rulers.IContributedRulerColumn; import org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor; @@ -62,8 +61,6 @@ public class CommentAnnotationRulerColumn extends AbstractRulerColumn implements private PropertyEventDispatcher fDispatcher; - private IDocumentProvider fDocumentProvider; - public CommentAnnotationRulerColumn() { setTextInset(10); setHover(new CommentAnnotationRulerHover(this)); @@ -86,7 +83,6 @@ public class CommentAnnotationRulerColumn extends AbstractRulerColumn implements public void setEditor(ITextEditor editor) { fEditor = editor; - fDocumentProvider = fEditor.getDocumentProvider(); } public ITextEditor getEditor() { diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/providers/ReviewsLabelProvider.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/providers/ReviewsLabelProvider.java index d42b035..7e3f9fe 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/providers/ReviewsLabelProvider.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/providers/ReviewsLabelProvider.java @@ -31,6 +31,7 @@ import org.eclipse.mylyn.commons.ui.CommonImages; import org.eclipse.mylyn.internal.reviews.ui.ReviewsImages; import org.eclipse.mylyn.internal.reviews.ui.ReviewsUiPlugin; import org.eclipse.mylyn.reviews.core.model.IComment; +import org.eclipse.mylyn.reviews.core.model.ICommentContainer; import org.eclipse.mylyn.reviews.core.model.IDated; import org.eclipse.mylyn.reviews.core.model.IFileItem; import org.eclipse.mylyn.reviews.core.model.IFileVersion; @@ -39,8 +40,6 @@ import org.eclipse.mylyn.reviews.core.model.ILocation; import org.eclipse.mylyn.reviews.core.model.IReview; import org.eclipse.mylyn.reviews.core.model.IReviewItem; import org.eclipse.mylyn.reviews.core.model.IReviewItemSet; -import org.eclipse.mylyn.reviews.core.model.IComment; -import org.eclipse.mylyn.reviews.core.model.ICommentContainer; import org.eclipse.mylyn.reviews.core.model.IUser; import org.eclipse.mylyn.tasks.ui.TasksUiImages; import org.eclipse.osgi.util.NLS; diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java index c6ba526..a037645 100644 --- a/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java +++ b/tbr/org.eclipse.mylyn.reviews.tasks.core/src/org/eclipse/mylyn/reviews/tasks/core/internal/ReviewScopeNode.java @@ -10,17 +10,16 @@ *******************************************************************************/ package org.eclipse.mylyn.reviews.tasks.core.internal; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; +import org.eclipse.mylyn.reviews.tasks.core.IReviewScopeItem; import org.eclipse.mylyn.reviews.tasks.core.ITaskProperties; import org.eclipse.mylyn.reviews.tasks.core.Rating; import org.eclipse.mylyn.reviews.tasks.core.ReviewResult; import org.eclipse.mylyn.reviews.tasks.core.ReviewScope; -import org.eclipse.mylyn.reviews.tasks.core.IReviewScopeItem; /** * * @author mattk diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java index 4400f72..64ce06a 100644 --- a/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java +++ b/tbr/org.eclipse.mylyn.reviews.tasks.dsl/src/org/eclipse/mylyn/reviews/tasks/dsl/internal/ReviewDslParser.java @@ -253,8 +253,6 @@ public class ReviewDslParser extends Parser { Token set4 = null; - CommonTree set4_tree = null; - try { // ReviewDsl.g:22:3: ( 'PASSED' | 'WARNING' | 'FAILED' | 'TODO' ) // ReviewDsl.g: @@ -547,7 +545,6 @@ public class ReviewDslParser extends Parser { Token string_literal10 = null; Token string_literal11 = null; - Token s = null; List list_s = new ArrayList(); resourceDef_return resourceDef12 = null; @@ -557,7 +554,6 @@ public class ReviewDslParser extends Parser { CommonTree string_literal10_tree = null; CommonTree string_literal11_tree = null; - CommonTree s_tree = null; try { // ReviewDsl.g:36:4: ( 'Review' 'scope:' (s+= ( resourceDef | @@ -1028,8 +1024,6 @@ public class ReviewDslParser extends Parser { Token set25 = null; - CommonTree set25_tree = null; - try { // ReviewDsl.g:61:4: ( TASK_ID | INT ) // ReviewDsl.g: diff --git a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java index a54bb13..e816db0 100644 --- a/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java +++ b/tbr/org.eclipse.mylyn.reviews.tasks.ui/src/org/eclipse/mylyn/reviews/tasks/ui/internal/ReviewsUiPlugin.java @@ -11,7 +11,6 @@ package org.eclipse.mylyn.reviews.tasks.ui.internal; import org.eclipse.mylyn.reviews.tasks.core.IReviewMapper; -import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewTaskMapper; import org.eclipse.mylyn.reviews.tasks.core.internal.ReviewsUtil; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java index 3191e91..8107f4a 100644 --- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java +++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java @@ -10,19 +10,10 @@ *******************************************************************************/ package org.eclipse.mylyn.versions.tasks.mapper.generic; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.versions.core.ScmCore; import org.eclipse.mylyn.versions.core.ScmRepository; -import org.eclipse.mylyn.versions.core.spi.ScmConnector; import org.eclipse.mylyn.versions.tasks.core.IChangeSetMapping; import org.eclipse.mylyn.versions.tasks.mapper.internal.ChangeSetProvider; import org.eclipse.mylyn.versions.tasks.mapper.internal.EclipsePluginConfiguration; diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java index 673ac26..c83ae59 100644 --- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java +++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/EclipseWorkspaceRepositorySource.java @@ -12,7 +12,6 @@ package org.eclipse.mylyn.versions.tasks.mapper.internal; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import org.eclipse.core.resources.IProject; diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/RepositoryIndexerPlugin.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/RepositoryIndexerPlugin.java index f927317..b618dcb 100644 --- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/RepositoryIndexerPlugin.java +++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/internal/RepositoryIndexerPlugin.java @@ -12,7 +12,6 @@ package org.eclipse.mylyn.versions.tasks.mapper.internal; import java.io.File; -import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.versions.tasks.mapper.generic.IChangeSetIndexSearcher; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java index c5177d7..5059596 100644 --- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java +++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangeSetPage.java @@ -10,18 +10,10 @@ *******************************************************************************/ package org.eclipse.mylyn.internal.versions.tasks.ui; -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.jface.action.IToolBarManager; import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; -import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor; import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage; -import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.IManagedForm; @@ -29,14 +21,12 @@ import org.eclipse.ui.forms.widgets.TableWrapData; import org.eclipse.ui.forms.widgets.TableWrapLayout; /** - * * @author Kilian Matt - * */ public class ChangeSetPage extends TaskFormPage { public ChangeSetPage(TaskEditor editor) { - super(editor, ChangeSetPage.class.getName(),"title"); + super(editor, ChangeSetPage.class.getName(), "title"); } @Override @@ -45,17 +35,18 @@ public class ChangeSetPage extends TaskFormPage { Composite body = managedForm.getForm().getBody(); body.setLayout(new TableWrapLayout()); - createPart(body,managedForm); + createPart(body, managedForm); } + private void createPart(Composite parent, IManagedForm managedForm) { ChangesetPart part = new ChangesetPart(); managedForm.addPart(part); part.initialize(this); Control control = part.createControl(parent, managedForm.getToolkit()); - control.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB,TableWrapData.FILL_GRAB)); + control.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.FILL_GRAB)); } - public ITask getTask(){ - return ((TaskEditorInput)getEditorInput()).getTask(); + public ITask getTask() { + return ((TaskEditorInput) getEditorInput()).getTask(); } } diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java index 47ff086..cf8f41b 100644 --- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java +++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/internal/versions/tasks/ui/ChangesetPart.java @@ -206,10 +206,6 @@ public class ChangesetPart extends AbstractFormPart { private boolean includeSubTasks; - public boolean isIncludeSubTasks() { - return includeSubTasks; - } - public void setIncludeSubTasks(boolean includeSubTasks) { boolean isChanged = this.includeSubTasks ^ includeSubTasks; this.includeSubTasks = includeSubTasks; |