diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java index d9b79555b..f874c69d1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java @@ -27,7 +27,7 @@ public abstract class AbstractCompareInput implements ICompareInput { private ITypedElement right; private int kind; private final ListenerList listeners = new ListenerList(ListenerList.IDENTITY); - + public AbstractCompareInput(int kind, ITypedElement ancestor, ITypedElement left, @@ -49,7 +49,7 @@ public abstract class AbstractCompareInput implements ICompareInput { getChangeNotifier().connect(this); } } - + /* (non-Javadoc) * @see org.eclipse.compare.structuremergeviewer.DiffNode#removeCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener) */ @@ -61,7 +61,7 @@ public abstract class AbstractCompareInput implements ICompareInput { getChangeNotifier().disconnect(this); } } - + /** * Fire a compare input change event. * This method must be called from the UI thread. @@ -84,7 +84,7 @@ public abstract class AbstractCompareInput implements ICompareInput { } } } - + private boolean containsListener(ICompareInputChangeListener listener) { if (listeners.isEmpty()) return false; @@ -120,11 +120,11 @@ public abstract class AbstractCompareInput implements ICompareInput { public Image getImage() { return getMainElement().getImage(); } - + /** * Return the main non-null element that identifies * this input. By default, the left is returned if non-null. - * If the left is null, the right is returned. If both the + * If the left is null, the right is returned. If both the * left and right are null the ancestor is returned. * @return the main non-null element that identifies * this input @@ -152,7 +152,7 @@ public abstract class AbstractCompareInput implements ICompareInput { public void setKind(int kind) { this.kind = kind; } - + /* (non-Javadoc) * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getLeft() */ @@ -176,7 +176,7 @@ public abstract class AbstractCompareInput implements ICompareInput { public ITypedElement getRight() { return right; } - + /** * Return the change notifier that will call {@link #fireChange()} * when the state of the compare input changes. |