From derby-commits-return-14870-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Mon Sep 19 09:31:29 2011 Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 002DD9400 for ; Mon, 19 Sep 2011 09:31:29 +0000 (UTC) Received: (qmail 26924 invoked by uid 500); 19 Sep 2011 09:31:28 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 26902 invoked by uid 500); 19 Sep 2011 09:31:28 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 26895 invoked by uid 99); 19 Sep 2011 09:31:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 09:31:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 09:31:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 707FB23888E4; Mon, 19 Sep 2011 09:31:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172535 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Date: Mon, 19 Sep 2011 09:31:07 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110919093107.707FB23888E4@eris.apache.org> Author: kristwaa Date: Mon Sep 19 09:31:07 2011 New Revision: 1172535 URL: http://svn.apache.org/viewvc?rev=1172535&view=rev Log: DERBY-2720: remove dead code associated with unsupported National Char implementation Removed dead code. Patch file: derby-2720-1a-remove_sqlchar_getXFormat.diff Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java?rev=1172535&r1=1172534&r2=1172535&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Mon Sep 19 09:31:07 2011 @@ -72,7 +72,6 @@ import java.sql.Time; import java.sql.Timestamp; import java.text.RuleBasedCollator; import java.text.CollationKey; -import java.text.DateFormat; import java.util.Locale; import java.util.Calendar; @@ -2968,42 +2967,6 @@ readingLoop: return localeFinder; } - protected DateFormat getDateFormat() throws StandardException { - return getLocaleFinder().getDateFormat(); - } - protected DateFormat getTimeFormat() throws StandardException { - return getLocaleFinder().getTimeFormat(); - } - protected DateFormat getTimestampFormat() throws StandardException { - return getLocaleFinder().getTimestampFormat(); - } - - protected DateFormat getDateFormat( Calendar cal) - throws StandardException { - return setDateFormatCalendar( getLocaleFinder().getDateFormat(), cal); - } - protected DateFormat getTimeFormat( Calendar cal) - throws StandardException { - return setDateFormatCalendar( getLocaleFinder().getTimeFormat(), cal); - } - protected DateFormat getTimestampFormat( Calendar cal) - throws StandardException { - return setDateFormatCalendar( - getLocaleFinder().getTimestampFormat(), cal); - } - - private DateFormat setDateFormatCalendar( DateFormat df, Calendar cal) - { - if( cal != null && df.getTimeZone() != cal.getTimeZone()) - { - // The DateFormat returned by getDateFormat may be cached and used - // by other threads. Therefore we cannot change its calendar. - df = (DateFormat) df.clone(); - df.setCalendar( cal); - } - return df; - } - public int estimateMemoryUsage() { int sz = BASE_MEMORY_USAGE + ClassSize.estimateMemoryUsage( value);