Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 66554 invoked from network); 9 Dec 2007 13:03:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Dec 2007 13:03:08 -0000 Received: (qmail 58292 invoked by uid 500); 9 Dec 2007 13:02:57 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 58272 invoked by uid 500); 9 Dec 2007 13:02:57 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 58263 invoked by uid 99); 9 Dec 2007 13:02:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2007 05:02:57 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Sun, 09 Dec 2007 13:02:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B7AA61A9832; Sun, 9 Dec 2007 05:02:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602668 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java Date: Sun, 09 Dec 2007 13:02:47 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071209130247.B7AA61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Sun Dec 9 05:02:45 2007 New Revision: 602668 URL: http://svn.apache.org/viewvc?rev=602668&view=rev Log: no change - reformatting code to match the rest of Cayenne Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java?rev=602668&r1=602667&r2=602668&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/StringUtils.java Sun Dec 9 05:02:45 2007 @@ -17,7 +17,6 @@ * under the License. ****************************************************************/ - package org.apache.cayenne.gen; import org.apache.cayenne.project.validator.MappingNamesHelper; @@ -30,30 +29,25 @@ */ public class StringUtils { - private static StringUtils sharedInstance = null; - - public static StringUtils getInstance() - { - if (null == sharedInstance) - { + private static StringUtils sharedInstance; + + public static StringUtils getInstance() { + if (null == sharedInstance) { sharedInstance = new StringUtils(); } - + return sharedInstance; } - - public StringUtils() - { - super(); - } - + /** - * Prepends underscore to variable name if necessary to remove conflict with reserved keywords. + * Prepends underscore to variable name if necessary to remove conflict with reserved + * keywords. */ public String formatVariableName(String variableName) { if (MappingNamesHelper.getInstance().isReservedJavaKeyword(variableName)) { return "_" + variableName; - } else { + } + else { return variableName; } } @@ -63,34 +57,34 @@ * * @since 1.2 */ - public String stripPackageName(String aString) - { - if (aString == null || aString.length() == 0) - return aString; - - int lastDot = aString.lastIndexOf('.'); - - if ((-1 == lastDot) || ((aString.length() - 1) == lastDot) ) return aString; - - return aString.substring(lastDot + 1); - } - - /** - * Removes base name, leaving package name. - * - * @since 1.2 - */ - public String stripClass(String aString) - { - if (aString == null || aString.length() == 0) - return aString; - - int lastDot = aString.lastIndexOf('.'); - - if (-1 == lastDot) return ""; - - return aString.substring(0, lastDot); - } + public String stripPackageName(String aString) { + if (aString == null || aString.length() == 0) + return aString; + + int lastDot = aString.lastIndexOf('.'); + + if ((-1 == lastDot) || ((aString.length() - 1) == lastDot)) + return aString; + + return aString.substring(lastDot + 1); + } + + /** + * Removes base name, leaving package name. + * + * @since 1.2 + */ + public String stripClass(String aString) { + if (aString == null || aString.length() == 0) + return aString; + + int lastDot = aString.lastIndexOf('.'); + + if (-1 == lastDot) + return ""; + + return aString.substring(0, lastDot); + } /** * Capitalizes the first letter of the property name. @@ -104,21 +98,20 @@ char c = Character.toUpperCase(name.charAt(0)); return (name.length() == 1) ? Character.toString(c) : c + name.substring(1); } - + /** * Returns string with lowercased first letter * * @since 1.2 */ - public static String uncapitalized(String aString) - { - if (aString == null || aString.length() == 0) - return aString; - - char c = Character.toLowerCase(aString.charAt(0)); - return (aString.length() == 1) ? Character.toString(c) : c + aString.substring(1); - } - + public static String uncapitalized(String aString) { + if (aString == null || aString.length() == 0) + return aString; + + char c = Character.toLowerCase(aString.charAt(0)); + return (aString.length() == 1) ? Character.toString(c) : c + aString.substring(1); + } + /** * Converts property name to Java constants naming convention. *