diff options
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core')
10 files changed, 77 insertions, 97 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF index 0d72ae6ef..b85b4f080 100644 --- a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.tests.cvs.core; singleton:=true -Bundle-Version: 3.4.500.qualifier +Bundle-Version: 3.4.600.qualifier Bundle-Activator: org.eclipse.team.tests.ccvs.core.TeamCVSTestPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/tests/org.eclipse.team.tests.cvs.core/pom.xml b/tests/org.eclipse.team.tests.cvs.core/pom.xml index 050a2a345..dbe551552 100644 --- a/tests/org.eclipse.team.tests.cvs.core/pom.xml +++ b/tests/org.eclipse.team.tests.cvs.core/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.tests.cvs.core</artifactId> - <version>3.4.500-SNAPSHOT</version> + <version>3.4.600-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java index 5478d4e32..f90fe7f8b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java @@ -16,19 +16,21 @@ package org.eclipse.team.tests.ccvs.core.subscriber; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.synchronize.SyncInfo; -import org.eclipse.team.internal.ccvs.core.*; +import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber; +import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; +import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.tests.ccvs.core.CVSTestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests the CVSMergeSubscriber */ @@ -102,9 +104,7 @@ public class CVSCompareSubscriberTest extends CVSSyncSubscriberTest { SyncInfo.ADDITION}); } - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { getSyncInfoSource().tearDown(); super.tearDown(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java index c00d45005..21c3ba380 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java @@ -16,9 +16,6 @@ package org.eclipse.team.tests.ccvs.core.subscriber; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -37,6 +34,9 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; import org.eclipse.team.tests.ccvs.core.CVSTestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests the CVSMergeSubscriber @@ -355,8 +355,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { // scrub the project contents IResource[] members = project.members(); - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { if (resource.getName().equals(".project")) continue; delete(resource, IResource.FORCE, DEFAULT_MONITOR); @@ -548,9 +547,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { SyncInfo.IN_SYNC}); } - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { getSyncInfoSource().tearDown(); super.tearDown(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java index 7b6707aec..a526c63ea 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java @@ -97,10 +97,12 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { return (CVSSyncTreeSubscriber)getWorkspaceSubscriber(); } - /* (non-Javadoc) - * + /* * The shareProject method is invoked when creating new projects. - * @see org.eclipse.team.tests.ccvs.core.EclipseTest#shareProject(org.eclipse.core.resources.IProject) + * + * @see + * org.eclipse.team.tests.ccvs.core.EclipseTest#shareProject(org.eclipse.core. + * resources.IProject) */ @Override protected void shareProject(final IProject project) throws TeamException, CoreException { @@ -196,9 +198,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { registerSubscriberListener(getSubscriber()); } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.EclipseTest#deleteResources(org.eclipse.core.resources.IResource[]) - */ @Override protected void deleteResources(IResource[] resources) throws TeamException, CoreException { IResource[] affected = collect(resources, new ResourceCondition(), IResource.DEPTH_INFINITE); @@ -220,9 +219,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { return deregisterSubscriberListener(getSubscriber()); } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.EclipseTest#commitResources(org.eclipse.core.resources.IResource[]) - */ @Override protected void commitResources(IResource[] resources, int depth) throws TeamException, CVSException, CoreException { IResource[] affected = collect(resources, new ResourceCondition() { @@ -242,9 +238,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { } } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.EclipseTest#unmanageResources(org.eclipse.core.resources.IResource[]) - */ @Override protected void unmanageResources(IResource[] resources) throws CoreException, TeamException { IResource[] affected = collect(resources, new ResourceCondition() { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java index 85217b8d6..cb322be6f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java @@ -27,38 +27,28 @@ class TestCommitOperation extends WorkspaceCommitOperation { super(null, elements, override); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob() - */ + @Override protected boolean canRunAsJob() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForComment(org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.resources.IResource[]) - */ + @Override protected String promptForComment(RepositoryManager manager, IResource[] resourcesToCommit) { return "dummy comment"; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForConflicts(org.eclipse.team.core.synchronize.SyncInfoSet) - */ + @Override protected int promptForConflicts(SyncInfoSet syncSet) { this.prompted = true; return 0; // ok to commit all conflicts } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForResourcesToBeAdded(org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.resources.IResource[]) - */ + @Override protected IResource[] promptForResourcesToBeAdded(RepositoryManager manager, IResource[] unadded) { return unadded; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForConflictHandling(org.eclipse.team.core.synchronize.SyncInfoSet) - */ + @Override protected boolean promptForConflictHandling(SyncInfoSet syncSet) { return true; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java index 8bd8cc0d4..2b991f863 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java @@ -25,16 +25,12 @@ public class TestOverrideAndUpdateOperation extends OverrideAndUpdateSubscriberO super(null, elements); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob() - */ + @Override protected boolean canRunAsJob() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#promptForOverwrite(org.eclipse.team.core.synchronize.SyncInfoSet) - */ + @Override protected boolean promptForOverwrite(SyncInfoSet syncSet) { TestOverrideAndUpdateOperation.this.prompted = true; return true; diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java index 1963cc9ff..f9df87569 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java @@ -37,36 +37,33 @@ class TestUpdateOperation extends WorkspaceUpdateOperation { super(null, elements, false); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob() - */ + @Override protected boolean canRunAsJob() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#warnAboutFailedResources(org.eclipse.team.core.synchronize.SyncInfoSet) - */ + @Override protected void warnAboutFailedResources(SyncInfoSet syncSet) { return; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#promptForOverwrite(org.eclipse.team.core.synchronize.SyncInfoSet) - */ + @Override protected boolean promptForOverwrite(SyncInfoSet syncSet) { EclipseTest.fail("Should never prompt on update, simply update nodes that are valid."); return false; } + @Override protected void safeUpdate(IProject project, IResource[] resources, LocalOption[] localOptions, IProgressMonitor monitor) throws TeamException { try { UpdateOnlyMergableOperation operation = new UpdateOnlyMergableOperation(getPart(), project, resources, localOptions) { + @Override public ISynchronizationScope buildScope(IProgressMonitor monitor) throws InterruptedException, CVSException { if (getScopeManager() == null) { // manager = createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings()); ReflectionUtils.setField(this, "manager", createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings())); BuildScopeOperation op = new BuildScopeOperation(getPart(), getScopeManager()) { + @Override protected boolean promptForInputChange(String requestPreviewMessage, IProgressMonitor monitor) { return false; // do not prompt } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java index 81a9145b3..2e98c7369 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java @@ -17,18 +17,23 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import junit.framework.Test; - -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ccvs.core.CVSException; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.core.subscribers.*; +import org.eclipse.team.internal.core.subscribers.ActiveChangeSet; +import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager; +import org.eclipse.team.internal.core.subscribers.ChangeSet; +import org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener; import org.eclipse.team.tests.ccvs.core.EclipseTest; +import junit.framework.Test; + /** * Tests for CVS commit sets */ @@ -37,21 +42,26 @@ public class CommitSetTests extends EclipseTest { private List<ChangeSet> addedSets = new ArrayList<>(); private List<ChangeSet> removedSets = new ArrayList<>(); private IChangeSetChangeListener listener = new IChangeSetChangeListener() { - public void setAdded(ChangeSet set) { + @Override + public void setAdded(ChangeSet set) { addedSets.add(set); } - public void setRemoved(ChangeSet set) { + @Override + public void setRemoved(ChangeSet set) { removedSets.add(set); } - public void nameChanged(ChangeSet set) { + @Override + public void nameChanged(ChangeSet set) { // TODO Auto-generated method stub } - public void defaultSetChanged(ChangeSet oldDefault, ChangeSet set) { + @Override + public void defaultSetChanged(ChangeSet oldDefault, ChangeSet set) { // TODO Auto-generated method stub } - public void resourcesChanged(ChangeSet set, IPath[] paths) { + @Override + public void resourcesChanged(ChangeSet set, IPath[] paths) { // TODO Auto-generated method stub } @@ -143,17 +153,13 @@ public class CommitSetTests extends EclipseTest { fail("Did not receive expected set removed event"); } - /* (non-Javadoc) - * @see org.eclipse.core.tests.harness.EclipseWorkspaceTest#setUp() - */ + @Override protected void setUp() throws Exception { super.setUp(); CVSUIPlugin.getPlugin().getChangeSetManager().addListener(listener); } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.EclipseTest#tearDown() - */ + @Override protected void tearDown() throws Exception { super.tearDown(); CVSUIPlugin.getPlugin().getChangeSetManager().removeListener(listener); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java index 64bb7dbf1..a7e1eec16 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java @@ -13,8 +13,6 @@ *******************************************************************************/ package org.eclipse.team.tests.ccvs.ui; -import junit.framework.AssertionFailedError; - import org.eclipse.compare.structuremergeviewer.IDiffContainer; import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.resources.IProject; @@ -59,6 +57,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.IPage; +import junit.framework.AssertionFailedError; + /** * SyncInfoSource that obtains SyncInfo from the SynchronizeView's SyncSet. */ @@ -68,6 +68,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour super(); } + @Override public SyncInfo getSyncInfo(Subscriber subscriber, IResource resource) throws TeamException { // Wait for the collector getCollector(subscriber); @@ -100,9 +101,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour return info; } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#getDiff(org.eclipse.team.core.subscribers.Subscriber, org.eclipse.core.resources.IResource) - */ + @Override public IDiff getDiff(Subscriber subscriber, IResource resource) throws CoreException { SyncInfo info = getSyncInfo(subscriber, resource); if (info == null || info.getKind() == SyncInfo.IN_SYNC) { @@ -114,10 +113,10 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour public static SubscriberParticipant getParticipant(Subscriber subscriber) { // show the sync view ISynchronizeParticipantReference[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - for (int i = 0; i < participants.length; i++) { + for (ISynchronizeParticipantReference participant2 : participants) { ISynchronizeParticipant participant; try { - participant = participants[i].getParticipant(); + participant = participant2.getParticipant(); } catch (TeamException e) { return null; } @@ -139,21 +138,29 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour SynchronizeModelManager manager = (SynchronizeModelManager)page.getConfiguration().getProperty(SynchronizePageConfiguration.P_MODEL_MANAGER); AbstractSynchronizeModelProvider provider = (AbstractSynchronizeModelProvider)manager.getActiveModelProvider(); provider.waitUntilDone(new IProgressMonitor() { + @Override public void beginTask(String name, int totalWork) { } + @Override public void done() { } + @Override public void internalWorked(double work) { } + @Override public boolean isCanceled() { return false; } + @Override public void setCanceled(boolean value) { } + @Override public void setTaskName(String name) { } + @Override public void subTask(String name) { } + @Override public void worked(int work) { while (Display.getCurrent().readAndDispatch()) {} } @@ -161,9 +168,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour return syncInfoCollector; } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#assertProjectRemoved(org.eclipse.team.core.subscribers.TeamSubscriber, org.eclipse.core.resources.IProject) - */ + @Override protected void assertProjectRemoved(Subscriber subscriber, IProject project) { super.assertProjectRemoved(subscriber, project); SyncInfoTree set = getCollector(subscriber).getSyncInfoSet(); @@ -172,9 +177,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour } } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#createMergeSubscriber(org.eclipse.core.resources.IProject, org.eclipse.team.internal.ccvs.core.CVSTag, org.eclipse.team.internal.ccvs.core.CVSTag) - */ + @Override public CVSMergeSubscriber createMergeSubscriber(IProject project, CVSTag root, CVSTag branch, boolean isModelSync) { CVSMergeSubscriber mergeSubscriber = super.createMergeSubscriber(project, root, branch, isModelSync); SubscriberParticipant participant = new MergeSynchronizeParticipant(mergeSubscriber); @@ -182,6 +185,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour return mergeSubscriber; } + @Override public Subscriber createWorkspaceSubscriber() throws TeamException { ISynchronizeManager synchronizeManager = TeamUI.getSynchronizeManager(); ISynchronizeParticipantReference[] participants = synchronizeManager.get(WorkspaceSynchronizeParticipant.ID); @@ -194,9 +198,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour } - /* (non-Javadoc) - * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#createCompareSubscriber(org.eclipse.core.resources.IProject, org.eclipse.team.internal.ccvs.core.CVSTag) - */ + @Override public CVSCompareSubscriber createCompareSubscriber(IResource resource, CVSTag tag) { CVSCompareSubscriber s = super.createCompareSubscriber(resource, tag); SubscriberParticipant participant = new CompareParticipant(s); @@ -217,8 +219,8 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour } } IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - ISynchronizeModelElement child = (ISynchronizeModelElement)children[i]; + for (IDiffElement element : children) { + ISynchronizeModelElement child = (ISynchronizeModelElement)element; SyncInfo info = findSyncInfo(child, resource); if (info != null) return info; @@ -226,7 +228,8 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour return null; } - public void assertViewMatchesModel(Subscriber subscriber) { + @Override + public void assertViewMatchesModel(Subscriber subscriber) { // Getting the collector waits for the subscriber input handlers getCollector(subscriber); ISynchronizeModelElement root = getModelRoot(subscriber); @@ -279,11 +282,9 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour (children == null ? 0: children.length) + " but the view has " + (items == null ? 0 : items.length)); } - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { TreeItem foundItem = null; - for (int j = 0; j < items.length; j++) { - TreeItem item = items[j]; + for (TreeItem item : items) { if (item.getData() == element) { foundItem = item; break; |