Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 11787 invoked from network); 15 Jan 2007 09:48:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jan 2007 09:48:15 -0000 Received: (qmail 5913 invoked by uid 500); 15 Jan 2007 09:48:21 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 5896 invoked by uid 500); 15 Jan 2007 09:48:21 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 5887 invoked by uid 99); 15 Jan 2007 09:48:21 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jan 2007 01:48:21 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jan 2007 01:48:14 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4A84F1A981C; Mon, 15 Jan 2007 01:47:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r496264 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/plaf/basic/BasicSliderUI.java test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java Date: Mon, 15 Jan 2007 09:47:12 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070115094712.4A84F1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Mon Jan 15 01:47:11 2007 New Revision: 496264 URL: http://svn.apache.org/viewvc?view=rev&rev=496264 Log: Applying patches from "[#HARMONY-2878] [classlib][swing] j.s.plaf.basic.BasicSliderUI.createScrollListener throws unspecified NPE". Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java?view=diff&rev=496264&r1=496263&r2=496264 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java Mon Jan 15 01:47:11 2007 @@ -466,8 +466,9 @@ } protected ScrollListener createScrollListener(final JSlider slider) { - this.slider = slider; - return new ScrollListener(slider.getOrientation(), slider.getSnapToTicks()); + return slider != null + ? new ScrollListener(slider.getOrientation(), slider.getSnapToTicks()) + : new ScrollListener(); } protected PropertyChangeListener createPropertyChangeListener(final JSlider slider) { Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java?view=diff&rev=496264&r1=496263&r2=496264 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicSliderUITest.java Mon Jan 15 01:47:11 2007 @@ -111,6 +111,11 @@ .createScrollListener(slider)); } + // Regression for HARMONY-2878 + public void testCreateScrollListenerNull() throws Exception { + assertNotNull(sliderUI.createScrollListener(null)); // no exception expected + } + public void testCreatePropertyChangeListener() throws Exception { assertNotNull(sliderUI.createPropertyChangeListener(slider)); assertFalse(sliderUI.createPropertyChangeListener(slider) == sliderUI