Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java50
1 files changed, 19 insertions, 31 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
index 98253f703..9faaf017d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
@@ -18,7 +18,7 @@ import java.util.Arrays;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.*;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.osgi.util.NLS;
@@ -44,6 +44,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
* Actions for the compare particpant's toolbar
*/
public class CompareParticipantActionContribution extends SynchronizePageActionGroup {
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
@@ -68,6 +69,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
private SyncInfoFilter contentComparison = new SyncInfoFilter() {
private SyncInfoFilter contentCompare = new SyncInfoFilter.ContentComparisonSyncInfoFilter();
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
// Want to select infos whose contents do not match
return !contentCompare.select(info, monitor);
@@ -78,6 +80,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
final SyncInfoFilter regexFilter = createRegexFilter();
if (isConsiderContents() && regexFilter != null) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
return contentComparison.select(info, monitor)
&& !regexFilter.select(info, monitor);
@@ -85,12 +88,14 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
};
} else if (isConsiderContents()) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
return contentComparison.select(info, monitor);
}
};
} else if (regexFilter != null) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
// want to select infos which contain at least one unmatched difference
return !regexFilter.select(info, monitor);
@@ -118,9 +123,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
setSubscriber(subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscriber.SubscriberParticipant#setSubscriber(org.eclipse.team.core.subscribers.Subscriber)
- */
+ @Override
protected void setSubscriber(Subscriber subscriber) {
super.setSubscriber(subscriber);
setSyncInfoFilter(createSyncInfoFilter());
@@ -135,9 +138,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).addPreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getName()
- */
+ @Override
public String getName() {
return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { getSubscriber().getName(), Utils.convertSelection(getSubscriber().roots()) });
}
@@ -193,9 +194,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
return (CVSCompareSubscriber)getSubscriber();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscribers.SubscriberParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
configuration.addMenuGroup(
@@ -207,18 +206,14 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
configuration.addActionContribution(new CompareParticipantActionContribution());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#dispose()
- */
+ @Override
public void dispose() {
super.dispose();
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).removePreferenceChangeListener(this); //$NON-NLS-1$
getCVSCompareSubscriber().dispose();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
- */
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
SyncInfoFilter filter = createSyncInfoFilter();
@@ -230,32 +225,25 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getLongTaskName()
- */
+ @Override
protected String getLongTaskName() {
return getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName()
- */
+ @Override
protected String getShortTaskName() {
return CVSUIMessages.Participant_comparing;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSParticipant#createChangeSetCapability()
- */
- protected CVSChangeSetCapability createChangeSetCapability() {
+ @Override
+ protected CVSChangeSetCapability createChangeSetCapability() {
return new CVSChangeSetCapability() {
- public ActiveChangeSetManager getActiveChangeSetManager() {
+ @Override
+ public ActiveChangeSetManager getActiveChangeSetManager() {
return CVSUIPlugin.getPlugin().getChangeSetManager();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#enableActiveChangeSetsFor(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
- public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
+ @Override
+ public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
return super.enableActiveChangeSetsFor(configuration) ||
configuration.getComparisonType() == ISynchronizePageConfiguration.TWO_WAY;
}

Back to the top