diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java index 681e76596..bee1ced8c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java @@ -151,7 +151,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { throw new CVSException(NLS.bind(CVSUIMessages.MergeSynchronizeParticipant_10, new String[] { id.toString() })); } - List resources = new ArrayList(); + List<IResource> resources = new ArrayList<>(); for (int i = 0; i < rootNodes.length; i++) { IMemento rootNode = rootNodes[i]; IPath path = new Path(rootNode.getString(CTX_ROOT_PATH)); @@ -166,7 +166,7 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant { if(resources.isEmpty()) { throw new CVSException(NLS.bind(CVSUIMessages.MergeSynchronizeParticipant_12, new String[] { id.toString() })); } - IResource[] roots = (IResource[]) resources.toArray(new IResource[resources.size()]); + IResource[] roots = resources.toArray(new IResource[resources.size()]); return new CVSMergeSubscriber(id, roots, start, end); } |