[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui ScrollableDesktopPane
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2008-12-02 02:02:58
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv303/app/src/net/sourceforge/squirrel_sql/client/gui Modified Files: ScrollableDesktopPane.java Log Message: 2104422: fixed potential NPE. Thanks goes to Hashim Kubba for the patch. Index: ScrollableDesktopPane.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/ScrollableDesktopPane.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScrollableDesktopPane.java 17 Aug 2004 12:25:23 -0000 1.1 --- ScrollableDesktopPane.java 2 Dec 2008 02:02:55 -0000 1.2 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.client.gui; + /* * Copyright (C) 2001-2004 Colin Bell *************** *** 26,34 **** import javax.swing.JDesktopPane; import javax.swing.JInternalFrame; // public class ScrollableDesktopPane extends JDesktopPane { ! // TODO: make serializable safe ! private MyComponentListener _listener = new MyComponentListener(); /** --- 27,37 ---- import javax.swing.JDesktopPane; import javax.swing.JInternalFrame; + // public class ScrollableDesktopPane extends JDesktopPane { ! private static final long serialVersionUID = -4675469251932456059L; ! ! private transient MyComponentListener _listener = new MyComponentListener(); /** *************** *** 51,58 **** { comp.removeComponentListener(_listener); } - super.remove(comp); - revalidate(); - repaint(); } --- 54,61 ---- { comp.removeComponentListener(_listener); + super.remove(comp); + revalidate(); + repaint(); } } *************** *** 63,74 **** comp.addComponentListener(_listener); revalidate(); } - super.addImpl(comp, constraints, index); } /** ! * Calculate the required size of this desktop pane so that ! * all visible intenal frames will be fully shown. ! * * @return <TT>Dimension</TT> required size. */ --- 66,76 ---- comp.addComponentListener(_listener); revalidate(); + super.addImpl(comp, constraints, index); } } /** ! * Calculate the required size of this desktop pane so that all visible intenal frames will be fully shown. ! * * @return <TT>Dimension</TT> required size. */ |