--- a/examples/Matrix.java
+++ b/examples/Matrix.java
@@ -218,7 +218,7 @@ public class Matrix implements Scriptabl
* Use the convenience method from Context that takes care of calling
* toString, etc.
*/
- public Object getDefaultValue(Class<?> typeHint) {
+ public Object getDefaultValue(Class typeHint) {
return "[object Matrix]";
}
--- a/examples/PrimitiveWrapFactory.java
+++ b/examples/PrimitiveWrapFactory.java
@@ -25,7 +25,7 @@ import org.mozilla.javascript.*;
public class PrimitiveWrapFactory extends WrapFactory {
@Override
public Object wrap(Context cx, Scriptable scope, Object obj,
- Class<?> staticType)
+ Class staticType)
{
if (obj instanceof String || obj instanceof Number ||
obj instanceof Boolean)
--- a/src/org/mozilla/javascript/WrapFactory.java
+++ b/src/org/mozilla/javascript/WrapFactory.java
@@ -42,7 +42,7 @@ public class WrapFactory
* @return the wrapped value.
*/
public Object wrap(Context cx, Scriptable scope,
- Object obj, Class<?> staticType)
+ Object obj, Class staticType)
{
if (obj == null || obj == Undefined.instance
|| obj instanceof Scriptable)
--- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
@@ -8,7 +8,7 @@
<target name="properties">
<property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/>
- <available file="downloaded/AbstractCellEditor.java"
+ <available file="treetable/AbstractCellEditor.java"
property="swing-ex-available"/>
</target>
@@ -16,9 +16,9 @@
<!-- Download source from Sun's site, unzip it, remove
the files we don't need, and change the package
-->
- <mkdir dir="downloaded"/>
- <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
- <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
+ <mkdir dir="treetable"/>
+ <get src="${swing-ex-url}" dest="treetable/swingExSrc.zip"/>
+ <unzip src="treetable/swingExSrc.zip" dest="downloaded/">
<patternset>
<include name="AbstractCellEditor.java"/>
<include name="JTreeTable.java"/>
@@ -26,58 +26,58 @@
<include name="TreeTableModelAdapter.java"/>
</patternset>
</unzip>
- <replace file="downloaded/AbstractCellEditor.java">
+ <replace file="treetable/AbstractCellEditor.java">
<replacetoken>import java.awt.Component;</replacetoken>
<replacevalue>
-package org.mozilla.javascript.tools.debugger.downloaded;
+package org.mozilla.javascript.tools.debugger.treetable;
</replacevalue>
</replace>
- <replace file="downloaded/AbstractCellEditor.java">
+ <replace file="treetable/AbstractCellEditor.java">
<replacetoken>import java.awt.event.*;</replacetoken>
<replacevalue></replacevalue>
</replace>
- <replace file="downloaded/AbstractCellEditor.java">
+ <replace file="treetable/AbstractCellEditor.java">
<replacetoken>import java.awt.AWTEvent;</replacetoken>
<replacevalue></replacevalue>
</replace>
- <replace file="downloaded/AbstractCellEditor.java">
+ <replace file="treetable/AbstractCellEditor.java">
<replacetoken>import java.io.Serializable;</replacetoken>
<replacevalue></replacevalue>
</replace>
- <replace file="downloaded/JTreeTable.java">
+ <replace file="treetable/JTreeTable.java">
<replacetoken>import javax.swing.*;</replacetoken>
<replacevalue>
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.*;
</replacevalue>
</replace>
- <replace file="downloaded/JTreeTable.java">
+ <replace file="treetable/JTreeTable.java">
<replacetoken>class ListToTreeSelectionModelWrapper</replacetoken>
<replacevalue>public class ListToTreeSelectionModelWrapper</replacevalue>
</replace>
- <replace file="downloaded/JTreeTable.java">
+ <replace file="treetable/JTreeTable.java">
<replacetoken>ListSelectionModel getListSelectionModel</replacetoken>
<replacevalue>public ListSelectionModel getListSelectionModel</replacevalue>
</replace>
- <replace file="downloaded/JTreeTable.java">
+ <replace file="treetable/JTreeTable.java">
<replacetoken>import java.awt.Rectangle;</replacetoken>
<replacevalue></replacevalue>
</replace>
- <replace file="downloaded/TreeTableModel.java">
+ <replace file="treetable/TreeTableModel.java">
<replacetoken>import javax.swing.tree.TreeModel;</replacetoken>
<replacevalue>
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.tree.TreeModel;
</replacevalue>
</replace>
- <replace file="downloaded/TreeTableModelAdapter.java">
+ <replace file="treetable/TreeTableModelAdapter.java">
<replacetoken>import javax.swing.JTree;</replacetoken>
<replacevalue>
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.JTree;
</replacevalue>
</replace>
- <delete file="downloaded/swingExSrc.zip"/>
+ <delete file="treetable/swingExSrc.zip"/>
</target>
<target name="download" depends="properties,get-swing-ex"/>
--- a/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
+++ b/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
@@ -36,7 +36,7 @@ public class JavaPolicySecurity extends
return super.defineClass(name, data, 0, data.length, domain);
}
- public void linkClass(Class<?> cl) {
+ public void linkClass(Class cl) {
resolveClass(cl);
}
}
--- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
+++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
@@ -86,7 +86,7 @@ class Namespace extends IdScriptableObje
}
@Override
- public Object getDefaultValue(Class<?> hint) {
+ public Object getDefaultValue(Class hint) {
return uri();
}
--- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
+++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
@@ -116,7 +116,7 @@ final class QName extends IdScriptableOb
}
@Override
- public Object getDefaultValue(Class<?> hint) {
+ public Object getDefaultValue(Class hint) {
return toString();
}
--- a/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
+++ b/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
@@ -105,7 +105,7 @@ abstract class XMLObjectImpl extends XML
}
@Override
- public final Object getDefaultValue(Class<?> hint) {
+ public final Object getDefaultValue(Class hint) {
return this.toString();
}