ES5-Test262 progress

deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java

@@ -43,6 +43,7 @@
  * @deprecated The exception is no longer thrown by Rhino runtime as
  * {@link EvaluatorException} is used instead.
  */
+@Deprecated
 public class ClassDefinitionException extends RuntimeException
 {
     static final long serialVersionUID = -5637830967241712746L;

deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java

@@ -44,6 +44,7 @@
  * @deprecated The exception is no longer thrown by Rhino runtime as
  * {@link EvaluatorException} is used instead.
  */
+@Deprecated
 public class NotAFunctionException extends RuntimeException
 {
     static final long serialVersionUID = 6461524852170711724L;

deprecatedsrc/org/mozilla/javascript/PropertyException.java

@@ -43,6 +43,7 @@
 /**
  * @deprecated This exception is no longer thrown by Rhino runtime.
  */
+@Deprecated
 public class PropertyException extends RuntimeException
 {
     static final long serialVersionUID = -8221564865490676219L;

deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java

@@ -172,19 +172,19 @@ else if (xmlOne.isStart())
     private static boolean attributeListsEqual(XmlCursor xmlOne, XmlCursor xmlTwo)
     {
         boolean result = true;
-        TreeMap mapOne = loadAttributeMap(xmlOne);
-        TreeMap mapTwo = loadAttributeMap(xmlTwo);
+        TreeMap<?, ?> mapOne = loadAttributeMap(xmlOne);
+        TreeMap<?, ?> mapTwo = loadAttributeMap(xmlTwo);
 
         if (mapOne.size() != mapTwo.size())
         {
             result = false;
         }
         else
         {
-            Set keysOne = mapOne.keySet();
-            Set keysTwo = mapTwo.keySet();
-            Iterator itOne = keysOne.iterator();
-            Iterator itTwo = keysTwo.iterator();
+            Set<?> keysOne = mapOne.keySet();
+            Set<?> keysTwo = mapTwo.keySet();
+            Iterator<?> itOne = keysOne.iterator();
+            Iterator<?> itTwo = keysTwo.iterator();
 
             while (result && itOne.hasNext())
             {

deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/Namespace.java

@@ -115,6 +115,7 @@ public String prefix()
      *
      * @return
      */
+    @Override
     public String toString ()
     {
         return uri();
@@ -129,17 +130,20 @@ public String toLocaleString ()
         return toString();
     }
 
+    @Override
     public boolean equals(Object obj)
     {
         if (!(obj instanceof Namespace)) return false;
         return equals((Namespace)obj);
     }
 
+    @Override
     public int hashCode()
     {
         return uri().hashCode();
     }
 
+    @Override
     protected Object equivalentValues(Object value)
     {
         if (!(value instanceof Namespace)) return Scriptable.NOT_FOUND;
@@ -156,6 +160,7 @@ private boolean equals(Namespace n)
      *
      * @return
      */
+    @Override
     public String getClassName ()
     {
         return "Namespace";
@@ -166,6 +171,7 @@ public String getClassName ()
      * @param hint
      * @return
      */
+    @Override
     public Object getDefaultValue (Class hint)
     {
         return uri();
@@ -177,11 +183,13 @@ public Object getDefaultValue (Class hint)
         Id_uri                  = 2,
         MAX_INSTANCE_ID         = 2;
 
+    @Override
     protected int getMaxInstanceId()
     {
         return super.getMaxInstanceId() + MAX_INSTANCE_ID;
     }
 
+    @Override
     protected int findInstanceIdInfo(String s)
     {
         int id;
@@ -208,6 +216,7 @@ protected int findInstanceIdInfo(String s)
     }
 // #/string_id_map#
 
+    @Override
     protected String getInstanceIdName(int id)
     {
         switch (id - super.getMaxInstanceId()) {
@@ -217,6 +226,7 @@ protected String getInstanceIdName(int id)
         return super.getInstanceIdName(id);
     }
 
+    @Override
     protected Object getInstanceIdValue(int id)
     {
         switch (id - super.getMaxInstanceId()) {
@@ -237,6 +247,7 @@ protected Object getInstanceIdValue(int id)
         Id_toSource             = 3,
         MAX_PROTOTYPE_ID        = 3;
 
+    @Override
     protected int findPrototypeId(String s)
     {
         int id;
@@ -256,6 +267,7 @@ protected int findPrototypeId(String s)
     }
 // #/string_id_map#
 
+    @Override
     protected void initPrototypeId(int id)
     {
         String s;
@@ -269,10 +281,11 @@ protected void initPrototypeId(int id)
         initPrototypeMethod(NAMESPACE_TAG, id, s, arity);
     }
 
+    @Override
     public Object execIdCall(IdFunctionObject f,
                              Context cx,
                              Scriptable scope,
-                             Scriptable thisObj,
+                             Object thisObj,
                              Object[] args)
     {
         if (!f.hasTag(NAMESPACE_TAG)) {
@@ -290,7 +303,7 @@ public Object execIdCall(IdFunctionObject f,
         throw new IllegalArgumentException(String.valueOf(id));
     }
 
-    private Namespace realThis(Scriptable thisObj, IdFunctionObject f)
+    private Namespace realThis(Object thisObj, IdFunctionObject f)
     {
         if(!(thisObj instanceof Namespace))
             throw incompatibleCallError(f);

deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/QName.java

@@ -76,6 +76,7 @@ void exportAsJSClass(boolean sealed)
      *
      * @return
      */
+    @Override
     public String toString()
     {
         String result;
@@ -111,17 +112,20 @@ String uri()
         return uri;
     }
 
+    @Override
     public boolean equals(Object obj)
     {
         if(!(obj instanceof QName)) return false;
         return equals((QName)obj);
     }
 
+    @Override
     public int hashCode()
     {
         return localName.hashCode() ^ (uri == null ? 0 : uri.hashCode());
     }
 
+    @Override
     protected Object equivalentValues(Object value)
     {
         if(!(value instanceof QName)) return Scriptable.NOT_FOUND;
@@ -146,6 +150,7 @@ private boolean equals(QName q)
      *
      * @return
      */
+    @Override
     public String getClassName ()
     {
         return "QName";
@@ -156,6 +161,7 @@ public String getClassName ()
      * @param hint
      * @return
      */
+    @Override
     public Object getDefaultValue (Class hint)
     {
         return toString();
@@ -167,11 +173,13 @@ public Object getDefaultValue (Class hint)
         Id_uri                  = 2,
         MAX_INSTANCE_ID         = 2;
 
+    @Override
     protected int getMaxInstanceId()
     {
         return super.getMaxInstanceId() + MAX_INSTANCE_ID;
     }
 
+    @Override
     protected int findInstanceIdInfo(String s)
     {
         int id;
@@ -198,6 +206,7 @@ protected int findInstanceIdInfo(String s)
     }
 // #/string_id_map#
 
+    @Override
     protected String getInstanceIdName(int id)
     {
         switch (id - super.getMaxInstanceId()) {
@@ -207,6 +216,7 @@ protected String getInstanceIdName(int id)
         return super.getInstanceIdName(id);
     }
 
+    @Override
     protected Object getInstanceIdValue(int id)
     {
         switch (id - super.getMaxInstanceId()) {
@@ -223,6 +233,7 @@ protected Object getInstanceIdValue(int id)
         Id_toSource             = 3,
         MAX_PROTOTYPE_ID        = 3;
 
+    @Override
     protected int findPrototypeId(String s)
     {
         int id;
@@ -242,6 +253,7 @@ protected int findPrototypeId(String s)
     }
 // #/string_id_map#
 
+    @Override
     protected void initPrototypeId(int id)
     {
         String s;
@@ -255,10 +267,11 @@ protected void initPrototypeId(int id)
         initPrototypeMethod(QNAME_TAG, id, s, arity);
     }
 
+    @Override
     public Object execIdCall(IdFunctionObject f,
                              Context cx,
                              Scriptable scope,
-                             Scriptable thisObj,
+                             Object thisObj,
                              Object[] args)
     {
         if (!f.hasTag(QNAME_TAG)) {
@@ -276,7 +289,7 @@ public Object execIdCall(IdFunctionObject f,
         throw new IllegalArgumentException(String.valueOf(id));
     }
 
-    private QName realThis(Scriptable thisObj, IdFunctionObject f)
+    private QName realThis(Object thisObj, IdFunctionObject f)
     {
         if(!(thisObj instanceof QName))
             throw incompatibleCallError(f);