keiron      01/10/08 02:56:38

  Modified:    src/org/apache/fop/fo FObj.java UnknownXMLObj.java
                        XMLObj.java
  Log:
  fixed an npe
  
  Revision  Changes    Path
  1.20      +2 -2      xml-fop/src/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- FObj.java 2001/07/30 20:29:20     1.19
  +++ FObj.java 2001/10/08 09:56:38     1.20
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FObj.java,v 1.19 2001/07/30 20:29:20 tore Exp $
  + * $Id: FObj.java,v 1.20 2001/10/08 09:56:38 keiron Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -149,7 +149,7 @@
        * reference areas and use the value of its writing-mode property.
        * If no such ancestor is found, use the value on the root FO.
        */
  -    private void setWritingMode() {
  +    protected void setWritingMode() {
           FObj p;
           FObj parent;
           for (p = this;
  
  
  
  1.2       +6 -2      xml-fop/src/org/apache/fop/fo/UnknownXMLObj.java
  
  Index: UnknownXMLObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/UnknownXMLObj.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnknownXMLObj.java        2001/09/13 07:49:32     1.1
  +++ UnknownXMLObj.java        2001/10/08 09:56:38     1.2
  @@ -1,5 +1,5 @@
   /*
  - * $Id: UnknownXMLObj.java,v 1.1 2001/09/13 07:49:32 keiron Exp $
  + * $Id: UnknownXMLObj.java,v 1.2 2001/10/08 09:56:38 keiron Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -62,7 +62,11 @@
       protected UnknownXMLObj(FObj parent, PropertyList propertyList, String space, 
String tag) {
           super(parent, propertyList, tag);
           this.namespace = space;
  -        this.name = this.namespace + ":" + tag;
  +                             if(!"".equals(space)) {
  +            this.name = this.namespace + ":" + tag;
  +        } else {
  +            this.name = "(none):" + tag;
  +        }
       }
   
       public String getNameSpace() {
  
  
  
  1.2       +2 -1      xml-fop/src/org/apache/fop/fo/XMLObj.java
  
  Index: XMLObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLObj.java       2001/09/13 07:49:32     1.1
  +++ XMLObj.java       2001/10/08 09:56:38     1.2
  @@ -1,5 +1,5 @@
   /*
  - * $Id: XMLObj.java,v 1.1 2001/09/13 07:49:32 keiron Exp $
  + * $Id: XMLObj.java,v 1.2 2001/10/08 09:56:38 keiron Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -168,5 +168,6 @@
   
       public void rollback(Vector snapshot) {}
   
  +    protected void setWritingMode() {}
   }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to