[Adfconverter-commit] adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration ADFConverterConfiguration.java,1.4,1.5

[pierre <pie...@us...>]

Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1470

Modified Files:
	ADFConverterConfiguration.java 
Log Message:
fix bug when GUI locale given in configuration file/ from installer

Index: ADFConverterConfiguration.java
===================================================================
RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration/ADFConverterConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ADFConverterConfiguration.java	31 Jul 2005 10:26:25 -0000	1.4
--- ADFConverterConfiguration.java	15 Aug 2005 11:20:27 -0000	1.5
***************
*** 648,651 ****
--- 648,652 ----
  		int i = 0;
  		
+         logger.Applidebug("Checking properties");
  		//while (converterProps.containsKey());
  		//MandatoryPropsList.
***************
*** 728,732 ****
  								 				continue;
  								 			}
! 								 		logger.error("The properthttp://www.ics.uci.edu/pub/ietf/http/related/iso639.txty value of "+propName+" is incorrect: "+ value+" should be a directory.");
  								 		correct = false;
  								 		continue;
--- 729,733 ----
  								 				continue;
  								 			}
! 								 		logger.error("The property value of "+propName+" is incorrect: "+ value+" should be a directory.");
  								 		correct = false;
  								 		continue;
***************
*** 803,807 ****
  								 	{
  								 	 // (value)
! 								 	logger.Applidebug("testing locate");
  								 	if (value== null || value .length()<1)
                                          {
--- 804,809 ----
  								 	{
  								 	 // (value)
!                                      value = value.trim();
!                                      if (!ADFConverterLogger.isProduction())logger.Applidebug("testing locate");
  								 	if (value== null || value .length()<1)
                                          {
***************
*** 815,823 ****
                                              {//The locale should have a length of 2. It may happen with the IzPack installer. Simply remove the third character.
                                                  logger.AppliWarn("The language argument must a valid ISO Language Code (http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt). It must be composed of two characters");
!                                                 value = value.substring(0,1);
                                              }
                                              //the locale must be in lowercase, force it
                                              value = value.toLowerCase();
                                             try {
                                                  new Locale (value);
                                                  //the locale exists, reset value
--- 817,826 ----
                                              {//The locale should have a length of 2. It may happen with the IzPack installer. Simply remove the third character.
                                                  logger.AppliWarn("The language argument must a valid ISO Language Code (http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt). It must be composed of two characters");
!                                                 value = value.substring(0,2);
                                              }
                                              //the locale must be in lowercase, force it
                                              value = value.toLowerCase();
                                             try {
+                                                if (!ADFConverterLogger.isProduction()) logger.Applidebug("locale parameter "+value);
                                                  new Locale (value);
                                                  //the locale exists, reset value