harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r555259 - in /harmony/enhanced/classlib/branches/java6/modules: annotation/src/main/java/java/lang/annotation/ archive/src/main/java/java/util/zip/ archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ awt/src/main/native/fo...
Date Wed, 11 Jul 2007 13:03:04 GMT
Author: tellison
Date: Wed Jul 11 06:03:01 2007
New Revision: 555259

URL: http://svn.apache.org/viewvc?view=rev&rev=555259
Log:
Merge updates from classlib trunk@555239 made since r554615

Removed:
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/GenericURLDirContextFactory.java
Modified:
    harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Expression.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyEditorSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Language_no.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java

Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/src/main/java/java/lang/annotation/Retention.java Wed Jul 11 06:03:01 2007
@@ -29,5 +29,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.ANNOTATION_TYPE)
 public @interface Retention {
-    RetentionPolicy value() default RetentionPolicy.CLASS;
+    RetentionPolicy value();
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java Wed Jul 11 06:03:01 2007
@@ -370,7 +370,7 @@
     public void write(byte[] buffer, int off, int nbytes)
 			throws java.io.IOException {
 		// avoid int overflow, check null buf
-		if ((off > buffer.length) || (nbytes < 0) || (off < 0)
+		if ((off < 0 || (nbytes < 0) || off > buffer.length)
 				|| (buffer.length - off < nbytes)) {
 			throw new IndexOutOfBoundsException();
 		}

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java Wed Jul 11 06:03:01 2007
@@ -227,6 +227,14 @@
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
+        
+        // Regression for HARMONY-4405
+        try {
+            zip.write(null, 0, -2);
+            fail("Should throw IndexOutOfBoundsException");
+        } catch (IndexOutOfBoundsException e) {
+            // expected
+        }
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp Wed Jul 11 06:03:01 2007
@@ -1,3 +1,21 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
 #include "TypeDefinition.h"
 
 fint fwcslen(fwchar_t* str)

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Expression.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Expression.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Expression.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Expression.java Wed Jul 11 06:03:01 2007
@@ -67,8 +67,9 @@
     }
 
     public Object getValue() throws Exception {
-        if ((value == null) && !valueIsDefined) {
+        if (!valueIsDefined) {
             value = invokeMethod();
+            valueIsDefined = true;
         }
         return value;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyEditorSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyEditorSupport.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyEditorSupport.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PropertyEditorSupport.java Wed Jul 11 06:03:01 2007
@@ -79,10 +79,7 @@
         return newValue;
     }
 
-    public void setSource(Object source) {
-        if (source == null) {
-            throw new NullPointerException(Messages.getString("beans.0C")); //$NON-NLS-1$
-        }
+    public void setSource(Object source) {        
         this.source = source;
     }
 
@@ -115,15 +112,22 @@
     }
 
     public void firePropertyChange() {
-        if (listeners.size() > 0) {
-            PropertyChangeEvent event = new PropertyChangeEvent(source, null,
-                    oldValue, newValue);
-            Iterator<PropertyChangeListener> iterator = listeners.iterator();
-
-            while (iterator.hasNext()) {
-                PropertyChangeListener listener = iterator.next();
-                listener.propertyChange(event);
-            }
+        if (listeners.isEmpty()) {
+            return;
+        }
+
+        List<PropertyChangeListener> copy = new ArrayList<PropertyChangeListener>(
+                listeners.size());
+        synchronized (listeners) {
+            copy.addAll(listeners);
+        }
+
+        PropertyChangeEvent changeAllEvent = new PropertyChangeEvent(source,
+                null, null, null);
+        for (Iterator<PropertyChangeListener> listenersItr = copy.iterator(); listenersItr
+                .hasNext();) {
+            PropertyChangeListener listna = listenersItr.next();
+            listna.propertyChange(changeAllEvent);
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java Wed Jul 11 06:03:01 2007
@@ -22,19 +22,33 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-import java.util.Vector;
+
 import org.apache.harmony.beans.internal.nls.Messages;
 
 public class Statement {
+    private static final Object[] EMPTY_ARRAY = new Object[0];
+
     private Object target;
 
     private String methodName;
 
     private Object[] arguments;
+    
+    // the special method name donating constructors
+    static final String CONSTRUCTOR_NAME = "new"; //$NON-NLS-1$
+
+    // the special method name donating array "get"
+    static final String ARRAY_GET = "get"; //$NON-NLS-1$
+
+    // the special method name donating array "set"
+    static final String ARRAY_SET = "set"; //$NON-NLS-1$
 
     public Statement(Object target, String methodName, Object[] arguments) {
         this.target = target;
@@ -42,20 +56,21 @@
         if (arguments != null) {
             this.arguments = arguments;
         } else {
-            this.arguments = new Object[0];
+            this.arguments = EMPTY_ARRAY;
         }
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
+        Object target = getTarget();
+        String methodName = getMethodName();
+        Object[] arguments = getArguments();
         String targetVar = target != null ? convertClassName(target.getClass()) : "null"; //$NON-NLS-1$
-
         sb.append(targetVar);
         sb.append('.');
         sb.append(methodName);
         sb.append('(');
-
         if (arguments != null) {
             for (int i = 0; i < arguments.length; ++i) {
                 if (i > 0) {
@@ -74,7 +89,6 @@
         }
         sb.append(')');
         sb.append(';');
-
         return sb.toString();
     }
 
@@ -96,36 +110,32 @@
 
     Object invokeMethod() throws Exception {
         Object result = null;
-
         try {
+            Object target = getTarget();
+            String methodName = getMethodName();
+            Object[] arguments = getArguments();
             if (target.getClass().isArray()) {
-                Method method = findArrayMethod();
-                Object[] ama = getArrayMethodArguments();
-                result = method.invoke(null, ama);
+                Method method = findArrayMethod(methodName, arguments);
+                Object[] args = new Object[arguments.length + 1];
+                args[0] = target;
+                System.arraycopy(arguments, 0, args, 1, arguments.length);
+                result = method.invoke(null, args);
             } else if (methodName.equals("newInstance") //$NON-NLS-1$
                     && target == Array.class) {
                 Class<?> componentType = (Class) arguments[0];
-                int length = (Integer) arguments[1];
+                int length = ((Integer) arguments[1]).intValue();
                 result = Array.newInstance(componentType, length);
-            } else if (target instanceof Class &&
-                       (methodName.equals("new") || //$NON-NLS-1$
-                        methodName.equals("newInstance"))) { //$NON-NLS-1$
-                Constructor<?> constructor;
-                Class<?> clazz = (Class <?>) target;
-                
-                if (clazz.isArray()) {
-                    // special form for constructing arrays, 
-                    // can be passed from decoder
-                    result = Array.newInstance(clazz.getComponentType(),
-                            (Integer) arguments[0]);
-                } else {
-                    constructor = findConstructor();
+            } else if (methodName.equals("new") //$NON-NLS-1$
+                    || methodName.equals("newInstance")) { //$NON-NLS-1$
+                if (target instanceof Class) {
+                    Constructor<?> constructor = findConstructor((Class)target, arguments);
                     result = constructor.newInstance(arguments);
+                } else {
+                    throw new NoSuchMethodException(this.toString());
                 }
             } else if (target instanceof Class) {
                 Method method = null;
                 boolean found = false;
-
                 try {
                     /*
                      * Try to look for a static method of class described by the
@@ -139,7 +149,6 @@
                     }
                 } catch (NoSuchMethodException e) {
                 }
-
                 if (!found) {
                     // static method was not found
                     // try to invoke method of Class object
@@ -157,17 +166,28 @@
                         result = method.invoke(target, arguments);
                     }
                 }
+            } else if (target instanceof Iterator){
+            	final Iterator iterator = (Iterator) target;
+				final Method method = findMethod(target.getClass(), methodName,
+						arguments, false);
+				if (iterator.hasNext()) {
+					PrivilegedAction action = new PrivilegedAction() {
+
+						public Object run() {
+							try {
+								method.setAccessible(true);
+								return (method.invoke(iterator, new Object[0]));
+							} catch (Exception e) {
+								// ignore
+							} 
+							return null;
+						}
+						
+					};
+					result = action.run();
+				}
             } else {
                 Method method = findMethod(target.getClass(), methodName, arguments, false);
-                // XXX investigate: do we really need this?
-                // AccessController.doPrivileged(new PrivilegedAction<Object>()
-                // {
-                //      
-                // public Object run() {
-                // mtd.setAccessible(true);
-                // return null;
-                // }
-                // });
                 result = method.invoke(target, arguments);
             }
         } catch (InvocationTargetException ite) {
@@ -177,7 +197,7 @@
         return result;
     }
 
-    private Method findArrayMethod() throws NoSuchMethodException {
+    private Method findArrayMethod(String methodName, Object[] arguments) throws NoSuchMethodException {
         // the code below reproduces exact RI exception throwing behavior
         if (!methodName.equals("set") && !methodName.equals("get")) { //$NON-NLS-1$ //$NON-NLS-2$
             throw new NoSuchMethodException(Messages.getString("beans.3C")); //$NON-NLS-1$
@@ -196,28 +216,14 @@
                 int.class, Object.class });
     }
 
-    private Object[] getArrayMethodArguments() {
-        Object[] args = new Object[arguments.length + 1];
-
-        args[0] = target;
-        for (int i = 0; i < arguments.length; ++i) {
-            args[i + 1] = arguments[i];
-        }
-        return args;
-    }
-
-    private Constructor<?> findConstructor() throws NoSuchMethodException {
+    private Constructor<?> findConstructor(Class targetClass, Object[] arguments) throws NoSuchMethodException {
         Class<?>[] argClasses = getClasses(arguments);
-        Class<?> targetClass = (Class) target;
         Constructor<?> result = null;
         Constructor<?>[] constructors = targetClass.getConstructors();
-
         for (Constructor<?> constructor : constructors) {
             Class<?>[] parameterTypes = constructor.getParameterTypes();
-
             if (parameterTypes.length == argClasses.length) {
                 boolean found = true;
-
                 for (int j = 0; j < parameterTypes.length; ++j) {
                     boolean argIsNull = argClasses[j] == null;
                     boolean argIsPrimitiveWrapper = isPrimitiveWrapper(argClasses[j],
@@ -225,7 +231,6 @@
                     boolean paramIsPrimitive = parameterTypes[j].isPrimitive();
                     boolean paramIsAssignable = argIsNull ? false : parameterTypes[j]
                             .isAssignableFrom(argClasses[j]);
-
                     if (!argIsNull && !paramIsAssignable && !argIsPrimitiveWrapper || argIsNull
                             && paramIsPrimitive) {
                         found = false;
@@ -252,35 +257,28 @@
             boolean methodIsStatic) throws NoSuchMethodException {
         Class<?>[] argClasses = getClasses(arguments);
         Method[] methods = targetClass.getMethods();
-        Vector<Method> foundMethods = new Vector<Method>();
+        ArrayList<Method> foundMethods = new ArrayList<Method>();
         Method[] foundMethodsArr;
-
         for (Method method : methods) {
             int mods = method.getModifiers();
-
             if (method.getName().equals(methodName)
                     && (methodIsStatic ? Modifier.isStatic(mods) : true)) {
                 Class<?>[] parameterTypes = method.getParameterTypes();
-
                 if (parameterTypes.length == argClasses.length) {
                     boolean found = true;
-
                     for (int j = 0; j < parameterTypes.length; ++j) {
                         boolean argIsNull = (argClasses[j] == null);
                         boolean argIsPrimitiveWrapper = isPrimitiveWrapper(argClasses[j],
                                 parameterTypes[j]);
-                        boolean paramIsPrimitive = parameterTypes[j].isPrimitive();
                         boolean paramIsAssignable = argIsNull ? false : parameterTypes[j]
                                 .isAssignableFrom(argClasses[j]);
-
-                        if (!argIsNull && !paramIsAssignable && !argIsPrimitiveWrapper
-                                || argIsNull && paramIsPrimitive) {
+                        if (!argIsNull && !paramIsAssignable && !argIsPrimitiveWrapper){
                             found = false;
                             break;
                         }
                     }
                     if (found) {
-                        foundMethods.addElement(method);
+                        foundMethods.add(method);
                     }
                 }
             }
@@ -288,19 +286,32 @@
         if (foundMethods.size() == 0) {
             throw new NoSuchMethodException(Messages.getString("beans.41", methodName)); //$NON-NLS-1$
         }
+        if(foundMethods.size() == 1){
+            return foundMethods.get(0);
+        }
         foundMethodsArr = foundMethods.toArray(new Method[foundMethods.size()]);
-        Arrays.sort(foundMethodsArr, new MethodComparator(methodName, argClasses));
-        return foundMethodsArr[0];
+        //find the most relevant one
+        MethodComparator comparator = new MethodComparator(methodName, argClasses);
+        Method chosenOne = foundMethodsArr[0];
+        for (int i = 1; i < foundMethodsArr.length; i++) {
+            int difference = comparator.compare(chosenOne, foundMethodsArr[i]);
+            //if 2 methods have same relevance, throw exception
+            if(difference == 0){
+                throw new NoSuchMethodException("Cannot decide which method to call: "+methodName);
+            }
+            if(difference > 0){
+                chosenOne = foundMethodsArr[i];
+            }
+        }
+        return chosenOne;
     }
 
     static boolean isStaticMethodCall(Statement stmt) {
         Object target = stmt.getTarget();
         String mName = stmt.getMethodName();
-
         if (!(target instanceof Class)) {
             return false;
         }
-
         try {
             Statement.findMethod((Class) target, mName, stmt.getArguments(), true);
             return true;
@@ -408,29 +419,6 @@
             result[i] = (arguments[i] == null) ? null : arguments[i].getClass();
         }
         return result;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof Statement) {
-            Statement s = (Statement) o;
-            Object[] otherArguments = s.getArguments();
-            boolean argsEqual = (otherArguments.length == arguments.length);
-            if (argsEqual) {
-                for (int i = 0; i < arguments.length; ++i) {
-                    if (otherArguments[i] != arguments[i]) {
-                        argsEqual = false;
-                        break;
-                    }
-                }
-            }
-            if (!argsEqual) {
-                return false;
-            }
-            return (s.getTarget() == this.getTarget() && s.getMethodName().equals(
-                    this.getMethodName()));
-        }
-        return false;
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java Wed Jul 11 06:03:01 2007
@@ -658,15 +658,17 @@
         t.getValue();
         MockObject.assertCalled("new2", arguments);
 
+        //FIXME: the following 2 commented assert cannot pass neither in RI nor in Harmony (HARMONY-4392),
+        // waiting for dev-list approval to fix Harmony implementation following spec 
         arguments = new Object[] { "test" };
         t = new Expression(MockObject.class, "new", arguments);
         assertTrue(t.getValue() instanceof MockObject);
-        // MockObject.assertCalled("new2", arguments);
+//         MockObject.assertCalled("new3", arguments);
 
         arguments = new Object[] { new Integer(1) };
         t = new Expression(MockObject.class, "new", arguments);
         assertTrue(t.getValue() instanceof MockObject);
-        MockObject.assertCalled("new1-2", arguments);
+//        MockObject.assertCalled("new1-2", arguments);
     }
 
     /*
@@ -831,6 +833,15 @@
         }
     }
 
+    public void testGetValue_returnNull() throws Exception {
+        MockTarget target = new MockTarget();
+        Expression e = new Expression(target, "aMethod", new Object[] {});
+        Object got = e.getValue();
+        assertTrue(MockTarget.isCalled());
+        got = e.getValue();
+        assertFalse(MockTarget.isCalled());
+    }
+
     /*
      * Test the method getValue() with two equal specific methods.
      * 
@@ -926,6 +937,24 @@
         }
     }
 
+    public static class MockTarget {
+        static int called = 0;
+
+        static int base = 0;
+
+        public Object aMethod() { // should return null on first call
+            called++;
+            return null;
+        }
+
+        public static boolean isCalled() {
+            boolean result = !(base == called);
+            base = called;
+            return result;
+        }
+
+    }
+
     /*
      * Mock object.
      */
@@ -943,9 +972,9 @@
             }
         }
 
-        public MockObject(Integer o) {
+        public MockObject(String o) {
             reset();
-            calledMethod = "new1-2";
+            calledMethod = "new3";
             receivedArguments.add(o);
         }
 
@@ -954,13 +983,14 @@
             calledMethod = "new2";
             receivedArguments.add(o);
         }
-
-        public MockObject(String o) {
+        
+        public MockObject(Integer o) {
             reset();
-            calledMethod = "new3";
+            calledMethod = "new1-2";
             receivedArguments.add(o);
         }
 
+
         public MockObject(Object o, Object o2) {
             reset();
             calledMethod = "new4";
@@ -1070,6 +1100,68 @@
         public static void assertNotCalled() {
             assertNull(calledMethod);
             assertTrue(receivedArguments.isEmpty());
+        }
+    }
+
+    public void testSubExpression() throws Exception {
+        MyExpression my_e = new MyExpression();
+        my_e.setTarget(new Target());
+        my_e.setArguments(new Object[] {});
+        my_e.setMethodName("aMethod");
+        my_e.execute();
+        assertEquals("haha", my_e.getValue());
+    }
+
+    private static class MyExpression extends java.beans.Expression {
+
+        private Object target = null;
+
+        private Object args[] = new Object[] { new Object() };
+
+        private String name = "";
+
+        public MyExpression() {
+            super(null, null, null);
+        }
+
+        public void setTarget(Object t) {
+            target = t;
+        }
+
+        public Object getTarget() {
+            return target;
+        }
+
+        public void setArguments(Object[] a) {
+            args = a;
+        }
+
+        public Object[] getArguments() {
+            return args;
+        }
+
+        public void setMethodName(String n) {
+            name = n;
+        }
+
+        public String getMethodName() {
+            return name;
+        }
+
+        public void setValue(Object value) {
+            super.setValue(value);
+        }
+
+        public Object getValue() {
+            return "haha";
+        }
+
+    }
+
+    public static class Target {
+
+        public Object aMethod() {
+            return "haha";
         }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java Wed Jul 11 06:03:01 2007
@@ -287,11 +287,24 @@
         support.setSource(source);
         assertSame(source, support.getSource());
 
-        try {
-            support.setSource(null);
-            fail("No expected NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        support.setSource(null);
+    }
+    
+    public void testSetValue_Event() {
+        PropertyEditorSupport support = new PropertyEditorSupport();
+        Object source = new Object();
+        support.setSource(source);
+        MockPropertyChangeListener listener = new MockPropertyChangeListener();
+        support.addPropertyChangeListener(listener);
+        
+        support.setValue(new Object());        
+        PropertyChangeEvent event = listener.getEvent();
+        assertNotNull(event);
+        assertEquals(source, event.getSource());
+        assertNull(event.getNewValue());
+        assertNull(event.getOldValue());
+        assertNull(event.getPropagationId());
+        assertNull(event.getPropertyName());        
     }
 
     public static class MockSource {
@@ -411,5 +424,21 @@
                             : this.eventSource.equals(other.eventSource)) && (this.label == null ? other.label == null
                     : this.label.equals(other.label)));
         }
+    }
+    
+    public class MockPropertyChangeListener implements PropertyChangeListener
+    {
+
+        private PropertyChangeEvent event;        
+        public void propertyChange(PropertyChangeEvent event) {
+            
+            this.event = event;
+        }
+        
+        public PropertyChangeEvent getEvent()
+        {
+            return event;
+        }
+        
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java Wed Jul 11 06:03:01 2007
@@ -542,15 +542,16 @@
         arguments = new Object[] { "test" };
         t = new Statement(MockObject.class, "new", arguments);
         t.execute();
-        // XXX RI calls new2 here, not the most specific constructor. Bug in RI?
-        // MockObject.assertCalled("new3", arguments);
+        //FIXME: the following 2 commented assert cannot pass neither in RI nor in Harmony (HARMONY-4392),
+        // waiting for dev-list approval to fix Harmony implementation following spec        
+//         MockObject.assertCalled("new3", arguments);
 
-        arguments = new Object[] { new Integer(1) };
-        t = new Statement(MockObject.class, "new", arguments);
+        Object[] arguments2 = new Object[] { new Integer(1) };
+        t = new Statement(MockObject.class, "new", arguments2);
         t.execute();
-        MockObject.assertCalled("new1-2", arguments);
+//        MockObject.assertCalled("new1-2", arguments2);
     }
-
+    
     /*
      * Test the method execute() with the Class object, a static method name and
      * valid arguments.
@@ -803,8 +804,8 @@
         Statement t = new Statement(mo, "intMethod", arguments);
         try {
             t.execute();
-            fail("Should throw NoSuchMethodException!");
-        } catch (NoSuchMethodException ex) {
+            fail("Should throw IllegalArgumentException!");
+        } catch (IllegalArgumentException ex) {
             // expected
         }
     }
@@ -840,6 +841,36 @@
             // expected
         }
     }
+    
+    
+    /*
+     * Test for special case of overloaded method execute
+     */
+    public void testExecute_AmbiguousOverloadedMethods() throws Exception {
+        MockObject mo = new MockObject();
+        Object[] arguments = new Object[] { new MockObject(), new MockObject() };
+        Statement t = new Statement(mo, "overloadedMethod", arguments);
+        t.execute();
+        MockObject.assertCalled("overloadedmethod", arguments);
+        
+        arguments = new Object[] { new MockParent(), new MockParent() };
+        t = new Statement(mo, "overloadedMethod", arguments);
+        t.execute();
+        MockObject.assertCalled("overloadedmethod2", arguments);
+        
+        arguments = new Object[] { new MockObject(), new MockObject() };
+        t = new Statement(mo, "overloadedMethodB", arguments);
+        try{
+            t.execute();
+            fail("should throw Exception");
+        }catch(Exception e){
+        }
+        
+        arguments = new Object[] { new MockObject(), new MockParent() };
+        t = new Statement(mo, "overloadedMethodB", arguments);
+        t.execute();
+        MockObject.assertCalled("overloadedmethodB", arguments);
+    }
 
     /*
      * Super class of MockObject.
@@ -923,25 +954,24 @@
                 calledMethod = "new1";
             }
         }
-
-        public MockObject(Integer o) {
+        
+        public MockObject(String o) {
             reset();
-            calledMethod = "new1-2";
+            calledMethod = "new3";
             receivedArguments.add(o);
         }
-
+        
         public MockObject(Object o) {
             reset();
             calledMethod = "new2";
             receivedArguments.add(o);
         }
 
-        public MockObject(String o) {
+        public MockObject(Integer o) {
             reset();
-            calledMethod = "new3";
+            calledMethod = "new1-2";
             receivedArguments.add(o);
         }
-
         public MockObject(Object o, Object o2) {
             reset();
             calledMethod = "new4";
@@ -988,7 +1018,42 @@
             calledMethod = "methodB2";
             receivedArguments.add(new Boolean(b));
         }
-
+        
+        public void overloadedMethod(MockObject o1, MockObject o2){
+            reset();
+            calledMethod = "overloadedmethod";
+            receivedArguments.add(o1);
+            receivedArguments.add(o2);
+        }
+        
+        public void overloadedMethod(MockParent o1, MockParent o2){
+            reset();
+            calledMethod = "overloadedmethod2";
+            receivedArguments.add(o1);
+            receivedArguments.add(o2);
+        }
+        
+        public void overloadedMethod(MockObject o1, MockParent o2){
+            reset();
+            calledMethod = "overloadedmethod2";
+            receivedArguments.add(o1);
+            receivedArguments.add(o2);
+        }
+        
+        public void overloadedMethodB(MockObject o1, MockParent o2){
+            reset();
+            calledMethod = "overloadedmethodB";
+            receivedArguments.add(o1);
+            receivedArguments.add(o2);
+        }
+        
+        public void overloadedMethodB(MockParent o1, MockObject o2){
+            reset();
+            calledMethod = "overloadedmethodB2";
+            receivedArguments.add(o1);
+            receivedArguments.add(o2);
+        }
+        
         public static void staticMethod(Object o) {
             reset();
             calledMethod = "staticMethod";

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/Level.java Wed Jul 11 06:03:01 2007
@@ -104,7 +104,7 @@
      * @throws IllegalArgumentException
      *             if <code>name</code> is not valid.
      */
-    public static final Level parse(String name) {
+    public static Level parse(String name) throws IllegalArgumentException {
         if (name == null) {
             // logging.1C=The 'name' parameter is null.
             throw new NullPointerException(Messages.getString("logging.1C")); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/GregorianCalendar.java Wed Jul 11 06:03:01 2007
@@ -694,6 +694,9 @@
                                         - (days + daysInMonth(leapYear, month) - 3))
                                 + fields[DAY_OF_WEEK_IN_MONTH] * 7;
                     }
+                } else if (isSet[DAY_OF_WEEK]) {
+                    int skew = mod7(days - 3 - (getFirstDayOfWeek() - 1));
+                    days += mod7(mod7(skew + dayOfWeek - (days - 3)) - skew);
                 }
             }
         } else {
@@ -1151,15 +1154,16 @@
                 int maxWeeks = (days - 1 + mod) / 7 + 1;
                 int newWeek = mod(fields[field] - 1 + value, maxWeeks) + 1;
                 if (newWeek == maxWeeks) {
-                    if (fields[day] + (newWeek - fields[field]) * 7 > days) {
-                        set(field, 1);
+                    int addDays = (newWeek - fields[field]) * 7;
+                    if (fields[day] > addDays && fields[day] + addDays > days) {
+                            set(field, 1);
                     } else {
-                        set(field, newWeek);
+                        set(field, newWeek - 1);
                     }
                 } else if (newWeek == 1) {
                     int week = (fields[day] - ((fields[day] - 1) / 7 * 7) - 1 + mod) / 7 + 1;
                     if (week > 1) {
-                        set(day, 1);
+                        set(field, 1);
                     } else {
                         set(field, newWeek);
                     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Language_no.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Language_no.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Language_no.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Language_no.java Wed Jul 11 06:03:01 2007
@@ -57,7 +57,7 @@
 		{"mk","Makedonsk",},
 		{"my","Burmesisk",},
 		{"nl","Nederlandsk",},
-		{"no","Norsk",},
+		{"no","norsk",},
 		{"pl","Polsk",},
 		{"pt","Portugisisk",},
 		{"ro","Rumensk",},

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/CalendarTest.java Wed Jul 11 06:03:01 2007
@@ -147,6 +147,15 @@
 		cal.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
 		assertTrue("Incorrect result 1b: " + cal.getTime(), cal.getTime()
 				.getTime() == 1015822800000L);
+        // Regression for HARMONY-4384
+        // Set DAY_OF_WEEK without DATE
+        cal.clear();
+        cal.set(Calendar.YEAR, 2002);
+        cal.set(Calendar.MONTH, Calendar.MARCH);
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY);
+        assertEquals("Incorrect result 1b: " + cal.getTime(), 1015304400000L, cal.getTime()
+                .getTime());
+        
 
 		// WEEK_OF_MONTH has priority
 		cal.clear();

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java Wed Jul 11 06:03:01 2007
@@ -576,6 +576,34 @@
         assertEquals("Wrong month: " + cal.getTime(), Calendar.JANUARY, cal
                 .get(Calendar.MONTH));
         assertEquals("Wrong date: " + cal.getTime(), 7, cal.get(Calendar.DATE));
+        
+        cal.roll(Calendar.WEEK_OF_YEAR, true);
+        assertEquals("Wrong year: " + cal.getTime(), 1994, cal
+                .get(Calendar.YEAR));
+        assertEquals("Wrong month: " + cal.getTime(), Calendar.JANUARY, cal
+                .get(Calendar.MONTH));
+        assertEquals("Wrong date: " + cal.getTime(), 14, cal.get(Calendar.DATE));
+        
+        cal.roll(Calendar.WEEK_OF_YEAR, false);
+        assertEquals("Wrong year: " + cal.getTime(), 1994, cal
+                .get(Calendar.YEAR));
+        assertEquals("Wrong month: " + cal.getTime(), Calendar.JANUARY, cal
+                .get(Calendar.MONTH));
+        assertEquals("Wrong date: " + cal.getTime(), 7, cal.get(Calendar.DATE));
+        
+        cal.roll(Calendar.WEEK_OF_YEAR, false);
+        assertEquals("Wrong year: " + cal.getTime(), 1994, cal
+                .get(Calendar.YEAR));
+        assertEquals("Wrong month: " + cal.getTime(), Calendar.DECEMBER, cal
+                .get(Calendar.MONTH));
+        assertEquals("Wrong date: " + cal.getTime(), 30, cal.get(Calendar.DATE));
+        
+        cal.roll(Calendar.WEEK_OF_YEAR, false);
+        assertEquals("Wrong year: " + cal.getTime(), 1994, cal
+                .get(Calendar.YEAR));
+        assertEquals("Wrong month: " + cal.getTime(), Calendar.DECEMBER, cal
+                .get(Calendar.MONTH));
+        assertEquals("Wrong date: " + cal.getTime(), 23, cal.get(Calendar.DATE));
 	}
 
 	/**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java Wed Jul 11 06:03:01 2007
@@ -169,6 +169,16 @@
 		// Regression for Harmony-1146
         Locale l_languageAE = new Locale("ae", ""); //$NON-NLS-1$ //$NON-NLS-2$
         assertEquals("Avestan", l_languageAE.getDisplayLanguage()); //$NON-NLS-1$
+        
+        // Regression for HARMONY-4402
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            Locale locale = new Locale("no", "NO");
+            Locale.setDefault(locale);
+            assertEquals("norsk", locale.getDisplayLanguage()); //$NON-NLS-1$
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
 	}
 
 	/**

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java Wed Jul 11 06:03:01 2007
@@ -32,6 +32,7 @@
  * @deprecated Replaced by behavior in
  *             {@link javax.security.cert javax.security.cert}
  */
+@Deprecated
 public interface Certificate {
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Identity.java Wed Jul 11 06:03:01 2007
@@ -32,6 +32,7 @@
  * 
  * @deprecated
  */
+@Deprecated
 public abstract class Identity implements Principal, Serializable {
     private static final long serialVersionUID = 3609922007826600659L;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java Wed Jul 11 06:03:01 2007
@@ -24,13 +24,12 @@
 
 import java.util.Enumeration;
 
-import org.apache.harmony.security.SystemScope;
-
 
 /**
  * @com.intel.drl.spec_ref 
  * @deprecated
  */
+@Deprecated
 public abstract class IdentityScope extends Identity {
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java Wed Jul 11 06:03:01 2007
@@ -138,6 +138,7 @@
 	 *
 	 * @deprecated	Use AlgorithmParameters and KeyFactory instead
 	 */
+    @Deprecated
     public static String getAlgorithmProperty(String algName, String propName) {
         if (algName == null || propName == null) {
             return null;

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signature.java Wed Jul 11 06:03:01 2007
@@ -384,6 +384,7 @@
      *  
      * @deprecated Use {@link Signature#setParameter(AlgorithmParameterSpec) setParameter}
      */
+    @Deprecated
     public final void setParameter(String param, Object value)
             throws InvalidParameterException {
         engineSetParameter(param, value);
@@ -411,6 +412,7 @@
      * 
      * @deprecated There is no generally accepted parameter naming convention.
      */
+    @Deprecated
     public final Object getParameter(String param)
             throws InvalidParameterException {
         return engineGetParameter(param);

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/SignatureSpi.java Wed Jul 11 06:03:01 2007
@@ -163,6 +163,7 @@
 	 * @deprecated Use
 	 *             {@link SignatureSpi#engineSetParameter(AlgorithmParameterSpec) engineSetParameter}
 	 */
+    @Deprecated
     protected abstract void engineSetParameter(String param, Object value)
             throws InvalidParameterException;
 
@@ -188,6 +189,7 @@
 	 * 
 	 * @deprecated There is no generally accepted parameter naming convention.
 	 */
+    @Deprecated
     protected abstract Object engineGetParameter(String param)
             throws InvalidParameterException;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Signer.java Wed Jul 11 06:03:01 2007
@@ -29,7 +29,7 @@
  *             {@link java.security.cert java.security.cert} package and
  *             {@link java.security.Principal Principal}
  */
-
+@Deprecated
 public abstract class Signer extends Identity {
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java?view=diff&rev=555259&r1=555258&r2=555259
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Date.java Wed Jul 11 06:03:01 2007
@@ -50,7 +50,6 @@
      * @param theDay
      *            the day in the month. Must be in the range 1 to 31.
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     public Date(int theYear, int theMonth, int theDay) {
         super(theYear, theMonth, theDay);
@@ -78,7 +77,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public int getHours() {
@@ -92,7 +90,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public int getMinutes() {
@@ -106,7 +103,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public int getSeconds() {
@@ -121,7 +117,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public void setHours(int theHours) {
@@ -136,7 +131,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public void setMinutes(int theMinutes) {
@@ -151,7 +145,6 @@
      * @throws IllegalArgumentException
      *             if this method is called
      */
-    @SuppressWarnings("deprecation")
     @Deprecated
     @Override
     public void setSeconds(int theSeconds) {



Mime
View raw message