Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[896] trunk
|
From: <tri...@us...> - 2008-12-03 17:58:20
|
Revision: 896
http://equanda.svn.sourceforge.net/equanda/?rev=896&view=rev
Author: triathlon98
Date: 2008-12-03 17:58:16 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
EQ-299 remove checkstyle errors and warnings
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java
trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxyState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LenientChecksState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java
trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/UoidGenerator.java
trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainer.java
trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainerAdapter.java
trunk/equanda-client/src/main/java/org/equanda/subjectory/ISOCountry2LetterTranslator.java
trunk/equanda-client/src/main/java/org/equanda/subjectory/XmlFileContainer.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseMap.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolException.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/config/checkstyle.xml 2008-12-03 17:58:16 UTC (rev 896)
@@ -236,7 +236,7 @@
<property name="protectedAllowed" value="true"/>
</module>
<module name="FinalClass"/>
- <module name="InterfaceIsType"/>
+ <!--<module name="InterfaceIsType"/>-->
<module name="HideUtilityClassConstructor"/>
<!--<module name="DesignForExtension"/>-->
<!--<module name="MutableException"/>-->
Modified: trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -39,10 +39,12 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class ImportClient
+public final class ImportClient
{
private static final String LOGIN_SERVLET = "j_security_check";
+ private ImportClient() {}
+
public static String importString( String data, String address, final String login, final String password )
throws IOException
{
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -35,7 +35,7 @@
{
public static final String RULES_CHECKS_STATE_CONTEXT = "equanda-CheckRulesStateContext";
- private static ThreadLocal state = new ThreadLocal()
+ private static ThreadLocal STATE = new ThreadLocal()
{
protected Object initialValue()
{
@@ -45,7 +45,7 @@
private CheckRulesState() {}
- public static boolean getCheckRules() { return (Boolean) state.get(); }
+ public static boolean getCheckRules() { return (Boolean) STATE.get(); }
- public static void setCheckRules( boolean value ) { state.set( Boolean.valueOf( value ) ); }
+ public static void setCheckRules( boolean value ) { STATE.set( Boolean.valueOf( value ) ); }
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaObjectType.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaObjectType.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -71,7 +71,7 @@
/**
* Check whether the given type "is a child of" (or the type itself).
* <p/>
- *
+ * <p/>
* For example, in a hierarchy Object-Vehicle-Car,
* Vehicle.isParentType(Vehicle) returns true
* Vehicle.isParentType(Car) returns true
@@ -80,7 +80,8 @@
* @param type type identifier (four letters) for the type to test
* @return true when it is an "instanceof"
*/
- public boolean isParentType(String type) {
+ public boolean isParentType( String type )
+ {
// sanity checks
if ( type == null ) return false;
if ( type.length() < 4 ) type = type + " ";
@@ -90,7 +91,6 @@
}
-
// provided to implement EnumerableChoice
public boolean isAllowed( boolean b )
{ return false; }
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -48,12 +48,12 @@
private int exceptionCode;
private String appendedParameters;
private String[] injectedParameters;
- private static final List<String> contexts = new ArrayList<String>();
+ private static final List<String> CONTEXTS = new ArrayList<String>();
static
{
- contexts.add( CORE_EXCEPTIONS_CONTEXT );
- contexts.add( APPLICATION_EXCEPTIONS_CONTEXT );
+ CONTEXTS.add( CORE_EXCEPTIONS_CONTEXT );
+ CONTEXTS.add( APPLICATION_EXCEPTIONS_CONTEXT );
}
public EquandaPersistenceException()
@@ -125,7 +125,7 @@
try
{
TranslatorEJB translator = TranslatorEJBUtil.get();
- return translator.translate( "en", message, contexts );
+ return translator.translate( "en", message, CONTEXTS );
}
catch ( Exception ex ) { return message; }
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxyState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxyState.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxyState.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -42,7 +42,7 @@
public long equandaVersion;
public String equandaStatus;
- public boolean _modifiedEquandaStatus;
+ public boolean equandaModifiedEquandaStatus;
public boolean updateInProgress;
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -31,7 +31,7 @@
*/
public interface ExceptionCodes
{
- // @todo - some of these I can't find in ejb templates so they are either in use in other places, or they can be removed
+ // @todo - some of these I can't find in ejb templates so they are either in use elsewhere, or they can be removed
int UPE_PERSISTENCE_EXCEPTION = 90000;
int UPE_CANNOT_CREATE_SESSION_FACADE = 90001;
int UPE_OBJECT_NOT_FOUND = 90002;
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/LenientChecksState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/LenientChecksState.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/LenientChecksState.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -30,11 +30,11 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class LenientChecksState
+public final class LenientChecksState
{
public static final String LENIENT_CHECKS_STATE_CONTEXT = "equanda-LenientChecksStateContext";
- private static ThreadLocal state = new ThreadLocal()
+ private static ThreadLocal STATE = new ThreadLocal()
{
protected Object initialValue()
{
@@ -42,8 +42,10 @@
}
};
- public static boolean getLenientChecks() { return (Boolean) state.get(); }
+ private LenientChecksState() {}
- public static void setLenientChecks( boolean value ) { state.set( Boolean.valueOf( value ) ); }
+ public static boolean getLenientChecks() { return (Boolean) STATE.get(); }
+ public static void setLenientChecks( boolean value ) { STATE.set( Boolean.valueOf( value ) ); }
+
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -38,11 +38,13 @@
*
* @author NetRom team
*/
-public abstract class ObjectSelector
+public final class ObjectSelector
{
private static final Logger log = Logger.getLogger( ObjectSelector.class );
public static final String FILTER_PARAMETER_PREFIX = "equandaFilter";
+ private ObjectSelector() {}
+
protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery )
{
return getEquandaQuery( em, equandaQuery, null, true );
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsState.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/SelectorsState.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -29,11 +29,11 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class SelectorsState
+public final class SelectorsState
{
public static final String SELECTORS_STATE_CONTEXT = "equanda-SelectorsStateContext";
- private static ThreadLocal<SelectorsStateType> state =
+ private static ThreadLocal<SelectorsStateType> STATE =
new ThreadLocal<SelectorsStateType>()
{
protected SelectorsStateType initialValue()
@@ -42,25 +42,27 @@
}
};
+ private SelectorsState() {}
+
public static String getSorting( String tableName )
{
- return state.get().getTableOrder( tableName );
+ return STATE.get().getTableOrder( tableName );
}
public static void setSorting( String tableName, String order )
{
- state.get().setTableOrder( tableName, order );
+ STATE.get().setTableOrder( tableName, order );
}
public static String getFilter( String name )
{
- return state.get().getFilter( name );
+ return STATE.get().getFilter( name );
}
public static void setFilter( String name, String value )
{
- state.get().setFilter( name, value );
+ STATE.get().setFilter( name, value );
}
public static boolean isFilterSet( String name )
@@ -68,11 +70,11 @@
return getFilter( name ) != null;
}
- public static SelectorsStateType getSelectorsState() { return state.get(); }
+ public static SelectorsStateType getSelectorsState() { return STATE.get(); }
public static void setSelectorsState( SelectorsStateType stateType )
{
if ( null == stateType ) stateType = new SelectorsStateType();
- state.set( stateType );
+ STATE.set( stateType );
}
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/UoidGenerator.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/UoidGenerator.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/UoidGenerator.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -55,15 +55,15 @@
*/
public final class UoidGenerator
{
- private static Integer lock = new Integer( 0 ); // lock to force sequential access
- private static long time = System.currentTimeMillis(); // time part of high value
- private static boolean initialised; // true when id is initialised
- private static byte[] uoid =
- new byte[ 14 ]; // array to build Uoid in, normally contains high in fourth and following characters
- private static int low; // next value for LOW
- private static int lowLast; // last value for LOW, when low==lowLast then a new high has to be
+ private static final Integer LOCK = 0; // lock to force sequential access
+ private static long TIME = System.currentTimeMillis(); // time part of high value
+ private static boolean INITIALISED; // true when id is initialised
+ private static byte[] UOID =
+ new byte[14]; // array to build Uoid in, normally contains high in fourth and following characters
+ private static int LOW; // next value for LOW
+ private static int LOW_LAST; // last value for LOW, when low==lowLast then a new high has to be
// regenerated (test on increment, increment after use)
- private static final int LOW_MAX = 262144; // max value for LOW (==2^18)
+ private static final int LOW_MAX = 262144; // max value for LOW (==2^18)
private static byte[] BASE64 = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
@@ -74,9 +74,7 @@
'w', 'x', 'y', 'z' };
// purely static class, hide constructor
- private UoidGenerator()
- {
- }
+ private UoidGenerator() {}
/**
* get a new Uoid
@@ -85,9 +83,9 @@
*/
public static Uoid get()
{
- synchronized ( lock )
+ synchronized ( LOCK )
{
- if ( !initialised )
+ if ( !INITIALISED )
{
// generate the random number
Random rnd = new Random(); // @todo need a different seed, this is now time based and I
@@ -95,36 +93,36 @@
// get the random number, instead of getting an integer and converting that to base64 later,
// we get a string and narrow that down to base64, use the top 6 bits of the characters
// as they are more random than the bottom ones...
- rnd.nextBytes( uoid ); // get some random characters
- uoid[ 3 ] = BASE64[ ( ( uoid[ 3 ] >> 2 ) & 0x3f ) ];
- uoid[ 4 ] = BASE64[ ( ( uoid[ 4 ] >> 2 ) & 0x3f ) ];
- uoid[ 5 ] = BASE64[ ( ( uoid[ 5 ] >> 2 ) & 0x3f ) ];
- uoid[ 6 ] = BASE64[ ( ( uoid[ 6 ] >> 2 ) & 0x3f ) ];
- uoid[ 7 ] = BASE64[ ( ( uoid[ 7 ] >> 2 ) & 0x3f ) ];
+ rnd.nextBytes( UOID ); // get some random characters
+ UOID[ 3 ] = BASE64[ ( ( UOID[ 3 ] >> 2 ) & 0x3f ) ];
+ UOID[ 4 ] = BASE64[ ( ( UOID[ 4 ] >> 2 ) & 0x3f ) ];
+ UOID[ 5 ] = BASE64[ ( ( UOID[ 5 ] >> 2 ) & 0x3f ) ];
+ UOID[ 6 ] = BASE64[ ( ( UOID[ 6 ] >> 2 ) & 0x3f ) ];
+ UOID[ 7 ] = BASE64[ ( ( UOID[ 7 ] >> 2 ) & 0x3f ) ];
// complete the time part in the HIGH value of the Uoid
// this also sets the initial low value
completeUOID( rnd );
- initialised = true;
+ INITIALISED = true;
}
// fill in LOW value in id
- int l = low;
- uoid[ 0 ] = BASE64[ ( l & 0x3f ) ];
+ int l = LOW;
+ UOID[ 0 ] = BASE64[ ( l & 0x3f ) ];
l >>= 6;
- uoid[ 1 ] = BASE64[ ( l & 0x3f ) ];
+ UOID[ 1 ] = BASE64[ ( l & 0x3f ) ];
l >>= 6;
- uoid[ 2 ] = BASE64[ ( l & 0x3f ) ];
+ UOID[ 2 ] = BASE64[ ( l & 0x3f ) ];
- Uoid res = new Uoid( uoid );
+ Uoid res = new Uoid( UOID );
// increment LOW
- low++;
- if ( low == LOW_MAX ) low = 0;
- if ( low == lowLast )
+ LOW++;
+ if ( LOW == LOW_MAX ) LOW = 0;
+ if ( LOW == LOW_LAST )
{
- time = System.currentTimeMillis();
+ TIME = System.currentTimeMillis();
completeUOID();
}
@@ -140,14 +138,14 @@
private static void completeUOID( Random rnd )
{
// fill in time part in Uoid string
- long t = time;
- for ( int i = 0; i < 6; i++ )
+ long t = TIME;
+ for ( int i = 0; i < 6 ; i++ )
{
- uoid[ 8 + i ] = BASE64[ ( ( (int) t ) & 0x3f ) ];
+ UOID[ 8 + i ] = BASE64[ ( ( (int) t ) & 0x3f ) ];
t >>= 6;
}
// generate new LOW start value
- lowLast = low = rnd.nextInt( LOW_MAX );
+ LOW_LAST = LOW = rnd.nextInt( LOW_MAX );
}
}
Modified: trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainer.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainer.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainer.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -43,7 +43,8 @@
String getContainerType();
/**
- * Get the string which is referenced by the given xpath expression in the (current location in) the given container.
+ * Get the string which is referenced by the given xpath expression in the (current location in) the given
+ * container.
*
* @param container name of the container to search in
* @param xPathExpr xpath expression to evaluate
@@ -52,7 +53,8 @@
String getString( String container, String xPathExpr );
/**
- * Get the list of nodes which are referenced by the given xpath expression in the (current location in) the given container.
+ * Get the list of nodes which are referenced by the given xpath expression in the (current location in) the
+ * given container.
*
* @param container name of the container to search in
* @param xPathExpr xpath expression to evaluate
Modified: trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainerAdapter.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainerAdapter.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/subjectory/DataContainerAdapter.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -108,7 +108,7 @@
if ( log.isDebugEnabled() )
{
- log.debug( "getXPath for" + container + ". Detected name space uri : " + doc.getNamespaceURI() );
+ log.debug( "getXPath for" + container + ". Detected name space uri : " + doc.getNamespaceURI() );
}
Modified: trunk/equanda-client/src/main/java/org/equanda/subjectory/ISOCountry2LetterTranslator.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/subjectory/ISOCountry2LetterTranslator.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/subjectory/ISOCountry2LetterTranslator.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -35,257 +35,256 @@
public class ISOCountry2LetterTranslator
implements MappingTranslator<String, String>
{
+ private static final OneToOneHashMap<String, String> COUNTRY_CODES = new OneToOneHashMap();
- private static final OneToOneHashMap<String, String> countryCodes = new OneToOneHashMap();
-
static
{
- countryCodes.put( "AD", "Andorra" );
- countryCodes.put( "AE", "United Arab Emirates" );
- countryCodes.put( "AF", "Afghanistan" );
- countryCodes.put( "AG", "Antigua and Barbuda" );
- countryCodes.put( "AI", "Anguilla" );
- countryCodes.put( "AL", "Albania" );
- countryCodes.put( "AM", "Armenia" );
- countryCodes.put( "AN", "Netherlands Antilles" );
- countryCodes.put( "AO", "Angola" );
- countryCodes.put( "AP", "Asia/Pacific Region" );
- countryCodes.put( "AQ", "Antarctica" );
- countryCodes.put( "AR", "Argentina" );
- countryCodes.put( "AS", "American Samoa" );
- countryCodes.put( "AT", "Austria" );
- countryCodes.put( "AU", "Australia" );
- countryCodes.put( "AW", "Aruba" );
- countryCodes.put( "AX", "Aland Islands" );
- countryCodes.put( "AZ", "Azerbaijan" );
- countryCodes.put( "BA", "Bosnia and Herzegovina" );
- countryCodes.put( "BB", "Barbados" );
- countryCodes.put( "BD", "Bangladesh" );
- countryCodes.put( "BE", "Belgium" );
- countryCodes.put( "BF", "Burkina Faso" );
- countryCodes.put( "BG", "Bulgaria" );
- countryCodes.put( "BH", "Bahrain" );
- countryCodes.put( "BI", "Burundi" );
- countryCodes.put( "BJ", "Benin" );
- countryCodes.put( "BM", "Bermuda" );
- countryCodes.put( "BN", "Brunei Darussalam" );
- countryCodes.put( "BO", "Bolivia" );
- countryCodes.put( "BR", "Brazil" );
- countryCodes.put( "BS", "Bahamas" );
- countryCodes.put( "BT", "Bhutan" );
- countryCodes.put( "BV", "Bouvet Island" );
- countryCodes.put( "BW", "Botswana" );
- countryCodes.put( "BY", "Belarus" );
- countryCodes.put( "BZ", "Belize" );
- countryCodes.put( "CA", "Canada" );
- countryCodes.put( "CC", "Cocos (Keeling) Islands" );
- countryCodes.put( "CD", "Congo, The Democratic Republic of the" );
- countryCodes.put( "CF", "Central African Republic" );
- countryCodes.put( "CG", "Congo" );
- countryCodes.put( "CH", "Switzerland" );
- countryCodes.put( "CI", "Cote d'Ivoire" );
- countryCodes.put( "CK", "Cook Islands" );
- countryCodes.put( "CL", "Chile" );
- countryCodes.put( "CM", "Cameroon" );
- countryCodes.put( "CN", "China" );
- countryCodes.put( "CO", "Colombia" );
- countryCodes.put( "CR", "Costa Rica" );
- countryCodes.put( "CU", "Cuba" );
- countryCodes.put( "CV", "Cape Verde" );
- countryCodes.put( "CX", "Christmas Island" );
- countryCodes.put( "CY", "Cyprus" );
- countryCodes.put( "CZ", "Czech Republic" );
- countryCodes.put( "DE", "Germany" );
- countryCodes.put( "DJ", "Djibouti" );
- countryCodes.put( "DK", "Denmark" );
- countryCodes.put( "DM", "Dominica" );
- countryCodes.put( "DO", "Dominican Republic" );
- countryCodes.put( "DZ", "Algeria" );
- countryCodes.put( "EC", "Ecuador" );
- countryCodes.put( "EE", "Estonia" );
- countryCodes.put( "EG", "Egypt" );
- countryCodes.put( "EH", "Western Sahara" );
- countryCodes.put( "ER", "Eritrea" );
- countryCodes.put( "ES", "Spain" );
- countryCodes.put( "ET", "Ethiopia" );
- countryCodes.put( "EU", "Europe" );
- countryCodes.put( "FI", "Finland" );
- countryCodes.put( "FJ", "Fiji" );
- countryCodes.put( "FK", "Falkland Islands (Malvinas)" );
- countryCodes.put( "FM", "Micronesia, Federated States of" );
- countryCodes.put( "FO", "Faroe Islands" );
- countryCodes.put( "FR", "France" );
- countryCodes.put( "GA", "Gabon" );
- countryCodes.put( "GB", "United Kingdom" );
- countryCodes.put( "GD", "Grenada" );
- countryCodes.put( "GE", "Georgia" );
- countryCodes.put( "GF", "French Guiana" );
- countryCodes.put( "GG", "Guernsey" );
- countryCodes.put( "GH", "Ghana" );
- countryCodes.put( "GI", "Gibraltar" );
- countryCodes.put( "GL", "Greenland" );
- countryCodes.put( "GM", "Gambia" );
- countryCodes.put( "GN", "Guinea" );
- countryCodes.put( "GP", "Guadeloupe" );
- countryCodes.put( "GQ", "Equatorial Guinea" );
- countryCodes.put( "GR", "Greece" );
- countryCodes.put( "GS", "South Georgia and the South Sandwich Islands" );
- countryCodes.put( "GT", "Guatemala" );
- countryCodes.put( "GU", "Guam" );
- countryCodes.put( "GW", "Guinea-Bissau" );
- countryCodes.put( "GY", "Guyana" );
- countryCodes.put( "HK", "Hong Kong" );
- countryCodes.put( "HM", "Heard Island and McDonald Islands" );
- countryCodes.put( "HN", "Honduras" );
- countryCodes.put( "HR", "Croatia" );
- countryCodes.put( "HT", "Haiti" );
- countryCodes.put( "HU", "Hungary" );
- countryCodes.put( "ID", "Indonesia" );
- countryCodes.put( "IE", "Ireland" );
- countryCodes.put( "IL", "Israel" );
- countryCodes.put( "IM", "Isle of Man" );
- countryCodes.put( "IN", "India" );
- countryCodes.put( "IO", "British Indian Ocean Territory" );
- countryCodes.put( "IQ", "Iraq" );
- countryCodes.put( "IR", "Iran, Islamic Republic of" );
- countryCodes.put( "IS", "Iceland" );
- countryCodes.put( "IT", "Italy" );
- countryCodes.put( "JE", "Jersey" );
- countryCodes.put( "JM", "Jamaica" );
- countryCodes.put( "JO", "Jordan" );
- countryCodes.put( "JP", "Japan" );
- countryCodes.put( "KE", "Kenya" );
- countryCodes.put( "KG", "Kyrgyzstan" );
- countryCodes.put( "KH", "Cambodia" );
- countryCodes.put( "KI", "Kiribati" );
- countryCodes.put( "KM", "Comoros" );
- countryCodes.put( "KN", "Saint Kitts and Nevis" );
- countryCodes.put( "KP", "Korea, Democratic People's Republic of" );
- countryCodes.put( "KR", "Korea, Republic of" );
- countryCodes.put( "KW", "Kuwait" );
- countryCodes.put( "KY", "Cayman Islands" );
- countryCodes.put( "KZ", "Kazakhstan" );
- countryCodes.put( "LA", "Lao People's Democratic Republic" );
- countryCodes.put( "LB", "Lebanon" );
- countryCodes.put( "LC", "Saint Lucia" );
- countryCodes.put( "LI", "Liechtenstein" );
- countryCodes.put( "LK", "Sri Lanka" );
- countryCodes.put( "LR", "Liberia" );
- countryCodes.put( "LS", "Lesotho" );
- countryCodes.put( "LT", "Lithuania" );
- countryCodes.put( "LU", "Luxembourg" );
- countryCodes.put( "LV", "Latvia" );
- countryCodes.put( "LY", "Libyan Arab Jamahiriya" );
- countryCodes.put( "MA", "Morocco" );
- countryCodes.put( "MC", "Monaco" );
- countryCodes.put( "MD", "Moldova, Republic of" );
- countryCodes.put( "ME", "Montenegro" );
- countryCodes.put( "MG", "Madagascar" );
- countryCodes.put( "MH", "Marshall Islands" );
- countryCodes.put( "MK", "Macedonia" );
- countryCodes.put( "ML", "Mali" );
- countryCodes.put( "MM", "Myanmar" );
- countryCodes.put( "MN", "Mongolia" );
- countryCodes.put( "MO", "Macao" );
- countryCodes.put( "MP", "Northern Mariana Islands" );
- countryCodes.put( "MQ", "Martinique" );
- countryCodes.put( "MR", "Mauritania" );
- countryCodes.put( "MS", "Montserrat" );
- countryCodes.put( "MT", "Malta" );
- countryCodes.put( "MU", "Mauritius" );
- countryCodes.put( "MV", "Maldives" );
- countryCodes.put( "MW", "Malawi" );
- countryCodes.put( "MX", "Mexico" );
- countryCodes.put( "MY", "Malaysia" );
- countryCodes.put( "MZ", "Mozambique" );
- countryCodes.put( "NA", "Namibia" );
- countryCodes.put( "NC", "New Caledonia" );
- countryCodes.put( "NE", "Niger" );
- countryCodes.put( "NF", "Norfolk Island" );
- countryCodes.put( "NG", "Nigeria" );
- countryCodes.put( "NI", "Nicaragua" );
- countryCodes.put( "NL", "Netherlands" );
- countryCodes.put( "NO", "Norway" );
- countryCodes.put( "NP", "Nepal" );
- countryCodes.put( "NR", "Nauru" );
- countryCodes.put( "NU", "Niue" );
- countryCodes.put( "NZ", "New Zealand" );
- countryCodes.put( "OM", "Oman" );
- countryCodes.put( "PA", "Panama" );
- countryCodes.put( "PE", "Peru" );
- countryCodes.put( "PF", "French Polynesia" );
- countryCodes.put( "PG", "Papua New Guinea" );
- countryCodes.put( "PH", "Philippines" );
- countryCodes.put( "PK", "Pakistan" );
- countryCodes.put( "PL", "Poland" );
- countryCodes.put( "PM", "Saint Pierre and Miquelon" );
- countryCodes.put( "PN", "Pitcairn" );
- countryCodes.put( "PR", "Puerto Rico" );
- countryCodes.put( "PS", "Palestinian Territory" );
- countryCodes.put( "PT", "Portugal" );
- countryCodes.put( "PW", "Palau" );
- countryCodes.put( "PY", "Paraguay" );
- countryCodes.put( "QA", "Qatar" );
- countryCodes.put( "RE", "Reunion" );
- countryCodes.put( "RO", "Romania" );
- countryCodes.put( "RS", "Serbia" );
- countryCodes.put( "RU", "Russian Federation" );
- countryCodes.put( "RW", "Rwanda" );
- countryCodes.put( "SA", "Saudi Arabia" );
- countryCodes.put( "SB", "Solomon Islands" );
- countryCodes.put( "SC", "Seychelles" );
- countryCodes.put( "SD", "Sudan" );
- countryCodes.put( "SE", "Sweden" );
- countryCodes.put( "SG", "Singapore" );
- countryCodes.put( "SH", "Saint Helena" );
- countryCodes.put( "SI", "Slovenia" );
- countryCodes.put( "SJ", "Svalbard and Jan Mayen" );
- countryCodes.put( "SK", "Slovakia" );
- countryCodes.put( "SL", "Sierra Leone" );
- countryCodes.put( "SM", "San Marino" );
- countryCodes.put( "SN", "Senegal" );
- countryCodes.put( "SO", "Somalia" );
- countryCodes.put( "SR", "Suriname" );
- countryCodes.put( "ST", "Sao Tome and Principe" );
- countryCodes.put( "SV", "El Salvador" );
- countryCodes.put( "SY", "Syrian Arab Republic" );
- countryCodes.put( "SZ", "Swaziland" );
- countryCodes.put( "TC", "Turks and Caicos Islands" );
- countryCodes.put( "TD", "Chad" );
- countryCodes.put( "TF", "French Southern Territories" );
- countryCodes.put( "TG", "Togo" );
- countryCodes.put( "TH", "Thailand" );
- countryCodes.put( "TJ", "Tajikistan" );
- countryCodes.put( "TK", "Tokelau" );
- countryCodes.put( "TL", "Timor-Leste" );
- countryCodes.put( "TM", "Turkmenistan" );
- countryCodes.put( "TN", "Tunisia" );
- countryCodes.put( "TO", "Tonga" );
- countryCodes.put( "TR", "Turkey" );
- countryCodes.put( "TT", "Trinidad and Tobago" );
- countryCodes.put( "TV", "Tuvalu" );
- countryCodes.put( "TW", "Taiwan" );
- countryCodes.put( "TZ", "Tanzania, United Republic of" );
- countryCodes.put( "UA", "Ukraine" );
- countryCodes.put( "UG", "Uganda" );
- countryCodes.put( "UM", "United States Minor Outlying Islands" );
- countryCodes.put( "US", "United States" );
- countryCodes.put( "UY", "Uruguay" );
- countryCodes.put( "UZ", "Uzbekistan" );
- countryCodes.put( "VA", "Holy See (Vatican City State)" );
- countryCodes.put( "VC", "Saint Vincent and the Grenadines" );
- countryCodes.put( "VE", "Venezuela" );
- countryCodes.put( "VG", "Virgin Islands, British" );
- countryCodes.put( "VI", "Virgin Islands, U.S." );
- countryCodes.put( "VN", "Vietnam" );
- countryCodes.put( "VU", "Vanuatu" );
- countryCodes.put( "WF", "Wallis and Futuna" );
- countryCodes.put( "WS", "Samoa" );
- countryCodes.put( "YE", "Yemen" );
- countryCodes.put( "YT", "Mayotte" );
- countryCodes.put( "ZA", "South Africa" );
- countryCodes.put( "ZM", "Zambia" );
- countryCodes.put( "ZW", "Zimbabwe" );
+ COUNTRY_CODES.put( "AD", "Andorra" );
+ COUNTRY_CODES.put( "AE", "United Arab Emirates" );
+ COUNTRY_CODES.put( "AF", "Afghanistan" );
+ COUNTRY_CODES.put( "AG", "Antigua and Barbuda" );
+ COUNTRY_CODES.put( "AI", "Anguilla" );
+ COUNTRY_CODES.put( "AL", "Albania" );
+ COUNTRY_CODES.put( "AM", "Armenia" );
+ COUNTRY_CODES.put( "AN", "Netherlands Antilles" );
+ COUNTRY_CODES.put( "AO", "Angola" );
+ COUNTRY_CODES.put( "AP", "Asia/Pacific Region" );
+ COUNTRY_CODES.put( "AQ", "Antarctica" );
+ COUNTRY_CODES.put( "AR", "Argentina" );
+ COUNTRY_CODES.put( "AS", "American Samoa" );
+ COUNTRY_CODES.put( "AT", "Austria" );
+ COUNTRY_CODES.put( "AU", "Australia" );
+ COUNTRY_CODES.put( "AW", "Aruba" );
+ COUNTRY_CODES.put( "AX", "Aland Islands" );
+ COUNTRY_CODES.put( "AZ", "Azerbaijan" );
+ COUNTRY_CODES.put( "BA", "Bosnia and Herzegovina" );
+ COUNTRY_CODES.put( "BB", "Barbados" );
+ COUNTRY_CODES.put( "BD", "Bangladesh" );
+ COUNTRY_CODES.put( "BE", "Belgium" );
+ COUNTRY_CODES.put( "BF", "Burkina Faso" );
+ COUNTRY_CODES.put( "BG", "Bulgaria" );
+ COUNTRY_CODES.put( "BH", "Bahrain" );
+ COUNTRY_CODES.put( "BI", "Burundi" );
+ COUNTRY_CODES.put( "BJ", "Benin" );
+ COUNTRY_CODES.put( "BM", "Bermuda" );
+ COUNTRY_CODES.put( "BN", "Brunei Darussalam" );
+ COUNTRY_CODES.put( "BO", "Bolivia" );
+ COUNTRY_CODES.put( "BR", "Brazil" );
+ COUNTRY_CODES.put( "BS", "Bahamas" );
+ COUNTRY_CODES.put( "BT", "Bhutan" );
+ COUNTRY_CODES.put( "BV", "Bouvet Island" );
+ COUNTRY_CODES.put( "BW", "Botswana" );
+ COUNTRY_CODES.put( "BY", "Belarus" );
+ COUNTRY_CODES.put( "BZ", "Belize" );
+ COUNTRY_CODES.put( "CA", "Canada" );
+ COUNTRY_CODES.put( "CC", "Cocos (Keeling) Islands" );
+ COUNTRY_CODES.put( "CD", "Congo, The Democratic Republic of the" );
+ COUNTRY_CODES.put( "CF", "Central African Republic" );
+ COUNTRY_CODES.put( "CG", "Congo" );
+ COUNTRY_CODES.put( "CH", "Switzerland" );
+ COUNTRY_CODES.put( "CI", "Cote d'Ivoire" );
+ COUNTRY_CODES.put( "CK", "Cook Islands" );
+ COUNTRY_CODES.put( "CL", "Chile" );
+ COUNTRY_CODES.put( "CM", "Cameroon" );
+ COUNTRY_CODES.put( "CN", "China" );
+ COUNTRY_CODES.put( "CO", "Colombia" );
+ COUNTRY_CODES.put( "CR", "Costa Rica" );
+ COUNTRY_CODES.put( "CU", "Cuba" );
+ COUNTRY_CODES.put( "CV", "Cape Verde" );
+ COUNTRY_CODES.put( "CX", "Christmas Island" );
+ COUNTRY_CODES.put( "CY", "Cyprus" );
+ COUNTRY_CODES.put( "CZ", "Czech Republic" );
+ COUNTRY_CODES.put( "DE", "Germany" );
+ COUNTRY_CODES.put( "DJ", "Djibouti" );
+ COUNTRY_CODES.put( "DK", "Denmark" );
+ COUNTRY_CODES.put( "DM", "Dominica" );
+ COUNTRY_CODES.put( "DO", "Dominican Republic" );
+ COUNTRY_CODES.put( "DZ", "Algeria" );
+ COUNTRY_CODES.put( "EC", "Ecuador" );
+ COUNTRY_CODES.put( "EE", "Estonia" );
+ COUNTRY_CODES.put( "EG", "Egypt" );
+ COUNTRY_CODES.put( "EH", "Western Sahara" );
+ COUNTRY_CODES.put( "ER", "Eritrea" );
+ COUNTRY_CODES.put( "ES", "Spain" );
+ COUNTRY_CODES.put( "ET", "Ethiopia" );
+ COUNTRY_CODES.put( "EU", "Europe" );
+ COUNTRY_CODES.put( "FI", "Finland" );
+ COUNTRY_CODES.put( "FJ", "Fiji" );
+ COUNTRY_CODES.put( "FK", "Falkland Islands (Malvinas)" );
+ COUNTRY_CODES.put( "FM", "Micronesia, Federated States of" );
+ COUNTRY_CODES.put( "FO", "Faroe Islands" );
+ COUNTRY_CODES.put( "FR", "France" );
+ COUNTRY_CODES.put( "GA", "Gabon" );
+ COUNTRY_CODES.put( "GB", "United Kingdom" );
+ COUNTRY_CODES.put( "GD", "Grenada" );
+ COUNTRY_CODES.put( "GE", "Georgia" );
+ COUNTRY_CODES.put( "GF", "French Guiana" );
+ COUNTRY_CODES.put( "GG", "Guernsey" );
+ COUNTRY_CODES.put( "GH", "Ghana" );
+ COUNTRY_CODES.put( "GI", "Gibraltar" );
+ COUNTRY_CODES.put( "GL", "Greenland" );
+ COUNTRY_CODES.put( "GM", "Gambia" );
+ COUNTRY_CODES.put( "GN", "Guinea" );
+ COUNTRY_CODES.put( "GP", "Guadeloupe" );
+ COUNTRY_CODES.put( "GQ", "Equatorial Guinea" );
+ COUNTRY_CODES.put( "GR", "Greece" );
+ COUNTRY_CODES.put( "GS", "South Georgia and the South Sandwich Islands" );
+ COUNTRY_CODES.put( "GT", "Guatemala" );
+ COUNTRY_CODES.put( "GU", "Guam" );
+ COUNTRY_CODES.put( "GW", "Guinea-Bissau" );
+ COUNTRY_CODES.put( "GY", "Guyana" );
+ COUNTRY_CODES.put( "HK", "Hong Kong" );
+ COUNTRY_CODES.put( "HM", "Heard Island and McDonald Islands" );
+ COUNTRY_CODES.put( "HN", "Honduras" );
+ COUNTRY_CODES.put( "HR", "Croatia" );
+ COUNTRY_CODES.put( "HT", "Haiti" );
+ COUNTRY_CODES.put( "HU", "Hungary" );
+ COUNTRY_CODES.put( "ID", "Indonesia" );
+ COUNTRY_CODES.put( "IE", "Ireland" );
+ COUNTRY_CODES.put( "IL", "Israel" );
+ COUNTRY_CODES.put( "IM", "Isle of Man" );
+ COUNTRY_CODES.put( "IN", "India" );
+ COUNTRY_CODES.put( "IO", "British Indian Ocean Territory" );
+ COUNTRY_CODES.put( "IQ", "Iraq" );
+ COUNTRY_CODES.put( "IR", "Iran, Islamic Republic of" );
+ COUNTRY_CODES.put( "IS", "Iceland" );
+ COUNTRY_CODES.put( "IT", "Italy" );
+ COUNTRY_CODES.put( "JE", "Jersey" );
+ COUNTRY_CODES.put( "JM", "Jamaica" );
+ COUNTRY_CODES.put( "JO", "Jordan" );
+ COUNTRY_CODES.put( "JP", "Japan" );
+ COUNTRY_CODES.put( "KE", "Kenya" );
+ COUNTRY_CODES.put( "KG", "Kyrgyzstan" );
+ COUNTRY_CODES.put( "KH", "Cambodia" );
+ COUNTRY_CODES.put( "KI", "Kiribati" );
+ COUNTRY_CODES.put( "KM", "Comoros" );
+ COUNTRY_CODES.put( "KN", "Saint Kitts and Nevis" );
+ COUNTRY_CODES.put( "KP", "Korea, Democratic People's Republic of" );
+ COUNTRY_CODES.put( "KR", "Korea, Republic of" );
+ COUNTRY_CODES.put( "KW", "Kuwait" );
+ COUNTRY_CODES.put( "KY", "Cayman Islands" );
+ COUNTRY_CODES.put( "KZ", "Kazakhstan" );
+ COUNTRY_CODES.put( "LA", "Lao People's Democratic Republic" );
+ COUNTRY_CODES.put( "LB", "Lebanon" );
+ COUNTRY_CODES.put( "LC", "Saint Lucia" );
+ COUNTRY_CODES.put( "LI", "Liechtenstein" );
+ COUNTRY_CODES.put( "LK", "Sri Lanka" );
+ COUNTRY_CODES.put( "LR", "Liberia" );
+ COUNTRY_CODES.put( "LS", "Lesotho" );
+ COUNTRY_CODES.put( "LT", "Lithuania" );
+ COUNTRY_CODES.put( "LU", "Luxembourg" );
+ COUNTRY_CODES.put( "LV", "Latvia" );
+ COUNTRY_CODES.put( "LY", "Libyan Arab Jamahiriya" );
+ COUNTRY_CODES.put( "MA", "Morocco" );
+ COUNTRY_CODES.put( "MC", "Monaco" );
+ COUNTRY_CODES.put( "MD", "Moldova, Republic of" );
+ COUNTRY_CODES.put( "ME", "Montenegro" );
+ COUNTRY_CODES.put( "MG", "Madagascar" );
+ COUNTRY_CODES.put( "MH", "Marshall Islands" );
+ COUNTRY_CODES.put( "MK", "Macedonia" );
+ COUNTRY_CODES.put( "ML", "Mali" );
+ COUNTRY_CODES.put( "MM", "Myanmar" );
+ COUNTRY_CODES.put( "MN", "Mongolia" );
+ COUNTRY_CODES.put( "MO", "Macao" );
+ COUNTRY_CODES.put( "MP", "Northern Mariana Islands" );
+ COUNTRY_CODES.put( "MQ", "Martinique" );
+ COUNTRY_CODES.put( "MR", "Mauritania" );
+ COUNTRY_CODES.put( "MS", "Montserrat" );
+ COUNTRY_CODES.put( "MT", "Malta" );
+ COUNTRY_CODES.put( "MU", "Mauritius" );
+ COUNTRY_CODES.put( "MV", "Maldives" );
+ COUNTRY_CODES.put( "MW", "Malawi" );
+ COUNTRY_CODES.put( "MX", "Mexico" );
+ COUNTRY_CODES.put( "MY", "Malaysia" );
+ COUNTRY_CODES.put( "MZ", "Mozambique" );
+ COUNTRY_CODES.put( "NA", "Namibia" );
+ COUNTRY_CODES.put( "NC", "New Caledonia" );
+ COUNTRY_CODES.put( "NE", "Niger" );
+ COUNTRY_CODES.put( "NF", "Norfolk Island" );
+ COUNTRY_CODES.put( "NG", "Nigeria" );
+ COUNTRY_CODES.put( "NI", "Nicaragua" );
+ COUNTRY_CODES.put( "NL", "Netherlands" );
+ COUNTRY_CODES.put( "NO", "Norway" );
+ COUNTRY_CODES.put( "NP", "Nepal" );
+ COUNTRY_CODES.put( "NR", "Nauru" );
+ COUNTRY_CODES.put( "NU", "Niue" );
+ COUNTRY_CODES.put( "NZ", "New Zealand" );
+ COUNTRY_CODES.put( "OM", "Oman" );
+ COUNTRY_CODES.put( "PA", "Panama" );
+ COUNTRY_CODES.put( "PE", "Peru" );
+ COUNTRY_CODES.put( "PF", "French Polynesia" );
+ COUNTRY_CODES.put( "PG", "Papua New Guinea" );
+ COUNTRY_CODES.put( "PH", "Philippines" );
+ COUNTRY_CODES.put( "PK", "Pakistan" );
+ COUNTRY_CODES.put( "PL", "Poland" );
+ COUNTRY_CODES.put( "PM", "Saint Pierre and Miquelon" );
+ COUNTRY_CODES.put( "PN", "Pitcairn" );
+ COUNTRY_CODES.put( "PR", "Puerto Rico" );
+ COUNTRY_CODES.put( "PS", "Palestinian Territory" );
+ COUNTRY_CODES.put( "PT", "Portugal" );
+ COUNTRY_CODES.put( "PW", "Palau" );
+ COUNTRY_CODES.put( "PY", "Paraguay" );
+ COUNTRY_CODES.put( "QA", "Qatar" );
+ COUNTRY_CODES.put( "RE", "Reunion" );
+ COUNTRY_CODES.put( "RO", "Romania" );
+ COUNTRY_CODES.put( "RS", "Serbia" );
+ COUNTRY_CODES.put( "RU", "Russian Federation" );
+ COUNTRY_CODES.put( "RW", "Rwanda" );
+ COUNTRY_CODES.put( "SA", "Saudi Arabia" );
+ COUNTRY_CODES.put( "SB", "Solomon Islands" );
+ COUNTRY_CODES.put( "SC", "Seychelles" );
+ COUNTRY_CODES.put( "SD", "Sudan" );
+ COUNTRY_CODES.put( "SE", "Sweden" );
+ COUNTRY_CODES.put( "SG", "Singapore" );
+ COUNTRY_CODES.put( "SH", "Saint Helena" );
+ COUNTRY_CODES.put( "SI", "Slovenia" );
+ COUNTRY_CODES.put( "SJ", "Svalbard and Jan Mayen" );
+ COUNTRY_CODES.put( "SK", "Slovakia" );
+ COUNTRY_CODES.put( "SL", "Sierra Leone" );
+ COUNTRY_CODES.put( "SM", "San Marino" );
+ COUNTRY_CODES.put( "SN", "Senegal" );
+ COUNTRY_CODES.put( "SO", "Somalia" );
+ COUNTRY_CODES.put( "SR", "Suriname" );
+ COUNTRY_CODES.put( "ST", "Sao Tome and Principe" );
+ COUNTRY_CODES.put( "SV", "El Salvador" );
+ COUNTRY_CODES.put( "SY", "Syrian Arab Republic" );
+ COUNTRY_CODES.put( "SZ", "Swaziland" );
+ COUNTRY_CODES.put( "TC", "Turks and Caicos Islands" );
+ COUNTRY_CODES.put( "TD", "Chad" );
+ COUNTRY_CODES.put( "TF", "French Southern Territories" );
+ COUNTRY_CODES.put( "TG", "Togo" );
+ COUNTRY_CODES.put( "TH", "Thailand" );
+ COUNTRY_CODES.put( "TJ", "Tajikistan" );
+ COUNTRY_CODES.put( "TK", "Tokelau" );
+ COUNTRY_CODES.put( "TL", "Timor-Leste" );
+ COUNTRY_CODES.put( "TM", "Turkmenistan" );
+ COUNTRY_CODES.put( "TN", "Tunisia" );
+ COUNTRY_CODES.put( "TO", "Tonga" );
+ COUNTRY_CODES.put( "TR", "Turkey" );
+ COUNTRY_CODES.put( "TT", "Trinidad and Tobago" );
+ COUNTRY_CODES.put( "TV", "Tuvalu" );
+ COUNTRY_CODES.put( "TW", "Taiwan" );
+ COUNTRY_CODES.put( "TZ", "Tanzania, United Republic of" );
+ COUNTRY_CODES.put( "UA", "Ukraine" );
+ COUNTRY_CODES.put( "UG", "Uganda" );
+ COUNTRY_CODES.put( "UM", "United States Minor Outlying Islands" );
+ COUNTRY_CODES.put( "US", "United States" );
+ COUNTRY_CODES.put( "UY", "Uruguay" );
+ COUNTRY_CODES.put( "UZ", "Uzbekistan" );
+ COUNTRY_CODES.put( "VA", "Holy See (Vatican City State)" );
+ COUNTRY_CODES.put( "VC", "Saint Vincent and the Grenadines" );
+ COUNTRY_CODES.put( "VE", "Venezuela" );
+ COUNTRY_CODES.put( "VG", "Virgin Islands, British" );
+ COUNTRY_CODES.put( "VI", "Virgin Islands, U.S." );
+ COUNTRY_CODES.put( "VN", "Vietnam" );
+ COUNTRY_CODES.put( "VU", "Vanuatu" );
+ COUNTRY_CODES.put( "WF", "Wallis and Futuna" );
+ COUNTRY_CODES.put( "WS", "Samoa" );
+ COUNTRY_CODES.put( "YE", "Yemen" );
+ COUNTRY_CODES.put( "YT", "Mayotte" );
+ COUNTRY_CODES.put( "ZA", "South Africa" );
+ COUNTRY_CODES.put( "ZM", "Zambia" );
+ COUNTRY_CODES.put( "ZW", "Zimbabwe" );
}
;
@@ -299,7 +298,7 @@
public String getExternal( String s )
{
if ( null == s ) return null;
- return countryCodes.getValueForKey( s );
+ return COUNTRY_CODES.getValueForKey( s );
}
/**
@@ -311,7 +310,7 @@
public String getInternal( String s )
{
if ( null == s ) return null;
- return countryCodes.getKeyForValue( s );
+ return COUNTRY_CODES.getKeyForValue( s );
}
}
Modified: trunk/equanda-client/src/main/java/org/equanda/subjectory/XmlFileContainer.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/subjectory/XmlFileContainer.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-client/src/main/java/org/equanda/subjectory/XmlFileContainer.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -36,11 +36,11 @@
public class XmlFileContainer
extends DataContainerAdapter
{
- private static final String containerType = "XmlFile";
+ private static final String CONTAINER_TYPE = "XmlFile";
public String getContainerType()
{
- return containerType;
+ return CONTAINER_TYPE;
}
public XmlFileContainer( File file )
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseMap.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseMap.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseMap.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -33,11 +33,11 @@
*/
public interface DatabaseMap
{
- public void init();
+ void init();
- public Collection<String> getTables();
+ Collection<String> getTables();
- public Collection<DatabaseRelation> getRelationTables();
+ Collection<DatabaseRelation> getRelationTables();
- public Collection<DatabaseField> getFields();
+ Collection<DatabaseField> getFields();
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -32,7 +32,6 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-
public class Utility
{
private static final Logger log = Logger.getLogger( Utility.class );
@@ -159,4 +158,4 @@
openManager( args );
}
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolException.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolException.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolException.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -51,5 +51,4 @@
{
super( message, t );
}
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -23,11 +23,11 @@
*/
package org.equanda.tool.shared.ui;
+import javolution.lang.TextBuilder;
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolListener;
+import static org.equanda.tool.shared.ToolMain.i18n;
import org.equanda.tool.shared.worker.WorkerThread;
-import javolution.lang.TextBuilder;
-import static org.equanda.tool.shared.ToolMain.i18n;
/**
* Start class for Import Client in the case the user wants the window to be hidden
@@ -134,4 +134,4 @@
Runtime.getRuntime().halt( 0 );
}
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2008-12-03 17:17:32 UTC (rev 895)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/Configuration.java 2008-12-03 17:58:16 UTC (rev 896)
@@ -33,13 +33,13 @@
{
String getDefinition();
String getAppdir();
- public boolean getImportDbKeysOnly();
- public boolean getInfrastructure();
- public String getContext();
- public String getKeyPrefixesToKeep();
- public String getTargetFile();
- public String[] getVerifyLanguages();
- public boolean isShowDb();
- public int getWidth();
- public int getHeight();
-}
\ No newline at end of file
+ boolean getImportDbKeysOnly();
+ boolean getInfrastructure();
+ String getContext();
+ String getKeyPrefixesToKeep();
+ String getTargetFile();
+ String[] getVerifyLanguages();
+ boolean isShowDb();
+ int getWidth();
+ int getHeight();
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
