[Castore-commits] FODTGraphicalObjectConverterMain.java 1.3 1.4
FODTConverterMain.java 1.3 1.4 FODTConverter.java 1.3 1.4
FODTGraphicalObjectsConverter.java 1.3 1.4 OOOConnection.java
1.3 1.4
mathieu grimault
grimault-m at adullact1.hosting.cri74.org
Mer 6 Déc 10:01:23 CET 2006
Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter
In directory adullact1:/tmp/cvs-serv6035/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter
Modified Files:
FODTGraphicalObjectConverterMain.java FODTConverterMain.java
FODTConverter.java FODTGraphicalObjectsConverter.java
OOOConnection.java
Log Message:
Suppression des appels à System.exit et modif de certains System.out en log.*
Index: FODTConverterMain.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/FODTConverterMain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FODTConverterMain.java 1 Dec 2006 10:48:58 -0000 1.3
--- FODTConverterMain.java 6 Dec 2006 09:01:20 -0000 1.4
***************
*** 70,74 ****
convert.execute();
! System.exit(0);
}
--- 70,74 ----
convert.execute();
! // System.exit(0);
}
Index: FODTConverter.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/FODTConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FODTConverter.java 1 Dec 2006 10:48:24 -0000 1.3
--- FODTConverter.java 6 Dec 2006 09:01:20 -0000 1.4
***************
*** 69,73 ****
/** Le logger. */
! private static Log logger = LogFactory.getLog(FODTConverter.class);
/*
--- 69,73 ----
/** Le logger. */
! private static Log log = LogFactory.getLog(FODTConverter.class);
/*
***************
*** 132,149 ****
try {
getFodtFromText();
! if (logger.isInfoEnabled())
! logger.info("Convert done.");
} catch (ValidityException e) {
! if (logger.isErrorEnabled())
! logger.error("ValidityException " + e.getMessage());
} catch (ParsingException e) {
! if (logger.isErrorEnabled())
! logger.error("ParsingException " + e.getMessage());
} catch (java.io.IOException e) {
! if (logger.isErrorEnabled())
! logger.error("java.io.IOException " + e.getMessage());
} catch (Exception e) {
! if (logger.isErrorEnabled())
! logger.error("Exception " + e.getMessage());
}
}
--- 132,149 ----
try {
getFodtFromText();
! if (log.isInfoEnabled())
! log.info("Convert done.");
} catch (ValidityException e) {
! if (log.isErrorEnabled())
! log.error("ValidityException " + e.getMessage());
} catch (ParsingException e) {
! if (log.isErrorEnabled())
! log.error("ParsingException " + e.getMessage());
} catch (java.io.IOException e) {
! if (log.isErrorEnabled())
! log.error("java.io.IOException " + e.getMessage());
} catch (Exception e) {
! if (log.isErrorEnabled())
! log.error("Exception " + e.getMessage());
}
}
***************
*** 156,161 ****
File fTextFile = new File(sInputTextFilePath);
String sTextFilePathURL = formatOOUrl(fTextFile.getAbsolutePath());
! if (logger.isDebugEnabled())
! logger
.debug("Document to convert into Flat OpenDocument Text : "
+ sTextFilePathURL);
--- 156,161 ----
File fTextFile = new File(sInputTextFilePath);
String sTextFilePathURL = formatOOUrl(fTextFile.getAbsolutePath());
! if (log.isDebugEnabled())
! log
.debug("Document to convert into Flat OpenDocument Text : "
+ sTextFilePathURL);
***************
*** 163,168 ****
// Flat OpenDocument Text's document
String sOutputFodtFilePathURL = formatOOUrl(sOutputFodtFilePath);
! if (logger.isDebugEnabled())
! logger.debug("Flat OpenDocument Text's document : "
+ sOutputFodtFilePathURL);
--- 163,168 ----
// Flat OpenDocument Text's document
String sOutputFodtFilePathURL = formatOOUrl(sOutputFodtFilePath);
! if (log.isDebugEnabled())
! log.debug("Flat OpenDocument Text's document : "
+ sOutputFodtFilePathURL);
***************
*** 192,197 ****
.queryInterface(XPropertySet.class, xController);
! if (logger.isInfoEnabled())
! logger
.info("Nb pages : "
+ xTextDocumentPropertySet
--- 192,197 ----
.queryInterface(XPropertySet.class, xController);
! if (log.isInfoEnabled())
! log
.info("Nb pages : "
+ xTextDocumentPropertySet
***************
*** 204,209 ****
// Store the input document in FODT format
! if (logger.isDebugEnabled())
! logger.debug("Store the input document in FODT format");
PropertyValue storeFodtProp[] = new PropertyValue[2];
storeFodtProp[0] = new PropertyValue();
--- 204,209 ----
// Store the input document in FODT format
! if (log.isDebugEnabled())
! log.debug("Store the input document in FODT format");
PropertyValue storeFodtProp[] = new PropertyValue[2];
storeFodtProp[0] = new PropertyValue();
***************
*** 214,219 ****
storeFodtProp[1].Value = "devguide_FlatXMLFilter_Cpp_writer";
! if (logger.isDebugEnabled())
! logger.debug("sOutputFodtFilePathURL : "
+ sOutputFodtFilePathURL);
xStorableTextDocument.storeAsURL(
--- 214,219 ----
storeFodtProp[1].Value = "devguide_FlatXMLFilter_Cpp_writer";
! if (log.isDebugEnabled())
! log.debug("sOutputFodtFilePathURL : "
+ sOutputFodtFilePathURL);
xStorableTextDocument.storeAsURL(
***************
*** 251,256 ****
// Query the input document for its XCloseable interface in order to
// close it
! if (logger.isDebugEnabled())
! logger.debug("close input document ");
XCloseable xCloseableInputDocument = (XCloseable) UnoRuntime
.queryInterface(XCloseable.class, oTextDocument);
--- 251,256 ----
// Query the input document for its XCloseable interface in order to
// close it
! if (log.isDebugEnabled())
! log.debug("close input document ");
XCloseable xCloseableInputDocument = (XCloseable) UnoRuntime
.queryInterface(XCloseable.class, oTextDocument);
Index: FODTGraphicalObjectConverterMain.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/FODTGraphicalObjectConverterMain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FODTGraphicalObjectConverterMain.java 1 Dec 2006 10:48:58 -0000 1.3
--- FODTGraphicalObjectConverterMain.java 6 Dec 2006 09:01:20 -0000 1.4
***************
*** 71,75 ****
convert.execute();
! System.exit(0);
}
--- 71,75 ----
convert.execute();
! // System.exit(0);
}
Index: FODTGraphicalObjectsConverter.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/FODTGraphicalObjectsConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FODTGraphicalObjectsConverter.java 1 Dec 2006 11:03:16 -0000 1.3
--- FODTGraphicalObjectsConverter.java 6 Dec 2006 09:01:20 -0000 1.4
***************
*** 49,52 ****
--- 49,55 ----
import java.util.TreeMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
import nu.xom.Attribute;
import nu.xom.Builder;
***************
*** 83,86 ****
--- 86,92 ----
*/
public class FODTGraphicalObjectsConverter {
+
+ /** Le logger. */
+ private static Log log = LogFactory.getLog(FODTGraphicalObjectsConverter.class);
/*
***************
*** 266,284 ****
public OOOConnection oooConnect;
! // The directory that contains the input document
private String sInputDir;
! // The directory where to store the converted FODT file and its PNG images.
private String sOutputDir;
! // XOM Documents
private Document dFodtDocument, dDrawTemplate;
! // XOM Elements
private Element drawTemplatePage, imageFrame, linkedImage;
private Element inputFodtRootElement;
! // Measurement unit
String unit = "cm";
--- 272,290 ----
public OOOConnection oooConnect;
! /** The directory that contains the input document */
private String sInputDir;
! /** The directory where to store the converted FODT file and its PNG images. */
private String sOutputDir;
! /** XOM Documents */
private Document dFodtDocument, dDrawTemplate;
! /** XOM Elements */
private Element drawTemplatePage, imageFrame, linkedImage;
private Element inputFodtRootElement;
! /** Measurement unit */
String unit = "cm";
***************
*** 380,409 ****
updateAndSaveFodtTextDocument();
! System.out.println("Convert done.");
} catch (IOException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (IllegalArgumentException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (CloseVetoException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (ValidityException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (ParsingException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (java.io.IOException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (WrappedTargetException e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
} catch (Exception e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
}
}
--- 386,425 ----
updateAndSaveFodtTextDocument();
! if (log.isDebugEnabled()) {
! log.debug("Convert done.");
! }
} catch (IOException e) {
! log.error(
! "Erreur IO OpenOffice : " + e, e
! );
} catch (IllegalArgumentException e) {
! log.error(
! "Erreur d'arguments : " + e, e
! );
} catch (CloseVetoException e) {
! log.error(
! "CloseVetoException : " + e, e
! );
} catch (ValidityException e) {
! log.error(
! "ValidityException : " + e, e
! );
} catch (ParsingException e) {
! log.error(
! "ParsingException : " + e, e
! );
} catch (java.io.IOException e) {
! log.error(
! "Erreur IO : " + e, e
! );
} catch (WrappedTargetException e) {
! log.error(
! "WrappedTargetException : " + e, e
! );
} catch (Exception e) {
! log.error(
! "Exception OpenOffice : " + e, e
! );
}
}
***************
*** 505,512 ****
}
! System.out.print(graphicsKind.get(sDrawingObjectKind));
! if (sDrawingObjectKind.equals("drawing-shape"))
! System.out.print(" - " + drawingObject.getLocalName());
// Define the object's name
--- 521,533 ----
}
! if (log.isDebugEnabled()) {
! log.debug(graphicsKind.get(sDrawingObjectKind));
! }
! if (sDrawingObjectKind.equals("drawing-shape")) {
! if (log.isDebugEnabled()) {
! log.debug(" - " + drawingObject.getLocalName());
! }
! }
// Define the object's name
***************
*** 518,523 ****
"draw:name", drawNamespace, sDrawingObjectName));
graphicIndex = graphicIndex + 1;
! System.out.println(" : generated name " + "'"
! + sDrawingObjectName + "'");
} else {
// Treatment string (accents, spaces...)
--- 539,548 ----
"draw:name", drawNamespace, sDrawingObjectName));
graphicIndex = graphicIndex + 1;
!
! if (log.isDebugEnabled()) {
! log.debug(
! " : generated name " + "'" + sDrawingObjectName + "'"
! );
! }
} else {
// Treatment string (accents, spaces...)
***************
*** 529,533 ****
"draw:name", drawNamespace, sDrawingObjectName));
! System.out.println(" : " + "'" + sDrawingObjectName + "'");
}
return isToExport;
--- 554,560 ----
"draw:name", drawNamespace, sDrawingObjectName));
! if (log.isDebugEnabled()) {
! log.debug(" : " + "'" + sDrawingObjectName + "'");
! }
}
return isToExport;
Index: OOOConnection.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/textes/retro/fodtconverter/OOOConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OOOConnection.java 1 Dec 2006 11:04:28 -0000 1.3
--- OOOConnection.java 6 Dec 2006 09:01:20 -0000 1.4
***************
*** 40,43 ****
--- 40,46 ----
package fr.emn.castor.documents.metier.textes.retro.fodtconverter;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
***************
*** 58,61 ****
--- 61,67 ----
*/
public class OOOConnection {
+
+ /** Le logger. */
+ private static Log log = LogFactory.getLog(OOOConnection.class);
public XComponentContext xOfficeComponentContext;
***************
*** 87,91 ****
if (rInitialObject == null) {
! System.exit(0);
}
--- 93,99 ----
if (rInitialObject == null) {
! log.fatal("Impossible de se connecter à OpenOffice !");
! return false;
! // System.exit(0);
}
***************
*** 112,122 ****
} catch (Exception e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
! result = false;
} catch (java.lang.Exception e) {
! // TODO Auto-generated catch block
! e.printStackTrace();
! result = false;
}
--- 120,132 ----
} catch (Exception e) {
! log.error(
! "Impossible de se connecter à OpenOffice : " + e, e
! );
! return false;
} catch (java.lang.Exception e) {
! log.error(
! "Impossible de se connecter à OpenOffice : " + e, e
! );
! return false;
}
***************
*** 181,203 ****
if (null != rInitialObject) {
! System.out.println("initial object successfully retrieved");
} else {
! System.out
! .println("given initial-object name unknown at server side");
}
} catch (com.sun.star.connection.NoConnectException e) {
! System.out.println("Couldn't connect to remote server");
! System.out.println(e.getMessage());
} catch (com.sun.star.connection.ConnectionSetupException e) {
! System.out
! .println("Couldn't access necessary local resource to establish the interprocess connection");
! System.out.println(e.getMessage());
} catch (com.sun.star.lang.IllegalArgumentException e) {
! System.out.println("uno-url is syntactical illegal ( " + sUNOUrl
! + " )");
! System.out.println(e.getMessage());
} catch (com.sun.star.uno.RuntimeException e) {
! System.out.println("RuntimeException");
! System.out.println(e.getMessage());
}
--- 191,217 ----
if (null != rInitialObject) {
! if (log.isDebugEnabled()) {
! log.debug("import du document réussi !");
! }
} else {
! if (log.isDebugEnabled()) {
! log.debug("Le document n'a pas pu être récupéré coté serveur");
! }
}
} catch (com.sun.star.connection.NoConnectException e) {
! log.error(
! "Impossible de se connecter au serveur distant : "+ e, e
! );
} catch (com.sun.star.connection.ConnectionSetupException e) {
! log.error(
! "Ressources locales introuvables " +
! "pour établir une connexion distante : " + e, e
! );
} catch (com.sun.star.lang.IllegalArgumentException e) {
! log.error(
! "Erreur syntaxique dans uno-url : " + sUNOUrl, e
! );
} catch (com.sun.star.uno.RuntimeException e) {
! log.error("RuntimeException : " + e, e);
}
Plus d'informations sur la liste de diffusion Castore-commits