diff -up rhino1_7R3/examples/Matrix.java.build rhino1_7R3/examples/Matrix.java
--- rhino1_7R3/examples/Matrix.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/examples/Matrix.java 2011-09-14 17:37:15.167031995 +0200
@@ -249,7 +249,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]";
}
diff -up rhino1_7R3/examples/PrimitiveWrapFactory.java.build rhino1_7R3/examples/PrimitiveWrapFactory.java
--- rhino1_7R3/examples/PrimitiveWrapFactory.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/examples/PrimitiveWrapFactory.java 2011-09-14 17:37:15.168031994 +0200
@@ -57,7 +57,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)
diff -up rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java
--- rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build 2011-05-09 20:04:34.000000000 +0200
+++ rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java 2011-09-14 17:37:15.169031993 +0200
@@ -75,7 +75,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)
diff -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build 2011-05-09 20:04:36.000000000 +0200
+++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml 2011-09-14 17:37:15.175031989 +0200
@@ -38,7 +38,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>
@@ -46,9 +46,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"/>
@@ -56,58 +56,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"/>
diff -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build 2011-05-09 20:04:36.000000000 +0200
+++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2011-09-14 17:37:15.170031993 +0200
@@ -67,7 +67,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);
}
}
diff -up rhino1_7R3/xmlimplsrc/build.xml.build rhino1_7R3/xmlimplsrc/build.xml
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2011-09-14 17:37:15.171031993 +0200
@@ -120,7 +120,7 @@ class Namespace extends IdScriptableObje
}
@Override
- public Object getDefaultValue(Class<?> hint) {
+ public Object getDefaultValue(Class hint) {
return uri();
}
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2011-09-14 17:37:15.172031992 +0200
@@ -150,7 +150,7 @@ final class QName extends IdScriptableOb
}
@Override
- public Object getDefaultValue(Class<?> hint) {
+ public Object getDefaultValue(Class hint) {
return toString();
}
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2011-09-14 17:37:15.173031991 +0200
@@ -165,7 +165,7 @@ abstract class XMLObjectImpl extends XML
}
@Override
- public final Object getDefaultValue(Class<?> hint) {
+ public final Object getDefaultValue(Class hint) {
return this.toString();
}