/*
 * Joda Software License, Version 1.0
 *
 *
 * Copyright (c) 2001-03 Stephen Colebourne.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Joda project (http://www.joda.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The name "Joda" must not be used to endorse or promote products
 *    derived from this software without prior written permission. For
 *    written permission, please contact licence@joda.org.
 *
 * 5. Products derived from this software may not be called "Joda",
 *    nor may "Joda" appear in their name, without prior written
 *    permission of the Joda project.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE JODA AUTHORS OR THE PROJECT
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Joda project and was originally
 * created by Stephen Colebourne <scolebourne@joda.org>. For more
 * information on the Joda project, please see <http://www.joda.org/>.
 */

package org.joda.time.tz;

import java.util.Locale;

/**
 * Service provider factory for localized time zone names.
 *
 * @author Brian S O'Neill
 */
public interface NameProvider {
	/**
	 * Returns a localized short name, or null if not found.
	 *
	 * @param locale locale to use for selecting name set
	 * @param id time zone id
	 * @param nameKey time zone name key
	 */
	String getShortName(Locale locale, String id, String nameKey);
	
	/**
	 * Returns a localized name, or null if not found.
	 *
	 * @param locale locale to use for selecting name set
	 * @param id time zone id
	 * @param nameKey time zone name key
	 */
	String getName(Locale locale, String id, String nameKey);
}

@@ -2685,22 +2685,28 @@
 vider %7B%0A
-%09/**%0A%09
+    /**%0A    
  * Retur
@@ -2746,37 +2746,43 @@
 l if not found.%0A
-%09 *%0A%09
+     *%0A    
  * @param locale
@@ -2811,33 +2811,36 @@
 ecting name set%0A
-%09
+    
  * @param id tim
@@ -2841,33 +2841,36 @@
 id time zone id%0A
-%09
+    
  * @param nameKe
@@ -2882,38 +2882,44 @@
 e zone name key%0A
-%09 */%0A%09
+     */%0A    
 String getShortN
@@ -2969,16 +2969,25 @@
 y);%0A
-%09%0A%09/**%0A%09
+    %0A    /**%0A    
  * R
@@ -3037,13 +3037,19 @@
 nd.%0A
-%09 *%0A%09
+     *%0A    
  * @
@@ -3098,17 +3098,20 @@
 ame set%0A
-%09
+    
  * @para
@@ -3128,17 +3128,20 @@
 zone id%0A
-%09
+    
  * @para
@@ -3173,14 +3173,20 @@
 key%0A
-%09 */%0A%09
+     */%0A    
 Stri

Indent with spaces, not tabs.