[Adfconverter-commit] adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline ADFConverterCommandLine.java,1.3,1.4

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

Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/uk/ac/ebi/adfconverter/usermode/commandline

Modified Files:
	ADFConverterCommandLine.java 
Log Message:
bug fix, update internet connection management

Index: ADFConverterCommandLine.java
===================================================================
RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline/ADFConverterCommandLine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ADFConverterCommandLine.java	28 Jul 2005 22:11:38 -0000	1.3
--- ADFConverterCommandLine.java	22 Aug 2005 22:04:30 -0000	1.4
***************
*** 58,61 ****
--- 58,62 ----
  
  import uk.ac.ebi.adfconverter.common.data.tabulardata.DataTable;
+ import uk.ac.ebi.adfconverter.common.tools.file.reader.exceptions.NoInternetConnectionForXMLParsing;
  import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLogger;
  import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLoggerImpl;
***************
*** 468,472 ****
  								{
  									log.AppliInfo("No file type specified (adf mage-ml). Try to guess");
! 									adfconverter.check(file.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert);
  								}
  							else
--- 469,480 ----
  								{
  									log.AppliInfo("No file type specified (adf mage-ml). Try to guess");
!                                     try
!                                         {
!                                             adfconverter.check(file.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert);
!                                         }
!                                     catch (NoInternetConnectionForXMLParsing nointernetexception)
!                                     {
!                                         log.AppliWarn("There is no internet connection for internet doctype. Please set system doctype to a local MAGE-ML DTD file.( <!DOCTYPE MAGE-ML PUBLIC \"-//OMG//DTD MAGE-ML 1.1//EN\" \"MAGE-ML.dtd\"> should work.) ");
!                                     }
  								}
  							else
***************
*** 475,479 ****
  										adfconverter.checkADF(file,strictMode,stepByStepMode,doCuration,convert);
  									else
! 										adfconverter.checkMAGEML(file,strictMode,stepByStepMode,convert);
  								}
  							toMAGEML = false;
--- 483,497 ----
  										adfconverter.checkADF(file,strictMode,stepByStepMode,doCuration,convert);
  									else
!                                     {
!                                         try
!                                         {
!                                             adfconverter.checkMAGEML(file,strictMode,stepByStepMode,convert);
!                                         }
!                                         catch (NoInternetConnectionForXMLParsing nointernetexception)
!                                         {
!                                             log.AppliWarn("There is no internet connection for internet doctype. Please set system doctype to a local MAGE-ML DTD file.( <!DOCTYPE MAGE-ML PUBLIC \"-//OMG//DTD MAGE-ML 1.1//EN\" \"MAGE-ML.dtd\"> should work.) ");
!                                         }
!                                         
!                                     }
  								}
  							toMAGEML = false;