antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Replace new Integer() with Integer.valueOf()

Browse source 
Signed-off-by: Tobi Schäfer <interface@p3k.org>
This commit is contained in:
Tobi Schäfer 2024-05-25 17:16:54 +02:00
parent a68c478dd5
commit 8ffb7b0b08
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
5 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/main/java/helma/scripting/rhino/JSAdapter.java
View file

@ -1,26 +1,26 @@
/*
* The contents of this file are subject to the terms
* of the Common Development and Distribution License
* The contents of this file are subject to the terms
* of the Common Development and Distribution License
* (the License). You may not use this file except in
* compliance with the License.
*
* You can obtain a copy of the license at
*
* You can obtain a copy of the license at
* https://glassfish.dev.java.net/public/CDDLv1.0.html or
* glassfish/bootstrap/legal/CDDLv1.0.txt.
* See the License for the specific language governing
* See the License for the specific language governing
* permissions and limitations under the License.
*
* When distributing Covered Code, include this CDDL
* Header Notice in each file and include the License file
* at glassfish/bootstrap/legal/CDDLv1.0.txt.
* If applicable, add the following below the CDDL Header,
*
* When distributing Covered Code, include this CDDL
* Header Notice in each file and include the License file
* at glassfish/bootstrap/legal/CDDLv1.0.txt.
* If applicable, add the following below the CDDL Header,
* with the fields enclosed by brackets [] replaced by
* you own identifying information:
* you own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package helma.scripting.rhino;
import org.mozilla.javascript.*;
@ -71,7 +71,7 @@ public final class JSAdapter implements Scriptable, Function {
private JSAdapter(Scriptable obj) {
setAdaptee(obj);
}
// initializer to setup JSAdapter prototype in the given scope
public static void init(Context cx, Scriptable scope, boolean sealed)
throws RhinoException {
@ -82,11 +82,11 @@ public final class JSAdapter implements Scriptable, Function {
ScriptableObject.defineProperty(scope, "JSAdapter", obj,
ScriptableObject.DONTENUM);
}
public String getClassName() {
return "JSAdapter";
}
public Object get(String name, Scriptable start) {
Function func = getAdapteeFunction(GET_PROP);
if (func != null) {
@ -96,17 +96,17 @@ public final class JSAdapter implements Scriptable, Function {
return start.get(name, start);
}
}
public Object get(int index, Scriptable start) {
Function func = getAdapteeFunction(GET_PROP);
if (func != null) {
return call(func, new Object[] { new Integer(index) });
return call(func, new Object[] { Integer.valueOf(index) });
} else {
start = getAdaptee();
return start.get(index, start);
}
}
public boolean has(String name, Scriptable start) {
Function func = getAdapteeFunction(HAS_PROP);
if (func != null) {
@ -117,18 +117,18 @@ public final class JSAdapter implements Scriptable, Function {
return start.has(name, start);
}
}
public boolean has(int index, Scriptable start) {
Function func = getAdapteeFunction(HAS_PROP);
if (func != null) {
Object res = call(func, new Object[] { new Integer(index) });
Object res = call(func, new Object[] { Integer.valueOf(index) });
return Context.toBoolean(res);
} else {
start = getAdaptee();
return start.has(index, start);
}
}
public void put(String name, Scriptable start, Object value) {
if (start == this) {
Function func = getAdapteeFunction(PUT_PROP);
@ -142,12 +142,12 @@ public final class JSAdapter implements Scriptable, Function {
start.put(name, start, value);
}
}
public void put(int index, Scriptable start, Object value) {
if (start == this) {
Function func = getAdapteeFunction(PUT_PROP);
if( func != null) {
call(func, new Object[] { new Integer(index), value });
call(func, new Object[] { Integer.valueOf(index), value });
} else {
start = getAdaptee();
start.put(index, start, value);
@ -156,7 +156,7 @@ public final class JSAdapter implements Scriptable, Function {
start.put(index, start, value);
}
}
public void delete(String name) {
Function func = getAdapteeFunction(DEL_PROP);
if (func != null) {
@ -165,32 +165,32 @@ public final class JSAdapter implements Scriptable, Function {
getAdaptee().delete(name);
}
}
public void delete(int index) {
Function func = getAdapteeFunction(DEL_PROP);
if (func != null) {
call(func, new Object[] { new Integer(index) });
call(func, new Object[] { Integer.valueOf(index) });
} else {
getAdaptee().delete(index);
}
}
public Scriptable getPrototype() {
return prototype;
}
public void setPrototype(Scriptable prototype) {
this.prototype = prototype;
}
public Scriptable getParentScope() {
return parent;
}
public void setParentScope(Scriptable parent) {
this.parent = parent;
}
public Object[] getIds() {
Function func = getAdapteeFunction(GET_PROPIDS);
if (func != null) {
@ -226,7 +226,7 @@ public final class JSAdapter implements Scriptable, Function {
return getAdaptee().getIds();
}
}
public boolean hasInstance(Scriptable scriptable) {
if (scriptable instanceof JSAdapter) {
return true;
@ -239,11 +239,11 @@ public final class JSAdapter implements Scriptable, Function {
return false;
}
}
public Object getDefaultValue(Class hint) {
return ScriptableObject.getDefaultValue(this, hint);
}
public Object call(Context cx, Scriptable scope, Scriptable thisObj,
Object[] args)
throws RhinoException {
@ -258,7 +258,7 @@ public final class JSAdapter implements Scriptable, Function {
}
}
}
public Scriptable construct(Context cx, Scriptable scope, Object[] args)
throws RhinoException {
if (isPrototype) {
@ -279,38 +279,38 @@ public final class JSAdapter implements Scriptable, Function {
}
}
}
public Scriptable getAdaptee() {
return adaptee;
}
public void setAdaptee(Scriptable adaptee) {
if (adaptee == null) {
throw new NullPointerException("adaptee can not be null");
}
this.adaptee = adaptee;
}
//-- internals only below this point
// map a property id. Property id can only be an Integer or String
private Object mapToId(Object tmp) {
if (tmp instanceof Double) {
return new Integer(((Double)tmp).intValue());
return Integer.valueOf(((Double)tmp).intValue());
} else {
return Context.toString(tmp);
}
}
private static Scriptable getFunctionPrototype(Scriptable scope) {
return ScriptableObject.getFunctionPrototype(scope);
}
private Function getAdapteeFunction(String name) {
Object o = ScriptableObject.getProperty(getAdaptee(), name);
return (o instanceof Function)? (Function)o : null;
}
private Object call(Function func, Object[] args) {
Context cx = Context.getCurrentContext();
Scriptable thisObj = getAdaptee();
@ -321,12 +321,12 @@ public final class JSAdapter implements Scriptable, Function {
throw Context.reportRuntimeError(re.getMessage());
}
}
private Scriptable prototype;
private Scriptable parent;
private Scriptable adaptee;
private boolean isPrototype;
// names of adaptee JavaScript functions
private static final String GET_PROP = "__get__";
private static final String HAS_PROP = "__has__";

2
src/main/java/helma/scripting/rhino/PathWrapper.java
View file

@ -106,7 +106,7 @@ public class PathWrapper extends ScriptableObject {
Object[] ids = new Object[path.size()];
for (int i=0; i<ids.length; i++) {
ids[i] = new Integer(i);
ids[i] = Integer.valueOf(i);
}
return ids;

2
src/main/java/helma/scripting/rhino/RhinoCore.java
View file

@ -620,7 +620,7 @@ public final class RhinoCore implements ScopeProvider {
if (arg instanceof Float || arg instanceof Long) {
return Double.valueOf(n.doubleValue());
} else if (!(arg instanceof Double)) {
return new Integer(n.intValue());
return Integer.valueOf(n.intValue());
}
} else if (arg instanceof INode) {
// interpret HopObject as object/dict

2
src/main/java/helma/scripting/rhino/extensions/DatabaseObject.java
View file

@ -456,7 +456,7 @@ public class DatabaseObject {
// First return system or or prototype properties
if (propertyName.equals("length")) {
return new Integer(colNames.size());
return Integer.valueOf(colNames.size());
} else {
if (resultSet == null) {
lastError = new SQLException("Attempt to access a released result set");

56
src/main/java/helma/util/CronJob.java
View file

@ -10,39 +10,39 @@ package helma.util;
/**
* The Protomatter Software License, Version 1.0
* derived from The Apache Software License, Version 1.1
*
*
* Copyright (c) 1998-2002 Nate Sammons. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed for the
* Protomatter Software Project
* (http://protomatter.sourceforge.net/)."
* Alternately, this acknowledgment may appear in the software itself,
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "Protomatter" and "Protomatter Software Project" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact support@protomatter.com.
*
*
* 5. Products derived from this software may not be called "Protomatter",
* nor may "Protomatter" appear in their name, without prior written
* permission of the Protomatter Software Project
* (support@protomatter.com).
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@ -103,7 +103,7 @@ public class CronJob {
* cron.name1.minute = minute-list
*
* cron.name1.timeout = timeout-value
*
*
* </pre></blockquote><p>
*
* And delivers corresponding <tt>CronJob</tt> objects in a collection.
@ -450,27 +450,27 @@ public class CronJob {
cal.setTime(date);
// try and short-circuit as fast as possible.
Integer theYear = new Integer(cal.get(Calendar.YEAR));
Integer theYear = Integer.valueOf(cal.get(Calendar.YEAR));
if (!year.contains(ALL_VALUE) && !year.contains(theYear))
return false;
Integer theMonth = new Integer(cal.get(Calendar.MONTH));
Integer theMonth = Integer.valueOf(cal.get(Calendar.MONTH));
if (!month.contains(ALL_VALUE) && !month.contains(theMonth))
return false;
Integer theDay = new Integer(cal.get(Calendar.DAY_OF_MONTH));
Integer theDay = Integer.valueOf(cal.get(Calendar.DAY_OF_MONTH));
if (!day.contains(ALL_VALUE) && !day.contains(theDay))
return false;
Integer theWeekDay = new Integer(cal.get(Calendar.DAY_OF_WEEK));
Integer theWeekDay = Integer.valueOf(cal.get(Calendar.DAY_OF_WEEK));
if (!weekday.contains(ALL_VALUE) && !weekday.contains(theWeekDay))
return false;
Integer theHour = new Integer(cal.get(Calendar.HOUR_OF_DAY));
Integer theHour = Integer.valueOf(cal.get(Calendar.HOUR_OF_DAY));
if (!hour.contains(ALL_VALUE) && !hour.contains(theHour))
return false;
Integer theMinute = new Integer(cal.get(Calendar.MINUTE));
Integer theMinute = Integer.valueOf(cal.get(Calendar.MINUTE));
if (!minute.contains(ALL_VALUE) && !minute.contains(theMinute))
return false;
@ -484,7 +484,7 @@ public class CronJob {
public void addYear(int year)
{
this.year.remove(ALL_VALUE);
this.year.add(new Integer(year));
this.year.add(Integer.valueOf(year));
}
/**
@ -492,7 +492,7 @@ public class CronJob {
*/
public void removeYear(int year)
{
this.year.remove(new Integer(year));
this.year.remove(Integer.valueOf(year));
}
/**
@ -520,7 +520,7 @@ public class CronJob {
public void addMonth(int month)
{
this.month.remove(ALL_VALUE);
this.month.add(new Integer(month));
this.month.add(Integer.valueOf(month));
}
/**
@ -530,7 +530,7 @@ public class CronJob {
*/
public void removeMonth(int month)
{
this.month.remove(new Integer(month));
this.month.remove(Integer.valueOf(month));
}
/**
@ -556,7 +556,7 @@ public class CronJob {
public void addDay(int day)
{
this.day.remove(ALL_VALUE);
this.day.add(new Integer(day));
this.day.add(Integer.valueOf(day));
}
/**
@ -564,7 +564,7 @@ public class CronJob {
*/
public void removeDay(int day)
{
this.day.remove(new Integer(day));
this.day.remove(Integer.valueOf(day));
}
/**
@ -592,7 +592,7 @@ public class CronJob {
public void addWeekday(int weekday)
{
this.weekday.remove(ALL_VALUE);
this.weekday.add(new Integer(weekday));
this.weekday.add(Integer.valueOf(weekday));
}
/**
@ -602,7 +602,7 @@ public class CronJob {
*/
public void removeWeekday(int weekday)
{
this.weekday.remove(new Integer(weekday));
this.weekday.remove(Integer.valueOf(weekday));
}
/**
@ -628,7 +628,7 @@ public class CronJob {
public void addHour(int hour)
{
this.hour.remove(ALL_VALUE);
this.hour.add(new Integer(hour));
this.hour.add(Integer.valueOf(hour));
}
/**
@ -636,7 +636,7 @@ public class CronJob {
*/
public void removeHour(int hour)
{
this.hour.remove(new Integer(hour));
this.hour.remove(Integer.valueOf(hour));
}
/**
@ -662,7 +662,7 @@ public class CronJob {
public void addMinute(int minute)
{
this.minute.remove(ALL_VALUE);
this.minute.add(new Integer(minute));
this.minute.add(Integer.valueOf(minute));
}
/**
@ -670,7 +670,7 @@ public class CronJob {
*/
public void removeMinute(int minute)
{
this.minute.remove(new Integer(minute));
this.minute.remove(Integer.valueOf(minute));
}
/**