From 029ed2322ecf30ebfdcc6f44e9c0d6a3f4bf4d76 Mon Sep 17 00:00:00 2001 From: mdb Date: Wed, 18 Dec 2002 04:19:16 +0000 Subject: [PATCH] Though you might think that createController() should always create a controller, we don't necessarily want to insist about such things, so we go ahead and cope if it returns null. git-svn-id: https://samskivert.googlecode.com/svn/trunk@998 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/swing/ControlledPanel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/swing/ControlledPanel.java b/projects/samskivert/src/java/com/samskivert/swing/ControlledPanel.java index f5c1935f..58f6288c 100644 --- a/projects/samskivert/src/java/com/samskivert/swing/ControlledPanel.java +++ b/projects/samskivert/src/java/com/samskivert/swing/ControlledPanel.java @@ -1,5 +1,5 @@ // -// $Id: ControlledPanel.java,v 1.1 2002/03/16 20:52:07 mdb Exp $ +// $Id: ControlledPanel.java,v 1.2 2002/12/18 04:19:16 mdb Exp $ package com.samskivert.swing; @@ -22,7 +22,9 @@ public abstract class ControlledPanel extends JPanel _controller = createController(); // let the controller know about this panel - _controller.setControlledPanel(this); + if (_controller != null) { + _controller.setControlledPanel(this); + } } // documentation inherited from interface