Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-08-25 16:07:36 +0000
committerKarsten Thoms2019-09-16 13:26:29 +0000
commit362cc70b11209d820a098e050dd0ce357a7d4bf1 (patch)
tree1311f2c0f93ea384f012e4fb014cc91744c58ecc
parenta90d4d49227d5f466e5f0b704f4b08c2ff6bf4a1 (diff)
downloadeclipse.platform.team-362cc70b11209d820a098e050dd0ce357a7d4bf1.tar.gz
eclipse.platform.team-362cc70b11209d820a098e050dd0ce357a7d4bf1.tar.xz
eclipse.platform.team-362cc70b11209d820a098e050dd0ce357a7d4bf1.zip
Manual array copy
Use Arrays.asList or System.arraycopy instead of copying array in a for loop Change-Id: I339f0b950d86f6d4edebe0cc10881f274c77ecdb Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java3
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDragAdapterAssistant.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java4
9 files changed, 11 insertions, 30 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index 758bffe13..7265a051f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
@@ -188,8 +188,7 @@ public class AddFromHistoryDialog extends ResizableDialog {
// sort input files
final int count= inputFiles.length;
final IFile[] files= new IFile[count];
- for (int i= 0; i < count; i++)
- files[i]= inputFiles[i];
+ System.arraycopy(inputFiles, 0, files, 0, count);
if (count > 1)
internalSort(files, 0, count-1);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index dc0dfc496..c10bc7c44 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -277,12 +277,8 @@ public class RemoteModule extends RemoteFolder {
} else {
// Combine two sets of children
allChildren = new ICVSRemoteResource[physicalChildren.length + referencedModules.length];
- for (int i = 0; i < physicalChildren.length; i++) {
- allChildren[i] = physicalChildren[i];
- }
- for (int i = 0; i < referencedModules.length; i++) {
- allChildren[i + physicalChildren.length] = referencedModules[i];
- }
+ System.arraycopy(physicalChildren, 0, allChildren, 0, physicalChildren.length);
+ System.arraycopy(referencedModules, 0, allChildren, physicalChildren.length, referencedModules.length);
}
} else if (physicalChildren != null) {
allChildren = physicalChildren;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
index 2d821f732..7e6a25264 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
@@ -67,9 +67,7 @@ public class ConfigureTagsFromRepoViewOnFolder extends CVSAction {
final Shell shell = getShell();
shell.getDisplay().syncExec(() -> {
ICVSFolder[] cvsFolders = new ICVSFolder[roots.length];
- for (int i = 0; i < roots.length; i++) {
- cvsFolders[i] = roots[i];
- }
+ System.arraycopy(roots, 0, cvsFolders, 0, roots.length);
TagConfigurationDialog d = new TagConfigurationDialog(shell, TagSource.create(cvsFolders));
d.open();
});
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java
index 1d29141cf..9632a5821 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSModelSynchronizeParticipant.java
@@ -29,9 +29,7 @@ public abstract class CVSModelSynchronizeParticipant extends ModelSynchronizePar
public static PreferencePage[] addCVSPreferencePages(PreferencePage[] inheritedPages) {
PreferencePage[] pages = new PreferencePage[inheritedPages.length + 1];
- for (int i = 0; i < inheritedPages.length; i++) {
- pages[i] = inheritedPages[i];
- }
+ System.arraycopy(inheritedPages, 0, pages, 0, inheritedPages.length);
pages[pages.length - 1] = new ComparePreferencePage();
pages[pages.length - 1].setTitle(CVSUIMessages.CVSParticipant_2);
return pages;
@@ -57,9 +55,7 @@ public abstract class CVSModelSynchronizeParticipant extends ModelSynchronizePar
return enabledProviders;
}
ModelProvider[] extended = new ModelProvider[enabledProviders.length + 1];
- for (int i = 0; i < enabledProviders.length; i++) {
- extended[i] = enabledProviders[i];
- }
+ System.arraycopy(enabledProviders, 0, extended, 0, enabledProviders.length);
ChangeSetModelProvider provider = ChangeSetModelProvider.getProvider();
if (provider == null)
return enabledProviders;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java
index e42f45f7d..69b5ef017 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteOperation.java
@@ -32,9 +32,7 @@ public abstract class RemoteOperation extends CVSOperation {
public ICVSResource[] getCVSResources() {
ICVSResource[] cvsResources = new ICVSResource[remoteResources.length];
- for (int i = 0; i < remoteResources.length; i++) {
- cvsResources[i] = remoteResources[i];
- }
+ System.arraycopy(remoteResources, 0, cvsResources, 0, remoteResources.length);
return cvsResources;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
index 60e423cab..60faf8242 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
@@ -144,9 +144,7 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
public static PreferencePage[] addCVSPreferencePages(PreferencePage[] inheritedPages) {
PreferencePage[] pages = new PreferencePage[inheritedPages.length + 1];
- for (int i = 0; i < inheritedPages.length; i++) {
- pages[i] = inheritedPages[i];
- }
+ System.arraycopy(inheritedPages, 0, pages, 0, inheritedPages.length);
pages[pages.length - 1] = new ComparePreferencePage();
pages[pages.length - 1].setTitle(CVSUIMessages.CVSParticipant_2);
return pages;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDragAdapterAssistant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDragAdapterAssistant.java
index 181852bd0..32d0476f1 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDragAdapterAssistant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceDragAdapterAssistant.java
@@ -82,8 +82,7 @@ public class ResourceDragAdapterAssistant extends CommonDragAdapterAssistant {
if (actualLength < length) {
String[] tempFileNames = fileNames;
fileNames = new String[actualLength];
- for (int i = 0; i < actualLength; i++)
- fileNames[i] = tempFileNames[i];
+ System.arraycopy(tempFileNames, 0, fileNames, 0, actualLength);
}
anEvent.data = fileNames;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
index 5efd85260..f87077178 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
@@ -163,8 +163,7 @@ class CopyToClipboardAction extends SelectionListenerAction {
if (actualLength < length) {
String[] tempFileNames = fileNames;
fileNames = new String[actualLength];
- for (int i = 0; i < actualLength; i++)
- fileNames[i] = tempFileNames[i];
+ System.arraycopy(tempFileNames, 0, fileNames, 0, actualLength);
}
setClipboard(resources, fileNames, text);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
index a922426ab..48454450a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
@@ -129,9 +129,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
return enabledProviders;
}
ModelProvider[] extended = new ModelProvider[enabledProviders.length + 1];
- for (int i = 0; i < enabledProviders.length; i++) {
- extended[i] = enabledProviders[i];
- }
+ System.arraycopy(enabledProviders, 0, extended, 0, enabledProviders.length);
PatchModelProvider provider = PatchModelProvider.getProvider();
if (provider == null)
return enabledProviders;

Back to the top