aboutsummaryrefslogtreecommitdiffstats
path: root/plugin
diff options
context:
space:
mode:
authorAdam Domurad <[email protected]>2013-05-02 10:41:20 -0400
committerAdam Domurad <[email protected]>2013-05-02 10:41:20 -0400
commit39eca3bd8d4767bd6e92e29abaaf18b2153d32e1 (patch)
treee47f48f93d320087d9ad962cfc4e5e9680e8144d /plugin
parent5292af48b536e2b73660a2d893b8f14a7e13fd2d (diff)
Remove incorrect undummied code in MethodOverloadResolver
Diffstat (limited to 'plugin')
-rw-r--r--plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java15
1 files changed, 3 insertions, 12 deletions
diff --git a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
index 8fb2989..827f22e 100644
--- a/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
+++ b/plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java
@@ -44,8 +44,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import netscape.javascript.JSObject;
-
/*
* This class resolved overloaded methods in Java objects using a cost
* based-approach described here:
@@ -65,7 +63,6 @@ public class MethodOverloadResolver {
static final int CLASS_SUPERCLASS_COST = 6;
static final int CLASS_STRING_COST = 7;
- static final int JSOBJECT_TO_ARRAY_COST = CLASS_STRING_COST;
static final int ARRAY_CAST_COST = 8;
/* A method signature with its casted parameters
@@ -198,10 +195,10 @@ public class MethodOverloadResolver {
castedArgs[i] = castedObj;
- Class<?> castedObjClass = castedObj == null ? null : castedObj.getClass();
- boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive();
-
if (PluginDebug.DEBUG) { /* avoid toString if not needed */
+ Class<?> castedObjClass = castedObj == null ? null : castedObj.getClass();
+ boolean castedObjIsPrim = castedObj == null ? false : castedObj.getClass().isPrimitive();
+
PluginDebug.debug("Param " + i + " of method " + candidate
+ " has cost " + weightedCast.getCost()
+ " original param type " + suppliedParamClass
@@ -340,12 +337,6 @@ public class MethodOverloadResolver {
return new WeightedCast(CLASS_STRING_COST, suppliedParam.toString());
}
- // JSObject to Java array
- if (suppliedParam instanceof JSObject
- && paramTypeClass.isArray()) {
- return new WeightedCast(JSOBJECT_TO_ARRAY_COST, suppliedParam);
- }
-
return null;
}