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