[Castore-commits] ParserNotice.java 1.1.2.3 1.1.2.4

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier
In directory adullact1:/tmp/cvs-serv11676/src/java/fr/emn/castor/documents/metier

Modified Files:
      Tag: v1_1_branch
	ParserNotice.java 
Log Message:
mise en page

Index: ParserNotice.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/metier/ParserNotice.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ParserNotice.java	7 Feb 2006 15:46:11 -0000	1.1.2.3
--- ParserNotice.java	6 Mar 2006 11:11:10 -0000	1.1.2.4
***************
*** 111,115 ****
              // Read the entire document into memory
              this.document = parser.parse(notice);
!             // création du XPath 
              this.xpath = XPathFactory.newInstance().newXPath();
          } catch (SAXException se) {
--- 111,115 ----
              // Read the entire document into memory
              this.document = parser.parse(notice);
!             // création du XPath
              this.xpath = XPathFactory.newInstance().newXPath();
          } catch (SAXException se) {
***************
*** 216,222 ****
       * @param key le node (champ) voulu
       * @return le node trouvé
!      * @throws XPathExpressionException si une erreur d'expression XPath survient
       */
!     private Node searchNodeWithKey(final String key) throws XPathExpressionException {
          String filtre = "//metadata[@key='" + key + "']";
          XPathExpression exp = this.xpath.compile(filtre);
--- 216,224 ----
       * @param key le node (champ) voulu
       * @return le node trouvé
!      * @throws XPathExpressionException
!      * si une erreur d'expression XPath survient
       */
!     private Node searchNodeWithKey(final String key)
!             throws XPathExpressionException {
          String filtre = "//metadata[@key='" + key + "']";
          XPathExpression exp = this.xpath.compile(filtre);
***************
*** 463,468 ****
              XPathExpression exp = this.xpath.compile("//metadata[@key='"
                      + key + "']");
!             node = (Element) exp.evaluate(
!                 this.document, XPathConstants.NODE);
          } catch (XPathExpressionException e) {
              if (log.isErrorEnabled()) {
--- 465,470 ----
              XPathExpression exp = this.xpath.compile("//metadata[@key='"
                      + key + "']");
!             node = (Element) exp
!                 .evaluate(this.document, XPathConstants.NODE);
          } catch (XPathExpressionException e) {
              if (log.isErrorEnabled()) {