Re: [cp-patches]: Patch: Formatting for DefaultTreeModel.

[Mark Wielaard]

Hi Lilian,

On Tue, 2005-08-09 at 09:55 -0400, Lillian Angel wrote:
> 2005-08-09  Lillian Angel  <address@hidden>
> 
>         * javax/swing/tree/DefaultTreeModel.java:
>         Fixed formatting of class.

The actual patch was missing. But in CVS I spotted that the copyright
header was garbled. And you cannot remove any old copyright years, so I
added 2002 and 2004 back.

2005-08-09  Mark Wielaard  <address@hidden>

        * javax/swing/tree/DefaultTreeModel.java: Fix copyright
        boilerplate formatting.

Committed,

Mark

Index: javax/swing/tree/DefaultTreeModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultTreeModel.java,v
retrieving revision 1.12
diff -u -r1.12 DefaultTreeModel.java
--- javax/swing/tree/DefaultTreeModel.java      9 Aug 2005 13:55:32 -0000       
1.12
+++ javax/swing/tree/DefaultTreeModel.java      9 Aug 2005 14:55:25 -0000
@@ -1,37 +1,39 @@
-/*
- * DefaultTreeModel.java -- Copyright (C) 2005 Free Software Foundation,
- * Inc.
- * 
- * This file is part of GNU Classpath.
- * 
- * 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 General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * GNU Classpath; see the file COPYING. If not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA.
- * 
- * Linking this library statically or dynamically with other modules is making 
a
- * combined work based on this library. Thus, the terms and conditions of the
- * GNU General Public License cover the whole combination.
- * 
- * As a special exception, the copyright holders of this library give you
- * permission to link this library with independent modules to produce an
- * executable, regardless of the license terms of these independent modules, 
and
- * to copy and distribute the resulting executable under terms of your choice,
- * provided that you also meet, for each linked independent module, the terms
- * and conditions of the license of that module. An independent module is a
- * module which is not derived from or based on this library. If you modify 
this
- * library, you may extend this exception to your version of the library, but
- * you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- */
+/* DefaultTreeModel.java -- 
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+ 
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
 
 package javax.swing.tree;
 
@@ -179,7 +181,7 @@
     for (int i = 0; i < getChildCount(parent); i++)
     {
       if (getChild(parent, i).equals(child))
-        return i;
+       return i;
     }
     return -1;
   }

signature.asc
Description: This is a digitally signed message part