Bug 527018 - [refactoring] Replace use of Number constructors by valueOfI20171113-2000I20171112-2000I20171111-1500I20171111-0410I20171111-0155I20171110-2000I20171109-2000

Bump micro version for 4.8

Change-Id: Ib0bee17c6905c38cab7d4701f6339bfd63d9c45e
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>

7 files changed, 20 insertions, 20 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
index 5e3ead07d..0a440bac4 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java
@@ -343,7 +343,7 @@ public class DiffTree implements IDiffTree {
 	}
 
 	private void accumulatePropertyChanges(int property, IPath[] paths) {
-		Integer key = new Integer(property);
+		Integer key = Integer.valueOf(property);
 		Set<IPath> changes = propertyChanges.get(key);
 		if (changes == null) {
 			changes = new HashSet<>();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
index a69f71812..9372ae7ce 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
@@ -154,7 +154,7 @@ public class ThreeWaySynchronizer {
 				beginOperation();
 				String base = new String(baseBytes);
 				String[] slots = new String[] {
-						new Long(resource.getModificationStamp()).toString(),
+						Long.valueOf(resource.getModificationStamp()).toString(),
 						base,
 						base
 				};
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
index b11c740fb..d3ee63028 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
@@ -116,7 +116,7 @@ public class FileContentManager implements IFileContentManager {
             for (int i = 0; i < numberOfMappings; i++) {
                 final String extension = input.readUTF();
                 final int type = input.readInt();
-                result.put(extension, new Integer(type));
+                result.put(extension, Integer.valueOf(type));
             }
             return result;
         }
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java
index d2de69f61..3394bd191 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java
@@ -60,9 +60,9 @@ public class PluginStringMappings {
                     continue;
 
                 if (type.equals("text")) { //$NON-NLS-1$
-                    result.put(ext, new Integer(Team.TEXT));
+                    result.put(ext, Integer.valueOf(Team.TEXT));
                 } else if (type.equals("binary")) { //$NON-NLS-1$
-                    result.put(ext, new Integer(Team.BINARY));
+                    result.put(ext, Integer.valueOf(Team.BINARY));
                 }
             }
         }
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/UserStringMappings.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/UserStringMappings.java
index a56cc93b0..256f2bad6 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/UserStringMappings.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/UserStringMappings.java
@@ -21,9 +21,9 @@ import org.eclipse.team.core.Team;
 
 public class UserStringMappings implements Preferences.IPropertyChangeListener {
 
-    public static final Integer BINARY= new Integer(Team.BINARY);
-    public  static final Integer TEXT= new Integer(Team.TEXT);
-    public static final Integer UNKNOWN= new Integer(Team.UNKNOWN);
+    public static final Integer BINARY= Integer.valueOf(Team.BINARY);
+    public  static final Integer TEXT= Integer.valueOf(Team.TEXT);
+    public static final Integer UNKNOWN= Integer.valueOf(Team.UNKNOWN);
 
 
     private static final String PREF_TEAM_SEPARATOR = "\n"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java
index e8b745335..757f6f131 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java
@@ -28,11 +28,11 @@ public class DiffTreeStatistics {
 	 */
 	public void add(int state) {
 		// update statistics
-		Long count = stats.get(new Integer(state));
+		Long count = stats.get(Integer.valueOf(state));
 		if(count == null) {
-			count = new Long(0);
+			count = Long.valueOf(0);
 		}
-		stats.put(new Integer(state), new Long(count.longValue() + 1));
+		stats.put(Integer.valueOf(state), Long.valueOf(count.longValue() + 1));
 	}
 
 	/**
@@ -41,7 +41,7 @@ public class DiffTreeStatistics {
 	 */
 	public void remove(int state) {
 		// update stats
-		Integer kind = new Integer(state);
+		Integer kind = Integer.valueOf(state);
 		Long count = stats.get(kind);
 		if(count == null) {
 			// error condition, shouldn't be removing if we haven't added yet
@@ -49,7 +49,7 @@ public class DiffTreeStatistics {
 		} else {
 			long newCount = count.intValue() - 1;
 			if(newCount > 0) {
-				stats.put(kind, new Long(newCount));
+				stats.put(kind, Long.valueOf(newCount));
 			} else {
 				stats.remove(kind);
 			}
@@ -68,7 +68,7 @@ public class DiffTreeStatistics {
 	 */
 	public long countFor(int state, int mask) {
 		if(mask == 0) {
-			Long count = stats.get(new Integer(state));
+			Long count = stats.get(Integer.valueOf(state));
 			return count == null ? 0 : count.longValue();
 		} else {
 			Set keySet = stats.keySet();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java
index 5366f7ac5..5cdb14617 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java
@@ -29,11 +29,11 @@ public class SyncInfoStatistics {
 	 */
 	public void add(SyncInfo info) {
 		// update statistics
-		Long count = stats.get(new Integer(info.getKind()));
+		Long count = stats.get(Integer.valueOf(info.getKind()));
 		if(count == null) {
-			count = new Long(0);
+			count = Long.valueOf(0);
 		}
-		stats.put(new Integer(info.getKind()), new Long(count.longValue() + 1));
+		stats.put(Integer.valueOf(info.getKind()), Long.valueOf(count.longValue() + 1));
 	}
 
 	/**
@@ -42,7 +42,7 @@ public class SyncInfoStatistics {
 	 */
 	public void remove(SyncInfo info) {
 		// update stats
-		Integer kind = new Integer(info.getKind());
+		Integer kind = Integer.valueOf(info.getKind());
 		Long count = stats.get(kind);
 		if(count == null) {
 			// error condition, shouldn't be removing if we haven't added yet
@@ -50,7 +50,7 @@ public class SyncInfoStatistics {
 		} else {
 			long newCount = count.intValue() - 1;
 			if(newCount > 0) {
-				stats.put(kind, new Long(newCount));
+				stats.put(kind, Long.valueOf(newCount));
 			} else {
 				stats.remove(kind);
 			}
@@ -69,7 +69,7 @@ public class SyncInfoStatistics {
 	 */
 	public long countFor(int kind, int mask) {
 		if(mask == 0) {
-			Long count = stats.get(new Integer(kind));
+			Long count = stats.get(Integer.valueOf(kind));
 			return count == null ? 0 : count.longValue();
 		} else {
 			Iterator it = stats.keySet().iterator();