diff options
author | Alex Blewitt | 2015-09-07 18:44:26 +0000 |
---|---|---|
committer | Alex Blewitt | 2015-09-11 07:51:36 +0000 |
commit | 2fe3fff966fde4cedc73ca8c1df13b2fd4d605a7 (patch) | |
tree | cd5c19a1363e899af66de1bdce90920ae5fd32ce | |
parent | 368177ac20c448cd2e6d7d5f2d983c9734b14a49 (diff) | |
download | eclipse.platform.debug-2fe3fff966fde4cedc73ca8c1df13b2fd4d605a7.tar.gz eclipse.platform.debug-2fe3fff966fde4cedc73ca8c1df13b2fd4d605a7.tar.xz eclipse.platform.debug-2fe3fff966fde4cedc73ca8c1df13b2fd4d605a7.zip |
Bug 476814 - Replace new Integer() with Integer.valueOf()
Using Integer.valueOf() instead of new Integer() allows for the runtime
to cache commonly instantiated values; typically, this will be for values
in the range -128..127. Using valueOf is preferred for this reason.
Change-Id: I1022eb4973b760b830ace5d39b76eea9353d4ca2
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
26 files changed, 97 insertions, 97 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java index be5564629..1692d6101 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -572,7 +572,7 @@ public class LaunchConfigurationInfo { * @throws CoreException if a problem is encountered */ protected void setIntegerAttribute(Element element) throws CoreException { - setAttribute(getKeyAttribute(element), new Integer(getValueAttribute(element))); + setAttribute(getKeyAttribute(element), Integer.valueOf(getValueAttribute(element))); } /** diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java index 372f57c09..cbf77aabf 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -412,7 +412,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen */ @Override public void setAttribute(String attributeName, int value) { - getInfo().setAttribute(attributeName, new Integer(value)); + getInfo().setAttribute(attributeName, Integer.valueOf(value)); setDirty(); } @@ -708,7 +708,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen IResource resource = resources[i]; if(resource != null) { paths.add(resource.getFullPath().toPortableString()); - types.add(new Integer(resource.getType()).toString()); + types.add(Integer.valueOf(resource.getType()).toString()); } } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java index 6368d709b..f0af97e5c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -116,7 +116,7 @@ public class LogicalStructureManager { if (i > 0 && i < selection.length() - 1) { String comboKey= selection.substring(0, i + 1); String selected= selection.substring(i + 1, selection.length()); - fStructureTypeSelections.put(comboKey, new Integer(Integer.parseInt(selected))); + fStructureTypeSelections.put(comboKey, Integer.valueOf(Integer.parseInt(selected))); } } } @@ -208,7 +208,7 @@ public class LogicalStructureManager { if (selected != null) { index= fStructureTypeIds.indexOf(selected.getId()); } - Integer integer= new Integer(index); + Integer integer= Integer.valueOf(index); fStructureTypeSelections.put(combo, integer); storeStructureTypeSelections(); storeStructureTypeIds(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java index 5e29625a2..a463d3e63 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java @@ -279,7 +279,7 @@ public final class XMLMemento { } String strValue = attr.getValue(); try { - return new Integer(strValue); + return Integer.valueOf(strValue); } catch (NumberFormatException e) { DebugPlugin .logMessage("Memento problem - invalid integer for key: " + key //$NON-NLS-1$ diff --git a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java index 9589a844b..d8ee82baf 100644 --- a/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java +++ b/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java @@ -46,7 +46,7 @@ public class PDAVirtualMachine { @Override public Object pop() { - return isEmpty() ? new Integer(0) : remove(size() - 1); + return isEmpty() ? Integer.valueOf(0) : remove(size() - 1); } @Override @@ -119,7 +119,7 @@ public class PDAVirtualMachine { Object getNextIntOrStringArg() { String arg = getNextStringArg(); try { - return new Integer(arg); + return Integer.valueOf(arg); } catch (NumberFormatException e) { } return arg; @@ -127,7 +127,7 @@ public class PDAVirtualMachine { PDAThread getThreadArg() { int id = getNextIntArg(); - return fThreads.get( new Integer(id) ); + return fThreads.get( Integer.valueOf(id) ); } } @@ -268,9 +268,9 @@ public class PDAVirtualMachine { } int bitFieldMask = 2^(bitField.fBitCount - 1); int registerMask = bitFieldMask << bitField.fBitOffset; - return new Integer( (reg.fValue & registerMask) >> bitField.fBitOffset ); + return Integer.valueOf( (reg.fValue & registerMask) >> bitField.fBitOffset ); } else { - return new Integer(reg.fValue); + return Integer.valueOf(reg.fValue); } } @@ -419,7 +419,7 @@ public class PDAVirtualMachine { Map<String, Integer> labels = new HashMap<String, Integer>(); for (int i = 0; i < code.length; i++) { if (code[i].length() != 0 && code[i].charAt(0) == ':') { - labels.put(code[i].substring(1), new Integer(i)); + labels.put(code[i].substring(1), Integer.valueOf(i)); } } return labels; @@ -472,7 +472,7 @@ public class PDAVirtualMachine { void run() { int id = fNextThreadId++; sendDebugEvent("vmstarted", false); //$NON-NLS-1$ - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ + fThreads.put(Integer.valueOf(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ if (fDebug) { sendDebugEvent("started " + id, false); //$NON-NLS-1$ } @@ -520,7 +520,7 @@ public class PDAVirtualMachine { } if (!thread.fRun) { sendDebugEvent("exited " + thread.fID, false); //$NON-NLS-1$ - fThreads.remove(new Integer(thread.fID)); + fThreads.remove(Integer.valueOf(thread.fID)); } else if (thread.fSuspend != null) { sendDebugEvent("suspended " + thread.fID + " " + thread.fSuspend, false); //$NON-NLS-1$ //$NON-NLS-2$ thread.fStep = thread.fStepReturn = thread.fPerformingEval = false; @@ -613,7 +613,7 @@ public class PDAVirtualMachine { if (fDebug) { for (Iterator<PDAThread> itr = fThreads.values().iterator(); itr.hasNext();) { PDAThread thread = itr.next(); - Integer pc = new Integer(thread.fCurrentFrame.fPC); + Integer pc = Integer.valueOf(thread.fCurrentFrame.fPC); // Suspend for breakpoint if: // - the VM is not yet set to suspend, for e.g. as a result of step end, // - the thread is not yet suspended and is not performing an evaluation @@ -800,7 +800,7 @@ public class PDAVirtualMachine { void debugClearBreakpoint(Args args) { int line = args.getNextIntArg(); - fBreakpoints.remove( new Integer(line) ); + fBreakpoints.remove( Integer.valueOf(line) ); sendCommandResponse("ok\n"); //$NON-NLS-1$ } @@ -1018,7 +1018,7 @@ public class PDAVirtualMachine { fThreads.clear(); int id = fNextThreadId++; - fThreads.put(new Integer(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ + fThreads.put(Integer.valueOf(id), new PDAThread(id, "main", 0)); //$NON-NLS-1$ sendDebugEvent("started " + id, false); //$NON-NLS-1$ fRegisters.clear(); @@ -1051,7 +1051,7 @@ public class PDAVirtualMachine { int line = args.getNextIntArg(); int stopVM = args.getNextIntArg(); - fBreakpoints.put(new Integer(line), Boolean.valueOf(stopVM != 0)); + fBreakpoints.put(Integer.valueOf(line), Boolean.valueOf(stopVM != 0)); sendCommandResponse("ok\n"); //$NON-NLS-1$ } @@ -1286,7 +1286,7 @@ public class PDAVirtualMachine { void debugWatch(Args args) { String funcAndVar = args.getNextStringArg(); int flags = args.getNextIntArg(); - fWatchpoints.put(funcAndVar, new Integer(flags)); + fWatchpoints.put(funcAndVar, Integer.valueOf(flags)); sendCommandResponse("ok\n"); //$NON-NLS-1$ } @@ -1300,9 +1300,9 @@ public class PDAVirtualMachine { if (val1 instanceof Integer && val2 instanceof Integer) { int intVal1 = ((Integer) val1).intValue(); int intVal2 = ((Integer) val2).intValue(); - thread.fStack.push( new Integer(intVal1 + intVal2) ); + thread.fStack.push( Integer.valueOf(intVal1 + intVal2) ); } else { - thread.fStack.push( new Integer(-1) ); + thread.fStack.push( Integer.valueOf(-1) ); } } @@ -1344,7 +1344,7 @@ public class PDAVirtualMachine { void iDec(PDAThread thread, Args args) { Object val = thread.fStack.pop(); if (val instanceof Integer) { - val = new Integer(((Integer) val).intValue() - 1); + val = Integer.valueOf(((Integer) val).intValue() - 1); } thread.fStack.push(val); } @@ -1383,7 +1383,7 @@ public class PDAVirtualMachine { if (bitField == null) { return; } - bitField.fMnemonics.put(args.getNextStringArg(), new Integer(args.getNextIntArg())); + bitField.fMnemonics.put(args.getNextStringArg(), Integer.valueOf(args.getNextIntArg())); } sendDebugEvent("registers", false); //$NON-NLS-1$ } @@ -1419,7 +1419,7 @@ public class PDAVirtualMachine { String label = args.getNextStringArg(); if (fLabels.containsKey(label)) { int id = fNextThreadId++; - fThreads.put( new Integer(id), new PDAThread(id, label, fLabels.get(label).intValue()) ); + fThreads.put( Integer.valueOf(id), new PDAThread(id, label, fLabels.get(label).intValue()) ); sendDebugEvent("started " + id, false); //$NON-NLS-1$ } else { sendDebugEvent("no such label " + label, true); //$NON-NLS-1$ @@ -1483,7 +1483,7 @@ public class PDAVirtualMachine { } } else { try { - val = new Integer(arg); + val = Integer.valueOf(arg); } catch (NumberFormatException e) { } } @@ -1510,7 +1510,7 @@ public class PDAVirtualMachine { void iVar(PDAThread thread, Args args) { String var = args.getNextStringArg(); - thread.fCurrentFrame.set(var, new Integer(0)); + thread.fCurrentFrame.set(var, Integer.valueOf(0)); } /** diff --git a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java index e024badf6..a7d66efaf 100644 --- a/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java +++ b/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2013 IBM Corporation and others. + * Copyright (c) 2005, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -493,12 +493,12 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr private void started(PDAStartedEvent event) { PDAThread newThread = new PDAThread(this, event.fThreadId); - fThreads.put(new Integer(event.fThreadId), newThread); + fThreads.put(Integer.valueOf(event.fThreadId), newThread); newThread.start(); } private void exited(PDAExitedEvent event) { - PDAThread thread = fThreads.remove(new Integer(event.fThreadId)); + PDAThread thread = fThreads.remove(Integer.valueOf(event.fThreadId)); if (thread != null) { thread.exit(); } @@ -587,7 +587,7 @@ public class PDADebugTarget extends PDADebugElement implements IDebugTarget, IBr */ public PDAThread getThread(int threadId) { if (threadId > 0) { - return fThreads.get(new Integer(threadId)); + return fThreads.get(Integer.valueOf(threadId)); } else { synchronized(fThreads) { if (fThreads.size() > 0) { diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java index 065ffa2b3..65dc6c1bc 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -354,7 +354,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau Map<?, ?> attributes = handle.getAttributes(); // retrieve attributes assertEquals("String1 should be String1", "String1", attributes.get("String1")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - assertEquals("Int1 should be 1", new Integer(1), attributes.get("Int1")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Int1 should be 1", Integer.valueOf(1), attributes.get("Int1")); //$NON-NLS-1$ //$NON-NLS-2$ assertEquals("Boolean1 should be true", Boolean.TRUE, attributes.get("Boolean1")); //$NON-NLS-1$ //$NON-NLS-2$ assertEquals("Boolean2 should be false", Boolean.FALSE, attributes.get("Boolean2")); //$NON-NLS-1$ //$NON-NLS-2$ @@ -1440,7 +1440,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ - setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test.project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test.project", Integer.valueOf(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); assertNotNull("There should be mapped resources", res); //$NON-NLS-1$ assertTrue("There should be one project", res.length == 1); //$NON-NLS-1$ @@ -1462,7 +1462,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ - setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test/project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test/project", Integer.valueOf(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); assertNull("There should be no mapped resources", res); //$NON-NLS-1$ } @@ -1483,7 +1483,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ - setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test\\project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("test\\project", Integer.valueOf(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); if(Platform.OS_WIN32.equals(Platform.getOS())) { assertNull("There should be no mapped resources", res); //$NON-NLS-1$ @@ -1509,7 +1509,7 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau try { ILaunchConfigurationWorkingCopy wc = lc.getWorkingCopy(); assertNotNull("Should have a working copy of the testig launch configuration", wc); //$NON-NLS-1$ - setResourceMappings(wc, new ResourceItem[] { new ResourceItem("/project", new Integer(IResource.PROJECT)) }); //$NON-NLS-1$ + setResourceMappings(wc, new ResourceItem[] { new ResourceItem("/project", Integer.valueOf(IResource.PROJECT)) }); //$NON-NLS-1$ IResource[] res = wc.getMappedResources(); assertNotNull("There should be mapped resources", res); //$NON-NLS-1$ } diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java index 076181461..7275130a1 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Wind River Systems and others. + * Copyright (c) 2009, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -378,12 +378,12 @@ abstract public class ContentTests extends TestCase implements ITestModelUpdates private boolean areCapturedChildrenUpdatesComplete(List<IViewerUpdate> capturedUpdates, int childCount) { List<Integer> expectedChildren = new ArrayList<Integer>(); for (int i = 0; i < childCount; i++) { - expectedChildren.add(new Integer(i)); + expectedChildren.add(Integer.valueOf(i)); } IChildrenUpdate[] updates = capturedUpdates.toArray(new IChildrenUpdate[0]); for (int i = 0; i < updates.length; i++) { for (int j = 0; j < updates[i].getLength(); j++) { - expectedChildren.remove( new Integer(updates[i].getOffset() + j) ); + expectedChildren.remove( Integer.valueOf(updates[i].getOffset() + j) ); } } return expectedChildren.isEmpty(); diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java index 9959c5d06..0409c367e 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/PresentationContextTests.java @@ -35,7 +35,7 @@ public class PresentationContextTests extends TestCase { public void testSaveRestore () { PresentationContext context = new PresentationContext("test"); //$NON-NLS-1$ context.setProperty("string", "string"); //$NON-NLS-1$ //$NON-NLS-2$ - context.setProperty("integer", new Integer(1)); //$NON-NLS-1$ + context.setProperty("integer", Integer.valueOf(1)); //$NON-NLS-1$ context.setProperty("boolean", Boolean.TRUE); //$NON-NLS-1$ context.setProperty("persistable", ResourcesPlugin.getWorkspace().getRoot().getAdapter(IPersistableElement.class)); //$NON-NLS-1$ @@ -45,7 +45,7 @@ public class PresentationContextTests extends TestCase { context = new PresentationContext("test"); //$NON-NLS-1$ context.initProperties(memento); assertEquals("Wrong value restored", "string", context.getProperty("string")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - assertEquals("Wrong value restored", new Integer(1), context.getProperty("integer")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("Wrong value restored", Integer.valueOf(1), context.getProperty("integer")); //$NON-NLS-1$ //$NON-NLS-2$ assertEquals("Wrong value restored", Boolean.TRUE, context.getProperty("boolean")); //$NON-NLS-1$ //$NON-NLS-2$ assertEquals("Wrong value restored", ResourcesPlugin.getWorkspace().getRoot(), context.getProperty("persistable")); //$NON-NLS-1$ //$NON-NLS-2$ context.dispose(); diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java index aedcc1824..99e5b5137 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Wind River Systems and others. + * Copyright (c) 2009, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -261,13 +261,13 @@ public class TestModelUpdatesListener childrenIndexes = new TreeSet<Integer>(); fChildrenUpdatesScheduled.put(path, childrenIndexes); } - childrenIndexes.add(new Integer(index)); + childrenIndexes.add(Integer.valueOf(index)); } public void removeChildrenUpdate(TreePath path, int index) { Set<?> childrenIndexes = fChildrenUpdatesScheduled.get(path); if (childrenIndexes != null) { - childrenIndexes.remove(new Integer(index)); + childrenIndexes.remove(Integer.valueOf(index)); if (childrenIndexes.isEmpty()) { fChildrenUpdatesScheduled.remove(path); } @@ -411,7 +411,7 @@ public class TestModelUpdatesListener Set<Integer> childrenIndexes = new HashSet<Integer>(); for (int i = 0; i < children.length; i++) { if (!isFiltered(children[i], filters)) { - childrenIndexes.add(new Integer(i)); + childrenIndexes.add(Integer.valueOf(i)); } } fChildrenUpdatesScheduled.put(path, childrenIndexes); @@ -601,7 +601,7 @@ public class TestModelUpdatesListener IChildrenUpdate update = ((IChildrenUpdate)itr.next()); Set<?> set = fChildrenUpdatesScheduled.get(update.getElementPath()); for (int i = update.getOffset(); set != null && i < update.getOffset() + update.getLength(); i++) { - if (set.contains(new Integer(i))) { + if (set.contains(Integer.valueOf(i))) { runningCount++; } } @@ -610,7 +610,7 @@ public class TestModelUpdatesListener IChildrenUpdate update = ((IChildrenUpdate)itr.next()); Set<?> set = fChildrenUpdatesScheduled.get(update.getElementPath()); for (int i = update.getOffset(); set != null && i < update.getOffset() + update.getLength(); i++) { - if (set.contains(new Integer(i))) { + if (set.contains(Integer.valueOf(i))) { runningCount++; } } @@ -668,7 +668,7 @@ public class TestModelUpdatesListener Set<?> childrenIndexes = fChildrenUpdatesScheduled.get(updatePath); if (childrenIndexes != null) { for (int i = start; i < end; i++) { - childrenIndexes.remove(new Integer(i)); + childrenIndexes.remove(Integer.valueOf(i)); } if (childrenIndexes.isEmpty()) { fChildrenUpdatesScheduled.remove(updatePath); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java index 198430846..e6e52995b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java @@ -256,7 +256,7 @@ public class DefaultLabelProvider implements ILabelProvider { if (element instanceof IProcess) { IProcess process = (IProcess)element; int exit = process.getExitValue(); - terminatedMessage = MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new Object[] { new Integer(exit).toString() }); + terminatedMessage = MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new Object[] { Integer.valueOf(exit).toString() }); } else { terminatedMessage= DebugUIMessages.DefaultLabelProvider_1; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java index 0a683b12e..7a6d99a72 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation and others. + * Copyright (c) 2007, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,7 +75,7 @@ public class LaunchConfigurationComparator extends WorkbenchViewerComparator { Iterator<ILaunchConfigurationType> iterator = types.iterator(); int i = 0; while (iterator.hasNext()) { - fgCategories.put(iterator.next(), new Integer(i)); + fgCategories.put(iterator.next(), Integer.valueOf(i)); i++; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java index fd0a4f73b..fcc44b961 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java @@ -2624,7 +2624,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende return; } - PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_COL_SIZE, null, new Integer(fColumnSize)); + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_COL_SIZE, null, Integer.valueOf(fColumnSize)); firePropertyChangedEvent(event); } @@ -2637,7 +2637,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende return; } - PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_ROW_SIZE, null, new Integer(fBytePerLine)); + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractAsyncTableRendering.PROPERTY_ROW_SIZE, null, Integer.valueOf(fBytePerLine)); firePropertyChangedEvent(event); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java index 9cd2acc2f..be18c62d0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -124,7 +124,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements fBufferSizeEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK, DebugPreferencesMessages.ConsolePreferencePage_Console_buffer_size__characters___2, getFieldEditorParent()); addField(fBufferSizeEditor); fBufferSizeEditor.setValidRange(1000, Integer.MAX_VALUE - 100000); - fBufferSizeEditor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.ConsolePreferencePage_The_console_buffer_size_must_be_at_least_1000_characters__1, new Integer(Integer.MAX_VALUE - 100000))); + fBufferSizeEditor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.ConsolePreferencePage_The_console_buffer_size_must_be_at_least_1000_characters__1, Integer.valueOf(Integer.MAX_VALUE - 100000))); fUseBufferSize.getChangeControl(getFieldEditorParent()).addSelectionListener( new SelectionAdapter() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java index 2a2aad765..731dbd03a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. + * Copyright (c) 2004, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -130,7 +130,7 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement addField(editor); int historyMax = IDebugPreferenceConstants.MAX_LAUNCH_HISTORY_SIZE; editor.setTextLimit(Integer.toString(historyMax).length()); - editor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.DebugPreferencePage_11, new Object[] { new Integer(1), new Integer(historyMax)})); + editor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.DebugPreferencePage_11, new Object[] { Integer.valueOf(1), Integer.valueOf(historyMax)})); editor.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE); editor.setValidRange(1, historyMax); editor.setEmptyStringAllowed(false); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java index 223d7ffcb..a1437560b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalTreeModelViewer.java @@ -879,7 +879,7 @@ public class InternalTreeModelViewer extends TreeViewer implements IInternalTree for (int i = 0; i < columns.length; i++) { TreeColumn treeColumn = columns[i]; Object id = treeColumn.getData(); - fColumnSizes.put(id, new Integer(treeColumn.getWidth())); + fColumnSizes.put(id, Integer.valueOf(treeColumn.getWidth())); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java index 46aefd80b..34ebb6ead 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/provisional/VirtualItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Wind River Systems and others. + * Copyright (c) 2011, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public class VirtualItem { private Integer fIndexValue; public Index(int index) { - fIndexValue = new Integer(index); + fIndexValue = Integer.valueOf(index); } @Override @@ -59,11 +59,11 @@ public class VirtualItem { } public void increment() { - fIndexValue = new Integer(fIndexValue.intValue() + 1); + fIndexValue = Integer.valueOf(fIndexValue.intValue() + 1); } public void decrement() { - fIndexValue = new Integer(fIndexValue.intValue() - 1); + fIndexValue = Integer.valueOf(fIndexValue.intValue() - 1); } public int intValue() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java index f45b79568..a4041592c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -468,7 +468,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { ViewForm viewerViewForm = new ViewForm(parent, SWT.NONE); PlatformUI.getWorkbench().getHelpSystem().setHelp(viewerViewForm, IDebugUIConstants.PLUGIN_ID + ".MemoryView_context"); //$NON-NLS-1$ fViewPaneControls.put(MemoryBlocksTreeViewPane.PANE_ID, viewerViewForm); - fWeights.add(new Integer(15)); + fWeights.add(Integer.valueOf(15)); fMemBlkViewer.addSelectionListener(fSelectionProvider); @@ -541,7 +541,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 { fViewPanes.put(paneId, renderingPane); ViewForm renderingViewForm = new ViewForm(fSashForm, SWT.NONE); fViewPaneControls.put(paneId, renderingViewForm); - fWeights.add(new Integer(40)); + fWeights.add(Integer.valueOf(40)); Control renderingControl = renderingPane.createViewPane(renderingViewForm, paneId, DebugUIMessages.MemoryView_Memory_renderings, true, true); PlatformUI.getWorkbench().getHelpSystem().setHelp(renderingControl, IDebugUIConstants.PLUGIN_ID + ".MemoryView_context"); //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java index c14df2012..e8579f78e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2009 IBM Corporation and others. + * Copyright (c) 2004, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -219,6 +219,6 @@ public class MemoryViewUtil { * Returns the hash code for this object, as an Integer. * */ public static Integer getHashCode(Object o) { - return new Integer(o.hashCode()); + return Integer.valueOf(o.hashCode()); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java index d610df637..fdae55512 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -471,8 +471,8 @@ public class FormatTableRenderingDialog extends TrayDialog && elmt.supportsProperty(fRendering, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL)) { try { - elmt.setProperty(fRendering, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL, new Integer(rowSize)); - elmt.setProperty(fRendering, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL, new Integer(columnSize)); + elmt.setProperty(fRendering, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL, Integer.valueOf(rowSize)); + elmt.setProperty(fRendering, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL, Integer.valueOf(columnSize)); } catch (CoreException e) { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), DebugUIMessages.FormatTableRenderingDialog_4, DebugUIMessages.FormatTableRenderingDialog_5, e); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/RenderingsUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/RenderingsUtil.java index 4d25e38f7..d4486e1f1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/RenderingsUtil.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/RenderingsUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 IBM Corporation and others. + * Copyright (c) 2004, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -460,15 +460,15 @@ public class RenderingsUtil { { for (int j=0; j<4; j++) { - buf[j] = new Integer(i>>j*8).byteValue(); + buf[j] = Integer.valueOf(i>>j*8).byteValue(); } return buf; } - for (int j=3; j>=0; j--) - { - buf[j] = new Integer(i>>(3-j)*8).byteValue(); - } - return buf; + for (int j=3; j>=0; j--) + { + buf[j] = Integer.valueOf(i>>(3-j)*8).byteValue(); + } + return buf; } /** @@ -485,15 +485,15 @@ public class RenderingsUtil { { for (short j=0; j<2; j++) { - buf[j] = new Integer(i>>j*8).byteValue(); + buf[j] = Integer.valueOf(i>>j*8).byteValue(); } return buf; } - for (short j=1; j>=0; j--) - { - buf[j] = new Integer(i>>(1-j)*8).byteValue(); - } - return buf; + for (short j=1; j>=0; j--) + { + buf[j] = Integer.valueOf(i>>(1-j)*8).byteValue(); + } + return buf; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java index a7f80721d..3c775b855 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java @@ -1896,7 +1896,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering return; } - PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_COL_SIZE, null, new Integer(fColumnSize)); + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_COL_SIZE, null, Integer.valueOf(fColumnSize)); firePropertyChangedEvent(event); } @@ -1909,7 +1909,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering return; } - PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_ROW_SIZE, null, new Integer(fBytePerLine)); + PropertyChangeEvent event = new PropertyChangeEvent(this, AbstractTableRendering.PROPERTY_ROW_SIZE, null, Integer.valueOf(fBytePerLine)); firePropertyChangedEvent(event); } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java index b6da2a383..a29105d3a 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleInputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -232,7 +232,7 @@ public class IOConsoleInputStream extends InputStream { if (newFontStyle != fontStyle) { int old = fontStyle; fontStyle = newFontStyle; - console.firePropertyChange(this, IConsoleConstants.P_FONT_STYLE, new Integer(old), new Integer(fontStyle)); + console.firePropertyChange(this, IConsoleConstants.P_FONT_STYLE, Integer.valueOf(old), Integer.valueOf(fontStyle)); } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java index 125c5f26d..267937c9b 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -100,7 +100,7 @@ public class IOConsoleOutputStream extends OutputStream { if (newFontStyle != fontStyle) { int old = fontStyle; fontStyle = newFontStyle; - console.firePropertyChange(this, IConsoleConstants.P_FONT_STYLE, new Integer(old), new Integer(fontStyle)); + console.firePropertyChange(this, IConsoleConstants.P_FONT_STYLE, Integer.valueOf(old), Integer.valueOf(fontStyle)); } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java index aaae641eb..49cfc55a7 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -172,7 +172,7 @@ public abstract class TextConsole extends AbstractConsole { int old = fConsoleWidth; fConsoleWidth = width; - firePropertyChange(this, IConsoleConstants.P_CONSOLE_WIDTH, new Integer(old), new Integer(fConsoleWidth)); + firePropertyChange(this, IConsoleConstants.P_CONSOLE_WIDTH, Integer.valueOf(old), Integer.valueOf(fConsoleWidth)); } } @@ -188,7 +188,7 @@ public abstract class TextConsole extends AbstractConsole { ConsolePlugin.getStandardDisplay().asyncExec(new Runnable() { @Override public void run() { - firePropertyChange(TextConsole.this, IConsoleConstants.P_TAB_SIZE, new Integer(oldTabWidth), new Integer(fTabWidth)); + firePropertyChange(TextConsole.this, IConsoleConstants.P_TAB_SIZE, Integer.valueOf(oldTabWidth), Integer.valueOf(fTabWidth)); } }); } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java index 020ae3b98..87315b44f 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -105,7 +105,7 @@ public class TextViewerGotoLineAction extends TextViewerAction { fLastLine= document.getLineOfOffset(document.getLength()) + 1; int startLine= selection == null ? 1 : fTextViewer.getTextWidget().getLineAtOffset(selection.x) + 1; String title= ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1; - String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, new Object[] {new Integer(fLastLine)}); + String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, new Object[] {Integer.valueOf(fLastLine)}); String value= Integer.toString(startLine); Shell activeShell= fTextViewer.getTextWidget().getShell(); InputDialog d= new InputDialog(activeShell, title, message, value, new NumberValidator()); |