Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2011-04-10 15:56:40 -0400
committerPascal Rapicault2011-04-10 15:56:40 -0400
commite05032a79c2ee44df55f9f9f82e41017be0651c8 (patch)
treec4bc1c9dc83d76798fd7ca37a80974db56d80d55
parent1155481084c5c96d886783ed7ee1310c20d35e32 (diff)
downloadrt.equinox.p2-e05032a79c2ee44df55f9f9f82e41017be0651c8.tar.gz
rt.equinox.p2-e05032a79c2ee44df55f9f9f82e41017be0651c8.tar.xz
rt.equinox.p2-e05032a79c2ee44df55f9f9f82e41017be0651c8.zip
Remove reference to the word feature
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FParser.java43
1 files changed, 21 insertions, 22 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FParser.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FParser.java
index 13935b22d..ce550cb51 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FParser.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FParser.java
@@ -24,9 +24,9 @@ import org.osgi.framework.BundleContext;
import org.xml.sax.*;
public class P2FParser extends XMLParser implements P2FConstants {
-
static final VersionRange XML_TOLERANCE = new VersionRange(CURRENT_VERSION, true, Version.createOSGi(2, 0, 0), false);
- private List<IUDetail> features;
+
+ List<IUDetail> iusListed;
protected class RepositoryHandler extends AbstractHandler {
@@ -79,15 +79,15 @@ public class P2FParser extends XMLParser implements P2FConstants {
}
}
- protected class FeatureHandler extends AbstractHandler {
+ protected class IUHandler extends AbstractHandler {
private final String[] required = new String[] {ID_ATTRIBUTE, NAME_ATTRIBUTE, VERSION_ATTRIBUTE};
private final String[] optional = new String[] {};
IInstallableUnit iu = null;
private RepositoriesHandler repositoriesHandler;
- private List<IUDetail> features;
+ private List<IUDetail> ius;
- public FeatureHandler(AbstractHandler parentHandler, Attributes attributes, List<IUDetail> features) {
+ public IUHandler(AbstractHandler parentHandler, Attributes attributes, List<IUDetail> ius) {
super(parentHandler, IU_ELEMENT);
String[] values = parseAttributes(attributes, required, optional);
//skip entire record if the id is missing
@@ -98,7 +98,7 @@ public class P2FParser extends XMLParser implements P2FConstants {
desc.setProperty(IInstallableUnit.PROP_NAME, values[1]);
desc.setVersion(Version.create(values[2]));
iu = MetadataFactory.createInstallableUnit(desc);
- this.features = features;
+ this.ius = ius;
}
@Override
@@ -111,33 +111,32 @@ public class P2FParser extends XMLParser implements P2FConstants {
@Override
protected void finished() {
if (isValidXML()) {
- IUDetail feature = new IUDetail(iu, repositoriesHandler.getRepositories());
- features.add(feature);
+ ius.add(new IUDetail(iu, repositoriesHandler.getRepositories()));
}
}
}
- protected class FeaturesHanlder extends AbstractHandler {
+ protected class IUsHandler extends AbstractHandler {
- private final List<IUDetail> features;
+ private final List<IUDetail> ius;
- public FeaturesHanlder(ContentHandler parentHandler, Attributes attributes) {
+ public IUsHandler(ContentHandler parentHandler, Attributes attributes) {
super(parentHandler, IUS_ELEMENT);
String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
- features = (size != null ? new ArrayList<IUDetail>(new Integer(size).intValue()) : new ArrayList<IUDetail>());
+ ius = (size != null ? new ArrayList<IUDetail>(new Integer(size).intValue()) : new ArrayList<IUDetail>());
}
@Override
public void startElement(String name, Attributes attributes) {
if (name.equals(IU_ELEMENT)) {
- new FeatureHandler(this, attributes, features);
+ new IUHandler(this, attributes, ius);
} else {
invalidElement(name, attributes);
}
}
- public List<IUDetail> getFeatureDetails() {
- return features;
+ public List<IUDetail> getIUs() {
+ return ius;
}
}
@@ -156,12 +155,12 @@ public class P2FParser extends XMLParser implements P2FConstants {
}
}
- private final class P2FHandler extends RootHandler {
+ final class P2FHandler extends RootHandler {
private final String[] required = new String[] {VERSION_ATTRIBUTE};
private final String[] optional = new String[] {};
private String[] attrValues = new String[required.length + optional.length];
- private FeaturesHanlder featuresHanlder;
+ private IUsHandler iusHandler;
@Override
protected void handleRootAttributes(Attributes attributes) {
@@ -172,8 +171,8 @@ public class P2FParser extends XMLParser implements P2FConstants {
@Override
public void startElement(String name, Attributes attributes) throws SAXException {
if (IUS_ELEMENT.equals(name)) {
- if (featuresHanlder == null) {
- featuresHanlder = new FeaturesHanlder(this, attributes);
+ if (iusHandler == null) {
+ iusHandler = new IUsHandler(this, attributes);
} else {
duplicateElement(this, name, attributes);
}
@@ -185,7 +184,7 @@ public class P2FParser extends XMLParser implements P2FConstants {
@Override
protected void finished() {
if (isValidXML()) {
- features = featuresHanlder.getFeatureDetails();
+ iusListed = iusHandler.getIUs();
}
}
}
@@ -219,8 +218,8 @@ public class P2FParser extends XMLParser implements P2FConstants {
}
}
- public List<IUDetail> getFeatures() {
- return features;
+ public List<IUDetail> getIUs() {
+ return iusListed;
}
@Override

Back to the top