diff options
author | Lars Vogel | 2019-02-08 09:54:32 +0000 |
---|---|---|
committer | Lars Vogel | 2019-02-08 15:33:47 +0000 |
commit | aad539c5a96833ee02a391a70204712280f6142f (patch) | |
tree | e9801fe39bb2219fc00a601d21058c3a7a58ac58 | |
parent | 9b3404f38d2e68528422ecf82bdf80e563565844 (diff) | |
download | rt.equinox.framework-aad539c5a96833ee02a391a70204712280f6142f.tar.gz rt.equinox.framework-aad539c5a96833ee02a391a70204712280f6142f.tar.xz rt.equinox.framework-aad539c5a96833ee02a391a70204712280f6142f.zip |
Revert "Revert "Avoiding using deprecated new Integer in org.eclipse.osgi.compatibility.state""
This reverts commit b452da5155018a38a947568abb77e1492e1d21a7.
Change-Id: Ib22c73e35bf87cd9175308784ba5b6aa40b46f01
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); } |