Thu, 06 Mar 2008 10:07:25 -0800
4741726: allow Object += String
Summary: remove code in line with restriction removed from JLS
Reviewed-by: mcimadamore
Contributed-by: michaelbailey0@gmail.com
duke@1 | 1 | /* |
duke@1 | 2 | * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
duke@1 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 21 | * have any questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | |
duke@1 | 25 | /* |
duke@1 | 26 | * Parent class implements serializable and provides static initializers |
duke@1 | 27 | * for a bunch of primitive type class constants |
duke@1 | 28 | * (required for regtest 4786406, 4780341) |
duke@1 | 29 | */ |
duke@1 | 30 | |
duke@1 | 31 | import java.io.*; |
duke@1 | 32 | |
duke@1 | 33 | public class SuperClassConsts implements Serializable { |
duke@1 | 34 | |
duke@1 | 35 | // Define class constant values, base class is serializable |
duke@1 | 36 | |
duke@1 | 37 | private static final long serialVersionUID = 6733861379283244755L; |
duke@1 | 38 | public static final int SUPER_INT_CONSTANT = 3; |
duke@1 | 39 | public final static float SUPER_FLOAT_CONSTANT = 99.3f; |
duke@1 | 40 | public final static double SUPER_DOUBLE_CONSTANT = 33.2; |
duke@1 | 41 | public final static boolean SUPER_BOOLEAN_CONSTANT = false; |
duke@1 | 42 | |
duke@1 | 43 | // A token instance field |
duke@1 | 44 | int instanceField; |
duke@1 | 45 | |
duke@1 | 46 | public SuperClassConsts(String p) { |
duke@1 | 47 | } |
duke@1 | 48 | |
duke@1 | 49 | public native int numValues(); |
duke@1 | 50 | |
duke@1 | 51 | private void writeObject(ObjectOutputStream s) |
duke@1 | 52 | throws IOException |
duke@1 | 53 | { |
duke@1 | 54 | System.err.println("writing state"); |
duke@1 | 55 | } |
duke@1 | 56 | |
duke@1 | 57 | /** |
duke@1 | 58 | * readObject is called to restore the state of the FilePermission from |
duke@1 | 59 | * a stream. |
duke@1 | 60 | */ |
duke@1 | 61 | private void readObject(ObjectInputStream s) |
duke@1 | 62 | throws IOException, ClassNotFoundException |
duke@1 | 63 | { |
duke@1 | 64 | System.err.println("reading back state"); |
duke@1 | 65 | } |
duke@1 | 66 | } |