Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hallgren2010-02-26 15:09:10 +0000
committerThomas Hallgren2010-02-26 15:09:10 +0000
commite71a591de427fe7be2b7defb34dc3b683c8d6163 (patch)
tree93e78202c73d19ae45ff599a2225bdc3c5ed6809
parenteaa7cbe6e5818394bc1673a8babc7d4ebd30ed13 (diff)
downloadrt.equinox.p2-e71a591de427fe7be2b7defb34dc3b683c8d6163.tar.gz
rt.equinox.p2-e71a591de427fe7be2b7defb34dc3b683c8d6163.tar.xz
rt.equinox.p2-e71a591de427fe7be2b7defb34dc3b683c8d6163.zip
302193 : Return type inconsistency on IInstallableUnit's getters
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java22
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java9
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java13
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java22
25 files changed, 94 insertions, 97 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java
index d2371dacb..eb0416d91 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java
@@ -63,8 +63,8 @@ public class OperationGenerator {
}
private void generateConfigurationOperation(IInstallableUnit fromIU, IInstallableUnit toIU) {
- List<IInstallableUnitFragment> fromFragments = fromIU.getFragments();
- List<IInstallableUnitFragment> toFragments = toIU.getFragments();
+ Collection<IInstallableUnitFragment> fromFragments = fromIU.getFragments();
+ Collection<IInstallableUnitFragment> toFragments = toIU.getFragments();
if (fromFragments == toFragments)
return;
//Check to see if the two arrays are equals independently of the order of the fragments
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
index ec9ebd502..29671627e 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
@@ -14,7 +14,8 @@ import java.io.File;
import java.util.*;
import java.util.Map.Entry;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
-import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.ProvisioningContext;
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
@@ -53,22 +54,23 @@ public class DebugHelper {
System.out.println(buffer.toString());
}
- public static String formatArray(List<? extends Object> array, boolean toString, boolean newLines) {
+ public static String formatArray(Collection<? extends Object> array, boolean toString, boolean newLines) {
if (array == null || array.size() == 0)
return "[]"; //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
buffer.append('[');
- int i = 0;
- for (;;) {
+ boolean first = true;
+ for (Object elem : array) {
+ if (first)
+ first = false;
+ else
+ buffer.append(',');
+
if (toString)
- buffer.append(array.get(i).toString());
+ buffer.append(elem.toString());
else
- buffer.append(array.get(i).getClass().getName());
- i++;
- if (i == array.size())
- break;
- buffer.append(',');
+ buffer.append(elem.getClass().getName());
if (newLines)
buffer.append(DebugHelper.LINE_SEPARATOR);
else
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
index 8bf334353..3cdb6a7e1 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
@@ -14,7 +14,7 @@ package org.eclipse.equinox.internal.p2.engine;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
-import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
import org.eclipse.equinox.p2.engine.spi.Touchpoint;
import org.eclipse.equinox.p2.metadata.*;
@@ -106,14 +106,14 @@ public abstract class InstallableUnitPhase extends Phase {
}
private final static List<ITouchpointInstruction> getInstructions(IInstallableUnit unit, String key) {
- List<ITouchpointData> data = unit.getTouchpointData();
+ Collection<ITouchpointData> data = unit.getTouchpointData();
int dataSize = data.size();
if (dataSize == 0)
return CollectionUtils.emptyList();
ArrayList<ITouchpointInstruction> matches = new ArrayList<ITouchpointInstruction>(dataSize);
- for (int i = 0; i < dataSize; i++) {
- ITouchpointInstruction instructions = data.get(i).getInstruction(key);
+ for (ITouchpointData td : data) {
+ ITouchpointInstruction instructions = td.getInstruction(key);
if (instructions != null)
matches.add(instructions);
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
index ee36b5897..eb1c2c884 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
@@ -11,8 +11,6 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata.repository.io;
-import org.eclipse.equinox.p2.query.QueryUtil;
-
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
@@ -24,6 +22,7 @@ import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.p2.metadata.repository.Activator;
import org.eclipse.equinox.internal.p2.persistence.XMLWriter;
import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.query.QueryUtil;
public abstract class MetadataWriter extends XMLWriter implements XMLConstants {
@@ -227,12 +226,11 @@ public abstract class MetadataWriter extends XMLWriter implements XMLConstants {
end(TOUCHPOINT_TYPE_ELEMENT);
}
- protected void writeTouchpointData(List<ITouchpointData> touchpointData) {
+ protected void writeTouchpointData(Collection<ITouchpointData> touchpointData) {
if (touchpointData != null && touchpointData.size() > 0) {
start(TOUCHPOINT_DATA_ELEMENT);
attribute(COLLECTION_SIZE_ATTRIBUTE, touchpointData.size());
- for (int i = 0; i < touchpointData.size(); i++) {
- ITouchpointData nextData = touchpointData.get(i);
+ for (ITouchpointData nextData : touchpointData) {
Map<String, ITouchpointInstruction> instructions = nextData.getInstructions();
if (instructions.size() > 0) {
start(TOUCHPOINT_DATA_INSTRUCTIONS_ELEMENT);
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
index e339e0485..cb3110c92 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
@@ -11,6 +11,11 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata;
+import org.eclipse.equinox.p2.metadata.ITouchpointData;
+
+import java.util.Collection;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitFragment;
+
import java.util.*;
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
@@ -119,7 +124,7 @@ public class InstallableUnit implements IInstallableUnit, IMemberProvider {
return filter;
}
- public List<IInstallableUnitFragment> getFragments() {
+ public Collection<IInstallableUnitFragment> getFragments() {
return CollectionUtils.emptyList();
}
@@ -164,7 +169,7 @@ public class InstallableUnit implements IInstallableUnit, IMemberProvider {
}
- public List<ITouchpointData> getTouchpointData() {
+ public Collection<ITouchpointData> getTouchpointData() {
return CollectionUtils.unmodifiableList(touchpointData);
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
index 580f5d5a4..35ed20d07 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
@@ -11,8 +11,6 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata;
-import org.eclipse.equinox.p2.metadata.Version;
-
import java.util.*;
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
import org.eclipse.equinox.p2.metadata.*;
@@ -33,7 +31,7 @@ public class ResolvedInstallableUnit implements IInstallableUnit {
this.fragments = fragments == null ? NO_IU : fragments;
}
- public List<IInstallableUnitFragment> getFragments() {
+ public Collection<IInstallableUnitFragment> getFragments() {
int fcount = fragments.length;
if (fcount == 0)
return CollectionUtils.emptyList();
@@ -105,8 +103,8 @@ public class ResolvedInstallableUnit implements IInstallableUnit {
return result;
}
- public List<ITouchpointData> getTouchpointData() {
- List<ITouchpointData> originalTouchpointData = original.getTouchpointData();
+ public Collection<ITouchpointData> getTouchpointData() {
+ Collection<ITouchpointData> originalTouchpointData = original.getTouchpointData();
if (fragments.length == 0)
return originalTouchpointData;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java
index b2cb94c5a..41e79b1cc 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java
@@ -109,7 +109,7 @@ public class MetadataFactory {
*
* @return The current touchpoint data on this description
*/
- public List<ITouchpointData> getTouchpointData() {
+ public Collection<ITouchpointData> getTouchpointData() {
return unit().getTouchpointData();
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
index fbc39cbb4..1164c21a0 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
@@ -11,6 +11,8 @@
******************************************************************************/
package org.eclipse.equinox.p2.metadata;
+import java.util.Collection;
+
import java.util.*;
import org.osgi.framework.Filter;
@@ -137,7 +139,7 @@ public interface IInstallableUnit extends IVersionedId, Comparable<IInstallableU
* @see #isResolved()
* @return The fragments bound to this installable unit, or <code>null</code>
*/
- public List<IInstallableUnitFragment> getFragments();
+ public Collection<IInstallableUnitFragment> getFragments();
/**
* Returns an <i>unmodifiable copy</i> of the properties
@@ -184,7 +186,7 @@ public interface IInstallableUnit extends IVersionedId, Comparable<IInstallableU
public Collection<IRequirement> getMetaRequiredCapabilities();
- public List<ITouchpointData> getTouchpointData();
+ public Collection<ITouchpointData> getTouchpointData();
public ITouchpointType getTouchpointType();
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java
index bb0d2193a..07b44f2ee 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/analyzer/UnzipFeatureJarAnalyzer.java
@@ -9,11 +9,8 @@
******************************************************************************/
package org.eclipse.equinox.p2.internal.repository.tools.analyzer;
-import org.eclipse.equinox.p2.metadata.ITouchpointData;
-import org.eclipse.equinox.p2.metadata.ITouchpointInstruction;
-
-import java.util.List;
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import java.util.Collection;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.tools.analyzer.IUAnalyzer;
@@ -24,13 +21,13 @@ public class UnzipFeatureJarAnalyzer extends IUAnalyzer {
public void analyzeIU(IInstallableUnit iu) {
if (iu.getId().indexOf("feature.jar") > -1) {
- List<ITouchpointData> touchpointData = iu.getTouchpointData();
+ Collection<ITouchpointData> touchpointData = iu.getTouchpointData();
if (touchpointData.size() == 0) {
error(iu, "[ERROR] No unzip touchpoint for: " + iu.getId());
} else {
boolean found = false;
- for (int i = 0; i < touchpointData.size(); i++) {
- ITouchpointInstruction instruction = touchpointData.get(i).getInstruction("zipped");
+ for (ITouchpointData td : touchpointData) {
+ ITouchpointInstruction instruction = td.getInstruction("zipped");
if (instruction.getBody().equals("true"))
found = true;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch b/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch
index 6991aa710..ec2ec8492 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/All p2 UI tests.launch
@@ -61,8 +61,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.net@default:default,org.sat4j.core@default:default,org.eclipse.update.core@default:default,org.eclipse.jface@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.identity@default:default,org.mortbay.jetty.server@default:default,org.eclipse.pde.core@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.util@default:default,org.apache.lucene@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.platform@default:default,org.eclipse.jdt@default:default,org.eclipse.sdk@default:default,org.apache.commons.el@default:default,org.sat4j.pb@default:default,org.eclipse.ui.views@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.help.webapp@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.eclipse.compare@default:default,org.eclipse.cvs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ui.ide.application@default:default,org.apache.jasper@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.update.ui@default:default,org.eclipse.jdt.junit4.runtime@default:default,javax.servlet.jsp@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.build@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.osgi@-1:true,org.eclipse.team.cvs.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.apache.commons.codec@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.ds@1:true,org.junit*4.8.1.v4_8_1_v20100114-1600@default:default,javax.servlet@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.boot@default:default,org.eclipse.jdt.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.pde.ua.ui@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.ide@default:default,org.eclipse.ant.launching@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.pde.ui.templates@default:default,com.ibm.icu@default:default,org.eclipse.core.jobs@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jface.text@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ant.ui@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.net@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.junit@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rcp@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.debug.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.pde@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.core.filesystem@default:default,org.mortbay.jetty.util@default:default,org.eclipse.pde.launching@default:default,org.eclipse.text@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.app@default:default,org.apache.commons.httpclient@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.ant@default:default,org.eclipse.ecf@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.objectweb.asm@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.team.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.common@2:true,org.eclipse.search@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ui.console@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.logging@default:default,org.eclipse.pde.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.event@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.update.scheduler@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.tests.harness@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.easymock@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.frameworkadmin.test@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.tests@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.tests.ui@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.installer@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.pde.build.tests@default:default,org.eclipse.test.performance@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.touchpoint.natives@default:default,ie.wombat.jbdiff.test@default:default,org.eclipse.equinox.p2.core@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.tests.verifier@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.commands@default:default,org.eclipse.pde.ui@default:default,org.eclipse.search@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jdt.junit.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jsch.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.rcp@default:default,org.eclipse.ui.net@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.objectweb.asm@default:default,org.apache.jasper@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.text@default:default,org.apache.commons.codec@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,com.ibm.icu@default:default,org.eclipse.help.webapp@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.ui.browser@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.platform@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.doc.user@default:default,org.eclipse.team.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.pde@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.compare.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.filebuffers@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ant.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.databinding@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.core.externaltools@default:default,org.junit*4.8.1.v4_8_1_v20100114-1600@default:default,org.eclipse.pde.launching@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.registry@default:default,org.apache.ant@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.apache.lucene@default:default,org.sat4j.pb@default:default,org.apache.commons.el@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.pde.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.util@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.update.core@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.help.ui@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.security.ui@default:default,org.eclipse.cvs@default:default,org.junit4@default:default,org.apache.commons.logging@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.views@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.jdt.junit@default:default,javax.servlet@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.mortbay.jetty.server@default:default,org.eclipse.compare@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.console@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.equinox.event@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui.views.log@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.compiler.apt@default:false,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.swt@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.apache.commons.httpclient@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.sat4j.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.osgi.util@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.sdk@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,com.jcraft.jsch@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.examples.rcp.prestartupdate@default:default,org.eclipse.pde.ui.tests@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.test.performance@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ds.tests@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.tests.verifier@default:default,org.eclipse.equinox.p2.sar@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jdt.core.tests.compiler@default:default,org.eclipse.equinox.p2.afterthefact@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.tests.ui@default:default,org.eclipse.equinox.p2.tests.discovery@default:default,org.easymock@default:default,org.sat4j.pb@default:default,org.eclipse.core.tests.harness@default:default,ie.wombat.jbdiff.test@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.jdt.core.tests.builder@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.artifact.optimizers@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.examples.rcp.cloud@default:default,org.eclipse.pde.ua.tests@default:default,org.eclipse.pde.core@default:default,ie.wombat.jbdiff@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.discovery.compatiblity@default:default,org.eclipse.pde.launching@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.pde.api.tools@default:default,org.sat4j.core@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.artifact.processors@default:default,org.eclipse.equinox.p2.installer@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.pde.api.tools.tests@default:default,org.eclipse.equinox.p2.touchpoint.osgi@default:default,org.eclipse.equinox.frameworkadmin.test@default:default,org.eclipse.equinox.p2.diagnostic@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.equinox.p2.tests@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.pde.build.tests@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.equinox.p2.director.app@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch b/bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch
index 49e903eb1..154e5c421 100644
--- a/bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch
+++ b/bundles/org.eclipse.equinox.p2.tests/All p2 Tests.launch
@@ -53,19 +53,17 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-I20100119-0800-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=/home/thhal/Download/eclipse-platform-N20091109-2000-linux-gtk-x86_64.tar.gz&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=/home/thhal/Download/eclipse-platform-3.5.1-linux-gtk-x86_64.tar.gz&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
index bf2e0a86b..09bc6be33 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
@@ -11,7 +11,7 @@
package org.eclipse.equinox.p2.tests.directorywatcher;
import java.io.File;
-import java.util.List;
+import java.util.Collection;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactDescriptor;
@@ -34,11 +34,11 @@ public class RepositoryListenerTest extends AbstractDirectoryWatcherTest {
return new TestSuite(RepositoryListenerTest.class);
}
- public static boolean isZipped(List<ITouchpointData> data) {
+ public static boolean isZipped(Collection<ITouchpointData> data) {
if (data == null || data.size() == 0)
return false;
- for (int i = 0; i < data.size(); i++) {
- if (data.get(i).getInstruction("zipped") != null) //$NON-NLS-1$
+ for (ITouchpointData td : data) {
+ if (td.getInstruction("zipped") != null) //$NON-NLS-1$
return true;
}
return false;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
index cfe1f378f..3140552b4 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
@@ -36,7 +36,7 @@ public class FragmentTest extends AbstractProvisioningTest {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(ID)) {
assertEquals(iu.getFragments().size(), 1);
- assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
}
}
}
@@ -54,11 +54,11 @@ public class FragmentTest extends AbstractProvisioningTest {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(ID1)) {
assertEquals(iu.getFragments().size(), 1);
- assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
}
if (iu.getId().equals(ID3)) {
assertEquals(iu.getFragments().size(), 1);
- assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+ assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
}
}
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
index 62ee765e3..4bc365be9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
@@ -45,11 +45,11 @@ public class MultipleIUAndFragmentTest extends AbstractProvisioningTest {
IInstallableUnit iu = (IInstallableUnit) iterator.next();
if (iu.getId().equals(iu1.getId())) {
assertEquals(1, iu.getFragments().size());
- assertEquals(iu.getFragments().get(0).getId(), iu3.getId());
+ assertEquals(iu.getFragments().iterator().next().getId(), iu3.getId());
}
if (iu.getId().equals(iu2.getId())) {
assertEquals(1, iu.getFragments().size());
- assertEquals(iu.getFragments().get(0).getId(), iu3.getId());
+ assertEquals(iu.getFragments().iterator().next().getId(), iu3.getId());
}
if (iu.getId().equals(iu3.getId())) {
//fragments don't have fragments
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
index da5b48873..063fc9a40 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
@@ -250,7 +250,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
return this.filter;
}
- public List<IInstallableUnitFragment> getFragments() {
+ public Collection<IInstallableUnitFragment> getFragments() {
return fragments;
}
@@ -278,7 +278,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
return requiredCapabilities;
}
- public List<ITouchpointData> getTouchpointData() {
+ public Collection<ITouchpointData> getTouchpointData() {
return touchpointData;
}
@@ -811,11 +811,11 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMin(), spiRequiredCapability.getMin());
assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMax(), spiRequiredCapability.getMax());
assertEquals(unit.getProvidedCapabilities().iterator().next(), spiProvidedCapability);
- assertEquals(unit.getTouchpointData().get(0), spiTouchpointData);
+ assertEquals(unit.getTouchpointData().iterator().next(), spiTouchpointData);
assertEquals(unit.getTouchpointType(), spiTouchpointType);
assertEquals(unit.getLicenses().iterator().next(), spiLicense);
assertEquals(spiProvidedCapability, unit.getProvidedCapabilities().iterator().next());
- assertEquals(spiTouchpointData, unit.getTouchpointData().get(0));
+ assertEquals(spiTouchpointData, unit.getTouchpointData().iterator().next());
assertEquals(spiTouchpointType, unit.getTouchpointType());
assertEquals(spiLicense, unit.getLicenses().iterator().next());
@@ -825,7 +825,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
// Check to make sure the actual objects are not equal. This is because the repo has
// been refreshed, and re-parsed, thus using the default implementations.
- assertFalse(spiTouchpointData == unit.getTouchpointData().get(0));
+ assertFalse(spiTouchpointData == unit.getTouchpointData().iterator().next());
assertFalse(spiRequiredCapability == unit.getRequiredCapabilities().iterator().next());
assertFalse(spiProvidedCapability == unit.getProvidedCapabilities().iterator().next());
assertFalse(spiTouchpointType == unit.getTouchpointType());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
index 16efaa492..8ecfcd55f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
@@ -350,11 +350,11 @@ public class AdviceFileParserTest extends TestCase {
assertEquals(1, metaReq1.getMin());
assertEquals(1, iu1.getTouchpointData().size());
- ITouchpointInstruction configure = iu1.getTouchpointData().get(0).getInstruction("configure");
+ ITouchpointInstruction configure = iu1.getTouchpointData().iterator().next().getInstruction("configure");
assertEquals(null, configure.getImportAttribute());
assertEquals("addProgramArg(programArg:-startup); addProgramArg(programArg:@artifact);", configure.getBody());
- ITouchpointInstruction unconfigure = iu1.getTouchpointData().get(0).getInstruction("unconfigure");
+ ITouchpointInstruction unconfigure = iu1.getTouchpointData().iterator().next().getInstruction("unconfigure");
assertEquals("some.removeProgramArg", unconfigure.getImportAttribute());
assertEquals("removeProgramArg(programArg:-startup); removeProgramArg(programArg:@artifact);)", unconfigure.getBody());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
index 35d271c67..c5eb6e00a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
@@ -201,10 +201,10 @@ public class BundlesActionTest extends ActionTest {
verifyProvidedCapability(providedCapabilities, PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "source", Version.create("1.0.0"));//$NON-NLS-1$//$NON-NLS-2$
assertEquals("2.1", 4, providedCapabilities.size());
- List<ITouchpointData> data = bundle1IU.getTouchpointData();
+ Collection<ITouchpointData> data = bundle1IU.getTouchpointData();
boolean found = false;
- for (int i = 0; i < data.size(); i++) {
- ITouchpointInstruction configure = data.get(i).getInstruction("configure");
+ for (ITouchpointData td : data) {
+ ITouchpointInstruction configure = td.getInstruction("configure");
if (configure == null)
continue;
String body = configure.getBody();
@@ -245,10 +245,10 @@ public class BundlesActionTest extends ActionTest {
assertTrue(prop.get("org.eclipse.equinox.p2.name").toString().equalsIgnoreCase("%bundleName"));//$NON-NLS-1$//$NON-NLS-2$
assertTrue(prop.get("org.eclipse.equinox.p2.provider").toString().equalsIgnoreCase("%providerName"));//$NON-NLS-1$//$NON-NLS-2$
- List<ITouchpointData> data = bundle2IU.getTouchpointData();
+ Collection<ITouchpointData> data = bundle2IU.getTouchpointData();
boolean found = false;
- for (int i = 0; i < data.size(); i++) {
- ITouchpointInstruction configure = data.get(i).getInstruction("configure");
+ for (ITouchpointData td : data) {
+ ITouchpointInstruction configure = td.getInstruction("configure");
if (configure == null)
continue;
String body = configure.getBody();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
index c858c0115..3338cd685 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
@@ -128,8 +128,8 @@ public class FeaturesActionTest extends ActionTest {
assertTrue(foo.getTouchpointType().getVersion().equals(fooVersion));
//zipped=true
- List<ITouchpointData> tpData = foo.getTouchpointData();
- String fooValue = tpData.get(0).getInstructions().get("zipped").getBody(); //$NON-NLS-1$
+ Collection<ITouchpointData> tpData = foo.getTouchpointData();
+ String fooValue = tpData.iterator().next().getInstructions().get("zipped").getBody(); //$NON-NLS-1$
assertTrue(fooValue.equalsIgnoreCase("true")); //$NON-NLS-1$
Collection<IRequirement> fooRequiredCapabilities = foo.getRequiredCapabilities();
@@ -147,7 +147,7 @@ public class FeaturesActionTest extends ActionTest {
IInstallableUnit fooGroup = (IInstallableUnit) fooIUs.get(0);
tpData = fooGroup.getTouchpointData();
assertEquals(1, tpData.size());
- ITouchpointInstruction instruction = tpData.get(0).getInstruction("install");
+ ITouchpointInstruction instruction = tpData.iterator().next().getInstruction("install");
assertNotNull(instruction);
assertEquals("ln(targetDir:@artifact,linkTarget:foo/lib.1.so,linkName:lib.so);chmod(targetDir:@artifact,targetFile:lib/lib.so,permissions:755);", instruction.getBody());
System.out.println(fooGroup.getFilter());
@@ -177,7 +177,7 @@ public class FeaturesActionTest extends ActionTest {
assertTrue(barGroup.getFilter().equals(ExpressionUtil.parseLDAP("(&(|(osgi.os=macosx)(osgi.os=win32))(|(osgi.ws=carbon)(osgi.ws=win32))(|(osgi.arch=ppc)(osgi.arch=x86))(osgi.nl=en))")));
//check zipped=true in touchpointData
- String barValue = bar.getTouchpointData().get(0).getInstructions().get("zipped").getBody(); //$NON-NLS-1$
+ String barValue = bar.getTouchpointData().iterator().next().getInstructions().get("zipped").getBody(); //$NON-NLS-1$
assertTrue(barValue.equalsIgnoreCase("true")); //$NON-NLS-1$
//check touchpointType
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
index bbca48dd7..94a0eac75 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
@@ -88,7 +88,7 @@ public class JREActionTest extends ActionTest {
IInstallableUnit bar = (IInstallableUnit) barIUs.get(0);
if (testInstructions) {
- Map instructions = bar.getTouchpointData().get(0).getInstructions();
+ Map instructions = bar.getTouchpointData().iterator().next().getInstructions();
assertTrue(((ITouchpointInstruction) instructions.get("install")).getBody().equals("unzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$//$NON-NLS-2$
assertTrue(((ITouchpointInstruction) instructions.get("uninstall")).getBody().equals("cleanupzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
index 3933099a0..f70f52e56 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
@@ -56,9 +56,9 @@ public class LocalUpdateSiteActionTest extends ActionTest {
Collection ius = publisherResult.getIUs("test.feature.feature.jar", null);
assertEquals("1.0", 1, ius.size());
IInstallableUnit iu = (IInstallableUnit) ius.iterator().next();
- List<ITouchpointData> touchpointData = iu.getTouchpointData();
+ Collection<ITouchpointData> touchpointData = iu.getTouchpointData();
assertEquals("1.1", 1, touchpointData.size());
- Map instructions = touchpointData.get(0).getInstructions();
+ Map instructions = touchpointData.iterator().next().getInstructions();
Set keys = instructions.keySet();
assertEquals("1.2", 1, keys.size());
String unzip = (String) keys.iterator().next();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
index 076a41dc9..9c51eb546 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
@@ -12,7 +12,8 @@ package org.eclipse.equinox.p2.tests.publisher.actions;
import java.io.File;
import java.net.URI;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.p2.metadata.query.MatchQuery;
@@ -106,9 +107,9 @@ public class ProductActionWithAdviceFileTest extends ActionTest {
Collection productIUs = publisherResult.getIUs("productWithAdvice.product", IPublisherResult.NON_ROOT);
assertEquals("1.0", 1, productIUs.size());
IInstallableUnit product = (IInstallableUnit) productIUs.iterator().next();
- List<ITouchpointData> data = product.getTouchpointData();
+ Collection<ITouchpointData> data = product.getTouchpointData();
assertEquals("1.1", 1, data.size());
- String configure = data.get(0).getInstruction("configure").getBody();
+ String configure = data.iterator().next().getInstruction("configure").getBody();
assertEquals("1.2", "addRepository(type:0,location:http${#58}//download.eclipse.org/releases/fred);addRepository(type:1,location:http${#58}//download.eclipse.org/releases/fred);", configure);
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
index 09f04b410..95996f41b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
@@ -648,9 +648,9 @@ public class UpdateSiteTest extends AbstractProvisioningTest {
IQueryResult result = repository.query(QueryUtil.createIUQuery("test.feature.feature.jar"), getMonitor());
assertTrue("1.0", !result.isEmpty());
IInstallableUnit unit = (IInstallableUnit) result.iterator().next();
- List<ITouchpointData> data = unit.getTouchpointData();
+ Collection<ITouchpointData> data = unit.getTouchpointData();
assertEquals("1.1", 1, data.size());
- Map instructions = data.get(0).getInstructions();
+ Map instructions = data.iterator().next().getInstructions();
assertEquals("1.2", 1, instructions.size());
assertEquals("1.3", "true", ((ITouchpointInstruction) instructions.get("zipped")).getBody());
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
index 1628ec605..095fd9f87 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
@@ -296,9 +296,9 @@ public class Util {
return null;
}
- public static String getManifest(List<ITouchpointData> data) {
- for (int i = 0; i < data.size(); i++) {
- ITouchpointInstruction manifestInstruction = data.get(i).getInstruction("manifest"); //$NON-NLS-1$
+ public static String getManifest(Collection<ITouchpointData> data) {
+ for (ITouchpointData td : data) {
+ ITouchpointInstruction manifestInstruction = td.getInstruction("manifest"); //$NON-NLS-1$
if (manifestInstruction == null)
return null;
String manifest = manifestInstruction.getBody();
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
index e7e7ce43a..fac359050 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
@@ -46,11 +46,11 @@ public class CollectAction extends ProvisioningAction {
return Status.OK_STATUS;
}
- public static boolean isZipped(List<ITouchpointData> data) {
+ public static boolean isZipped(Collection<ITouchpointData> data) {
if (data == null || data.size() == 0)
return false;
- for (int i = 0; i < data.size(); i++) {
- if (data.get(i).getInstruction("zipped") != null) //$NON-NLS-1$
+ for (ITouchpointData td : data) {
+ if (td.getInstruction("zipped") != null) //$NON-NLS-1$
return true;
}
return false;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
index 9e898e6ee..619fd0af7 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
@@ -10,19 +10,14 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
-import org.eclipse.equinox.p2.metadata.Version;
-
-import org.eclipse.equinox.p2.metadata.*;
-
import java.util.Collection;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator;
import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
-import org.eclipse.equinox.internal.provisional.p2.metadata.*;
+import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.metadata.IRequirement;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
@@ -159,23 +154,24 @@ public class IUImplementationGroup extends IUGroup {
if (type != null) {
touchpointType.setText(type.getId());
}
- java.util.List<ITouchpointData> data = iu.getTouchpointData();
+ Collection<ITouchpointData> data = iu.getTouchpointData();
String[] items = new String[data.size()];
- for (int i = 0; i < data.size(); i++) {
- items[i] = data.get(i).toString();
+ int i = 0;
+ for (ITouchpointData td : data) {
+ items[i++] = td.toString();
}
touchpointData.setItems(items);
Collection<IRequirement> reqs = iu.getRequiredCapabilities();
items = new String[reqs.size()];
- int j = 0;
+ i = 0;
for (IRequirement req : reqs) {
- items[j++] = req.toString();
+ items[i++] = req.toString();
}
requiredCapabilities.setItems(items);
Collection<IProvidedCapability> prov = iu.getProvidedCapabilities();
items = new String[prov.size()];
- int i = 0;
+ i = 0;
for (IProvidedCapability capability : prov) {
items[i++] = capability.toString();
}

Back to the top