Skip to content

Commit 7172289

Browse files
BananeweizenCalixte
Bananeweizen
authored and
Calixte
committed
Replace boxing constructors
Boxing constructors of primitive types are deprecated in newer versions of Java and should not be used.
1 parent c102336 commit 7172289

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/Auditor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private void handleCheckstyleFailure(IProject project, CheckstyleException e)
176176
project.deleteMarkers(CheckstyleMarker.MARKER_ID, false, IResource.DEPTH_ZERO);
177177

178178
Map<String, Object> attrs = new HashMap<>();
179-
attrs.put(IMarker.PRIORITY, new Integer(IMarker.PRIORITY_NORMAL));
179+
attrs.put(IMarker.PRIORITY, Integer.valueOf(IMarker.PRIORITY_NORMAL));
180180
attrs.put(IMarker.SEVERITY, Integer.valueOf(IMarker.SEVERITY_ERROR));
181181
attrs.put(IMarker.MESSAGE, NLS.bind(Messages.Auditor_msgMsgCheckstyleInternalError, null));
182182

@@ -325,8 +325,8 @@ public void addError(AuditEvent error) {
325325
mMarkerAttributes.put(CheckstyleMarker.MODULE_NAME, metaData.getInternalName());
326326
mMarkerAttributes.put(CheckstyleMarker.MESSAGE_KEY,
327327
error.getLocalizedMessage().getKey());
328-
mMarkerAttributes.put(IMarker.PRIORITY, new Integer(IMarker.PRIORITY_NORMAL));
329-
mMarkerAttributes.put(IMarker.SEVERITY, new Integer(getSeverityValue(severity)));
328+
mMarkerAttributes.put(IMarker.PRIORITY, Integer.valueOf(IMarker.PRIORITY_NORMAL));
329+
mMarkerAttributes.put(IMarker.SEVERITY, Integer.valueOf(getSeverityValue(severity)));
330330
mMarkerAttributes.put(IMarker.LINE_NUMBER, Integer.valueOf(error.getLine()));
331331
mMarkerAttributes.put(IMarker.MESSAGE, getMessage(error));
332332

@@ -335,7 +335,7 @@ public void addError(AuditEvent error) {
335335

336336
// enables own category under Java Problem Type
337337
// setting for Problems view (RFE 1530366)
338-
mMarkerAttributes.put("categoryId", new Integer(999)); //$NON-NLS-1$
338+
mMarkerAttributes.put("categoryId", Integer.valueOf(999)); //$NON-NLS-1$
339339

340340
// create a marker for the actual resource
341341
IMarker marker = mResource.createMarker(CheckstyleMarker.MARKER_ID);

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckerFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static Checker createChecker(ICheckConfiguration config, IProject project
125125
}
126126

127127
// store checker in cache
128-
Long modified = new Long(configFileData.getModificationStamp());
128+
Long modified = Long.valueOf(configFileData.getModificationStamp());
129129
sCheckerMap.put(cacheKey, checker);
130130
sModifiedMap.put(cacheKey, modified);
131131
}
@@ -183,7 +183,7 @@ private static Checker tryCheckerCache(String cacheKey, long modificationStamp)
183183

184184
// compare modification times of the configs
185185
Long oldTime = sModifiedMap.get(cacheKey);
186-
Long newTime = new Long(modificationStamp);
186+
Long newTime = Long.valueOf(modificationStamp);
187187

188188
// no match - remove checker from cache
189189
if (oldTime == null || oldTime.compareTo(newTime) != 0) {

‎net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/builder/CheckstyleBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,14 @@ protected final IProject[] build(final int kind, @SuppressWarnings("rawtypes") f
181181
project.deleteMarkers(CheckstyleMarker.MARKER_ID, false, IResource.DEPTH_INFINITE);
182182

183183
Map<String, Object> markerAttributes = new HashMap<>();
184-
markerAttributes.put(IMarker.PRIORITY, new Integer(IMarker.PRIORITY_HIGH));
185-
markerAttributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
184+
markerAttributes.put(IMarker.PRIORITY, Integer.valueOf(IMarker.PRIORITY_HIGH));
185+
markerAttributes.put(IMarker.SEVERITY, Integer.valueOf(IMarker.SEVERITY_ERROR));
186186
markerAttributes.put(IMarker.MESSAGE,
187187
NLS.bind(Messages.CheckstyleBuilder_msgWrongBuilderOrder, project.getName()));
188188

189189
// enables own category under Java Problem Type
190190
// setting for Problems view (RFE 1530366)
191-
markerAttributes.put("categoryId", new Integer(999)); //$NON-NLS-1$
191+
markerAttributes.put("categoryId", Integer.valueOf(999)); //$NON-NLS-1$
192192

193193
// create a marker for the actual resource
194194
IMarker marker = project.createMarker(CheckstyleMarker.MARKER_ID);

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -971,19 +971,19 @@ public String getColumnText(Object element, int columnIndex) {
971971
switch (columnIndex) {
972972

973973
case 0:
974-
text = new String();
974+
text = "";
975975
break;
976976
case 1:
977-
text = module.getName() != null ? module.getName() : new String();
977+
text = module.getName() != null ? module.getName() : "";
978978
break;
979979
case 2:
980-
text = module.getSeverity() != null ? module.getSeverity().name() : new String();
980+
text = module.getSeverity() != null ? module.getSeverity().name() : "";
981981
break;
982982
case 3:
983-
text = module.getComment() != null ? module.getComment() : new String();
983+
text = module.getComment() != null ? module.getComment() : "";
984984
break;
985985
default:
986-
text = new String();
986+
text = "";
987987
break;
988988
}
989989
}
@@ -996,8 +996,8 @@ public String getColumnText(Object element, int columnIndex) {
996996
@Override
997997
public Comparable<?> getComparableValue(Object element, int col) {
998998
if (element instanceof Module && col == 0) {
999-
return Severity.ignore.equals(((Module) element).getSeverity()) ? new Integer(0)
1000-
: new Integer(1);
999+
return Severity.ignore.equals(((Module) element).getSeverity()) ? Integer.valueOf(0)
1000+
: Integer.valueOf(1);
10011001
}
10021002

10031003
return getColumnText(element, col);

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/ModifierOrderQuickfix.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public int compare(ASTNode arg0, ASTNode arg1) {
9797
int modifierIndex1 = MODIFIER_ORDER.indexOf(m1.getKeyword());
9898
int modifierIndex2 = MODIFIER_ORDER.indexOf(m2.getKeyword());
9999

100-
return new Integer(modifierIndex1).compareTo(new Integer(modifierIndex2));
100+
return Integer.valueOf(modifierIndex1).compareTo(Integer.valueOf(modifierIndex2));
101101
}
102102
});
103103

@@ -144,7 +144,7 @@ private boolean visitBodyDecl(BodyDeclaration node) {
144144
// find the range from first to last modifier. marker must be in between
145145
int minPos = modifiers.stream().mapToInt(Modifier::getStartPosition).min().getAsInt();
146146
int maxPos = modifiers.stream().mapToInt(Modifier::getStartPosition).max().getAsInt();
147-
147+
148148
if (minPos <= markerStartOffset && markerStartOffset <= maxPos) {
149149
List<?> reorderedModifiers = reOrderModifiers(node.modifiers());
150150
node.modifiers().clear();

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/GraphPieDataset.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void setStats(Stats stats) {
7979
// markers que l'on comptera dans une catégorie "Autres" car ils
8080
// représentent trop peu de %
8181
int leftCount = 0;
82-
float mCount = new Float(stats.getMarkerCount()).floatValue();
82+
float mCount = stats.getMarkerCount();
8383
// et on remplit
8484
for (Iterator<MarkerStat> iter = markerStatCollection.iterator(); iter.hasNext();) {
8585
MarkerStat markerStat = iter.next();
@@ -256,6 +256,6 @@ public void setValue(final Comparable<?> key, final Number value) {
256256
* the value.
257257
*/
258258
public void setValue(final Comparable<?> key, final double value) {
259-
setValue(key, new Double(value));
259+
setValue(key, Double.valueOf(value));
260260
}
261261
}

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/GraphStatsView.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -581,17 +581,17 @@ private void updateLabel() {
581581
Stats stats = getStats();
582582
if (stats != null) {
583583
String text = NLS.bind(Messages.GraphStatsView_lblViewMessage,
584-
new Object[] { new Integer(stats.getMarkerCount()),
585-
new Integer(stats.getMarkerStats().size()),
586-
new Integer(stats.getMarkerCountAll()) });
584+
new Object[] { Integer.valueOf(stats.getMarkerCount()),
585+
Integer.valueOf(stats.getMarkerStats().size()),
586+
Integer.valueOf(stats.getMarkerCountAll()) });
587587
mLabelDesc.setText(text);
588588
} else {
589589
mLabelDesc.setText("");
590590
}
591591
} else {
592592

593593
String text = NLS.bind(Messages.MarkerStatsView_lblDetailMessage, new Object[] {
594-
mCurrentDetailCategory, new Integer(mDetailViewer.getTable().getItemCount()) });
594+
mCurrentDetailCategory, Integer.valueOf(mDetailViewer.getTable().getItemCount()) });
595595
mLabelDesc.setText(text);
596596
}
597597
}
@@ -720,7 +720,7 @@ public Comparable<?> getComparableValue(Object element, int colIndex) {
720720

721721
switch (colIndex) {
722722
case 0:
723-
comparable = new Integer(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
723+
comparable = Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
724724
break;
725725
case 1:
726726
comparable = marker.getResource().getName();
@@ -729,10 +729,10 @@ public Comparable<?> getComparableValue(Object element, int colIndex) {
729729
comparable = marker.getResource().getParent().getFullPath().toString();
730730
break;
731731
case 3:
732-
comparable = new Integer(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
732+
comparable = Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
733733
break;
734734
case 4:
735-
comparable = marker.getAttribute(IMarker.MESSAGE, "").toString();
735+
comparable = marker.getAttribute(IMarker.MESSAGE, "");
736736
break;
737737

738738
default:

‎net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/views/MarkerStatsView.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,17 +475,17 @@ private void updateLabel() {
475475
Stats stats = getStats();
476476
if (stats != null) {
477477
String text = NLS.bind(Messages.MarkerStatsView_lblOverviewMessage,
478-
new Object[] { new Integer(stats.getMarkerCount()),
479-
new Integer(stats.getMarkerStats().size()),
480-
new Integer(stats.getMarkerCountAll()) });
478+
new Object[] { Integer.valueOf(stats.getMarkerCount()),
479+
Integer.valueOf(stats.getMarkerStats().size()),
480+
Integer.valueOf(stats.getMarkerCountAll()) });
481481
mDescLabel.setText(text);
482482
} else {
483483
mDescLabel.setText("");
484484
}
485485
} else {
486486

487487
String text = NLS.bind(Messages.MarkerStatsView_lblDetailMessage, new Object[] {
488-
mCurrentDetailCategory, new Integer(mDetailViewer.getTable().getItemCount()) });
488+
mCurrentDetailCategory, Integer.valueOf(mDetailViewer.getTable().getItemCount()) });
489489
mDescLabel.setText(text);
490490
}
491491
}
@@ -659,13 +659,13 @@ public Comparable<?> getComparableValue(Object element, int colIndex) {
659659

660660
switch (colIndex) {
661661
case 0:
662-
comparable = new Integer(stat.getMaxSeverity() * -1);
662+
comparable = Integer.valueOf(stat.getMaxSeverity() * -1);
663663
break;
664664
case 1:
665665
comparable = stat.getIdentifiant();
666666
break;
667667
case 2:
668-
comparable = new Integer(stat.getCount());
668+
comparable = Integer.valueOf(stat.getCount());
669669
break;
670670

671671
default:
@@ -758,7 +758,7 @@ public Comparable<?> getComparableValue(Object element, int colIndex) {
758758

759759
switch (colIndex) {
760760
case 0:
761-
comparable = new Integer(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
761+
comparable = Integer.valueOf(marker.getAttribute(IMarker.SEVERITY, Integer.MAX_VALUE) * -1);
762762
break;
763763
case 1:
764764
comparable = marker.getResource().getName();
@@ -767,7 +767,7 @@ public Comparable<?> getComparableValue(Object element, int colIndex) {
767767
comparable = marker.getResource().getParent().getFullPath().toString();
768768
break;
769769
case 3:
770-
comparable = new Integer(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
770+
comparable = Integer.valueOf(marker.getAttribute(IMarker.LINE_NUMBER, Integer.MAX_VALUE));
771771
break;
772772
case 4:
773773
comparable = marker.getAttribute(IMarker.MESSAGE, "");

0 commit comments

Comments
 (0)