Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 24506 invoked from network); 17 Jul 2007 13:41:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jul 2007 13:41:42 -0000 Received: (qmail 39499 invoked by uid 500); 17 Jul 2007 12:41:45 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 39481 invoked by uid 500); 17 Jul 2007 12:41:45 -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 39408 invoked by uid 99); 17 Jul 2007 12:41:45 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2007 05:41:45 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Tue, 17 Jul 2007 05:41:41 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2B0CC1A981A; Tue, 17 Jul 2007 05:41:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r556907 - /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java Date: Tue, 17 Jul 2007 12:41:20 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070717124121.2B0CC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Tue Jul 17 05:41:18 2007 New Revision: 556907 URL: http://svn.apache.org/viewvc?view=rev&rev=556907 Log: Patch for HARMONY-4481 "[classlib][swing] Slider code is probably uneffective" Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.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=556907&r1=556906&r2=556907 ============================================================================== --- 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 Tue Jul 17 05:41:18 2007 @@ -669,13 +669,17 @@ protected void calculateTrackBuffer() { if (slider.getPaintLabels()) { if ((slider.getOrientation() == JSlider.HORIZONTAL)) { - trackBuffer = getWidthOfHighValueLabel() > getWidthOfLowValueLabel() - ? getWidthOfHighValueLabel() / 2 - : getWidthOfLowValueLabel() / 2; + int widthOfHighValueLabel = getWidthOfHighValueLabel(); + int widthOfLowValueLabel = getWidthOfLowValueLabel(); + trackBuffer = widthOfHighValueLabel > widthOfLowValueLabel + ? widthOfHighValueLabel / 2 + : widthOfLowValueLabel / 2; } else { - trackBuffer = getHeightOfHighValueLabel() > getHeightOfLowValueLabel() - ? getHeightOfHighValueLabel() / 2 - : getHeightOfLowValueLabel() / 2; + int heightOfHighValueLabel = getHeightOfHighValueLabel(); + int heightOfLowValueLabel = getHeightOfLowValueLabel(); + trackBuffer = heightOfHighValueLabel > heightOfLowValueLabel + ? heightOfHighValueLabel / 2 + : heightOfLowValueLabel / 2; } } else { trackBuffer = (slider.getOrientation() == JSlider.HORIZONTAL) @@ -789,19 +793,27 @@ } protected int getWidthOfHighValueLabel() { - return getHighestValueLabel() == null ? 0 : getHighestValueLabel().getWidth(); + Component label = getHighestValueLabel(); + + return label == null? 0: label.getWidth(); } - protected int getWidthOfLowValueLabel() { - return getLowestValueLabel() == null ? 0 : getLowestValueLabel().getWidth(); + protected int getWidthOfLowValueLabel() { + Component label = getLowestValueLabel(); + + return label == null? 0: label.getWidth(); } protected int getHeightOfHighValueLabel() { - return getHighestValueLabel() == null ? 0 : getHighestValueLabel().getHeight(); + Component label = getHighestValueLabel(); + + return label == null? 0: label.getHeight(); } - protected int getHeightOfLowValueLabel() { - return getLowestValueLabel() == null ? 0 : getLowestValueLabel().getHeight(); + protected int getHeightOfLowValueLabel() { + Component label = getLowestValueLabel(); + + return label == null? 0: label.getHeight(); } protected Component getLowestValueLabel() {