Re: FYI: Patch: javax.swing.JLayeredPane

[Michael Koch]

On Thu, Jan 08, 2004 at 10:19:58AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Thu, 2004-01-08 at 09:54, Michael Koch wrote:
> > diff -u -b -B -r1.7 JLayeredPane.java
> > --- javax/swing/JLayeredPane.java       2 Dec 2003 16:50:20 -0000       1.7
> > +++ javax/swing/JLayeredPane.java       8 Jan 2004 08:49:04 -0000
> > @@ -1,39 +1,40 @@
> >  /* JLayeredPane.java -- 
> >     Copyright (C) 2002 Free Software Foundation, Inc.
> >  
> > -This file is part of GNU Classpath.
> > +   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., 59 Temple Place, Suite 330, Boston, MA
> > -02111-1307 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. */
> > +   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., 59 Temple Place, Suite 330, Boston, MA
> > +   02111-1307 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. 
> > +*/
> 
> Please use the standard boilerplate (non-indented).

Damn, Graydon "fixed" this the wrong way. I will revert this part soon.


Michael