diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f2d62925748..d43c1db5b66 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-06-17 Michael Koch + + * gnu/java/lang/ArrayHelper.java, + gnu/java/lang/ClassHelper.java: + Reformatted to match classpath's versions. + 2003-06-14 Michael Koch * gnu/java/nio/FileChannelImpl.java diff --git a/libjava/gnu/java/lang/ArrayHelper.java b/libjava/gnu/java/lang/ArrayHelper.java index 271e248f523..0216caba167 100644 --- a/libjava/gnu/java/lang/ArrayHelper.java +++ b/libjava/gnu/java/lang/ArrayHelper.java @@ -1,5 +1,5 @@ -/* gnu.java.lang.ArrayHelper - Copyright (C) 1998 Free Software Foundation, Inc. +/* ArrayHelper.java -- Helper methods for handling array operations + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,25 +39,42 @@ exception statement from your version. */ package gnu.java.lang; /** - ** ArrayHelper helps you do things with arrays. - ** - ** @author John Keiser - ** @version 1.1.0, 29 Jul 1998 - **/ + * ArrayHelper helps you do things with arrays. + * + * @author John Keiser + */ +public class ArrayHelper +{ + /** + * Counterpart to java.util.Collection.contains. + * + * @param array the array to search + * @param searchFor the object to locate + * @return true if some array element equals(searchFor) + */ + public static boolean contains(Object[] array, Object searchFor) + { + return indexOf(array, searchFor) != -1; + } -public class ArrayHelper { - public static boolean contains(Object[] array, Object searchFor) { - return indexOf(array,searchFor) != -1; - } - - public static int indexOf(Object[] array, Object searchFor) { - for(int i=0;i + */ +public class ClassHelper +{ + /** + * Strip the package part from the class name. + * + * @param clazz the class to get the truncated name from + * @return the truncated class name + */ + public static String getTruncatedClassName(Class clazz) + { + return getTruncatedName(clazz.getName()); + } -public class ClassHelper { - /** Strip the package part from the class name. - ** @param clazz the class to get the truncated name from - ** @return the truncated class name. - **/ - public static String getTruncatedClassName(Class clazz) { - return getTruncatedName(clazz.getName()); - } - /** Strip the package part from the class name, or the - ** class part from the method or field name. - ** @param name the name to truncate. - ** @return the truncated name. - **/ - public static String getTruncatedName(String name) { - int lastInd = name.lastIndexOf('.'); - if(lastInd == -1) { - return name; - } else { - return name.substring(lastInd+1); - } - } + /** + * Strip the package part from the class name, or the class part from + * the method or field name. + * + * @param name the name to truncate + * @return the truncated name + */ + public static String getTruncatedName(String name) + { + int lastInd = name.lastIndexOf('.'); + if (lastInd == -1) + return name; + return name.substring(lastInd + 1); + } - /** Strip the last portion of the name (after the last - ** dot). - ** @param name the name to get package of. - ** @return the package name. "" if no package. - **/ - public static String getPackagePortion(String name) { - int lastInd = name.lastIndexOf('.'); - if(lastInd == -1) { - return ""; - } else { - return name.substring(0,lastInd); - } - } + /** + * Strip the last portion of the name (after the last dot). + * + * @param name the name to get package of + * @return the package name, or "" if no package + */ + public static String getPackagePortion(String name) + { + int lastInd = name.lastIndexOf('.'); + if (lastInd == -1) + return ""; + return name.substring(0, lastInd); + } - static Hashtable allMethods = new Hashtable(); - static Hashtable allMethodsAtDeclaration = new Hashtable(); + /** Cache of methods found in getAllMethods(). */ + private static Map allMethods = new HashMap(); - /** Get all the methods, public, private and - ** otherwise, from the class, getting them - ** from the most recent class to find them. - **/ - public static Method[] getAllMethods(Class clazz) { - Method[] retval = (Method[])allMethods.get(clazz); - if(retval == null) { - Method[] superMethods; - if(clazz.getSuperclass() != null) { - superMethods = getAllMethods(clazz.getSuperclass()); - } else { - superMethods = new Method[0]; - } - Vector v = new Vector(); - Method[] currentMethods = clazz.getDeclaredMethods(); - for(int i=0;i= 0) + { + Method override = (Method) iter.next(); + if (current.getName().equals(override.getName()) + && Arrays.equals(current.getParameterTypes(), + override.getParameterTypes()) + && current.getReturnType() == override.getReturnType()) + continue loop; + } + methods.add(current); + } + c = c.getSuperclass(); + } + retval = new Method[methods.size()]; + methods.toArray(retval); + allMethods.put(clazz, retval); + } + return retval; + } - retval = new Method[v.size()]; - v.copyInto(retval); - allMethods.put(clazz,retval); - } - return retval; - } + /** Cache of fields found in getAllFields(). */ + private static Map allFields = new HashMap(); - /** Get all the methods, public, private and - ** otherwise, from the class, and get them from - ** their point of declaration. - **/ - public static Method[] getAllMethodsAtDeclaration(Class clazz) { - Method[] retval = (Method[])allMethodsAtDeclaration.get(clazz); - if(retval == null) { - Method[] superMethods; - if(clazz.getSuperclass() != null) { - superMethods = getAllMethodsAtDeclaration(clazz.getSuperclass()); - } else { - superMethods = new Method[0]; - } - Vector v = new Vector(); - Method[] currentMethods = clazz.getDeclaredMethods(); - for(int i=0;i= 0) + { + Field override = (Field) iter.next(); + if (current.getName().equals(override.getName()) + && current.getType() == override.getType()) + continue loop; + } + fields.add(current); + } + c = c.getSuperclass(); + } + retval = new Field[fields.size()]; + fields.toArray(retval); + allFields.put(clazz, retval); + } + return retval; + } }