Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-02-08 08:03:30 +0000
committerLars Vogel2019-02-08 08:03:30 +0000
commit320764478d7907d8f05116cdd3daa075381366d7 (patch)
tree6e372d6496473a5f97784554d6b9a43333f377e4 /bundles
parent548c0c75acb2b27e73a2b35d5082bbc68b931362 (diff)
downloadrt.equinox.framework-320764478d7907d8f05116cdd3daa075381366d7.tar.gz
rt.equinox.framework-320764478d7907d8f05116cdd3daa075381366d7.tar.xz
rt.equinox.framework-320764478d7907d8f05116cdd3daa075381366d7.zip
Avoiding using deprecated new Integer in
org.eclipse.osgi.compatibility.state Change-Id: I7e7f5fe5fa545ceaf596084591a7f758f90e4420 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java6
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java8
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java2
4 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
index 1ed379739..dd264cf57 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
@@ -24,7 +24,7 @@ import org.osgi.framework.wiring.BundleRevision;
public class ExportPackageDescriptionImpl extends BaseDescriptionImpl implements ExportPackageDescription {
public static final String EQUINOX_EE = "x-equinox-ee"; //$NON-NLS-1$
- private static final Integer EQUINOX_EE_DEFAULT = new Integer(-1);
+ private static final Integer EQUINOX_EE_DEFAULT = Integer.valueOf(-1);
private String[] uses;
private Map<String, Object> attributes;
private Map<String, String> arbitraryDirectives;
@@ -65,7 +65,7 @@ public class ExportPackageDescriptionImpl extends BaseDescriptionImpl implements
if (friends != null)
result.put(StateImpl.FRIENDS_DIRECTIVE, friends);
result.put(StateImpl.INTERNAL_DIRECTIVE, internal);
- result.put(EQUINOX_EE, equinox_ee == -1 ? EQUINOX_EE_DEFAULT : new Integer(equinox_ee));
+ result.put(EQUINOX_EE, equinox_ee == -1 ? EQUINOX_EE_DEFAULT : Integer.valueOf(equinox_ee));
return result;
}
}
@@ -137,7 +137,7 @@ public class ExportPackageDescriptionImpl extends BaseDescriptionImpl implements
if (key.equals(StateImpl.INTERNAL_DIRECTIVE))
return internal;
if (key.equals(EQUINOX_EE))
- return equinox_ee == -1 ? EQUINOX_EE_DEFAULT : new Integer(equinox_ee);
+ return equinox_ee == -1 ? EQUINOX_EE_DEFAULT : Integer.valueOf(equinox_ee);
return null;
}
}
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index 35f598419..f3047ff5a 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -950,7 +950,7 @@ public abstract class StateImpl implements State {
if (elements == null)
return;
ExportPackageDescription[] systemExports = StateBuilder.createExportPackages(elements, null, null, false);
- Integer profInx = new Integer(index);
+ Integer profInx = Integer.valueOf(index);
for (int j = 0; j < systemExports.length; j++) {
((ExportPackageDescriptionImpl) systemExports[j]).setDirective(ExportPackageDescriptionImpl.EQUINOX_EE, profInx);
exports.add(systemExports[j]);
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
index 974735a74..600fb6958 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateReader.java
@@ -77,11 +77,11 @@ final class StateReader {
}
private void addToObjectTable(Object object, int index) {
- objectTable.put(new Integer(index), object);
+ objectTable.put(Integer.valueOf(index), object);
}
private Object getFromObjectTable(int index) {
- Object result = objectTable.get(new Integer(index));
+ Object result = objectTable.get(Integer.valueOf(index));
if (result == null)
throw new IllegalStateException("Expected to find an object at table index: " + index); //$NON-NLS-1$
return result;
@@ -447,7 +447,7 @@ final class StateReader {
else if (type == 2)
value = in.readBoolean() ? Boolean.TRUE : Boolean.FALSE;
else if (type == 3)
- value = new Integer(in.readInt());
+ value = Integer.valueOf(in.readInt());
else if (type == 4)
value = new Long(in.readLong());
else if (type == 5)
@@ -477,7 +477,7 @@ final class StateReader {
list.add(readString(in, false));
break;
case 3 :
- list.add(new Integer(in.readInt()));
+ list.add(Integer.valueOf(in.readInt()));
break;
case 4 :
list.add(new Long(in.readLong()));
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
index 71c336f58..bd185d509 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
@@ -38,7 +38,7 @@ class StateWriter {
Integer cur = objectTable.get(object);
if (cur != null)
return cur.intValue();
- objectTable.put(object, new Integer(objectTable.size()));
+ objectTable.put(object, Integer.valueOf(objectTable.size()));
// return the index of the object just added (i.e. size - 1)
return (objectTable.size() - 1);
}

Back to the top