You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2001/02/23 04:47:08 UTC

cvs commit: xml-fop/src/org/apache/fop/fo FObj.java

keiron      01/02/22 19:47:08

  Modified:    src/org/apache/fop/dom/svg SVGDocumentImpl.java
               src/org/apache/fop/fo FObj.java
  Log:
  makes checks to prevent exceptions
  
  Revision  Changes    Path
  1.7       +4 -2      xml-fop/src/org/apache/fop/dom/svg/SVGDocumentImpl.java
  
  Index: SVGDocumentImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/dom/svg/SVGDocumentImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SVGDocumentImpl.java	2000/09/15 00:21:35	1.6
  +++ SVGDocumentImpl.java	2001/02/23 03:47:07	1.7
  @@ -1,4 +1,4 @@
  -/*-- $Id: SVGDocumentImpl.java,v 1.6 2000/09/15 00:21:35 keiron Exp $ --
  +/*-- $Id: SVGDocumentImpl.java,v 1.7 2001/02/23 03:47:07 keiron Exp $ --
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -102,7 +102,9 @@
   
   	public SVGSVGElement getRootElement()
   	{
  -		return (SVGSVGElement)childs.elementAt(0);
  +		if(childs.size() > 0)
  +    		return (SVGSVGElement)childs.elementAt(0);
  +    	return null;
   	}
   
   	public Element getElementById(String elementId)
  
  
  
  1.15      +3 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FObj.java	2001/01/02 21:35:39	1.14
  +++ FObj.java	2001/02/23 03:47:08	1.15
  @@ -1,4 +1,4 @@
  -/*-- $Id: FObj.java,v 1.14 2001/01/02 21:35:39 klease Exp $ -- 
  +/*-- $Id: FObj.java,v 1.15 2001/02/23 03:47:08 keiron Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -165,6 +165,8 @@
      */
     public void removeID(IDReferences idReferences)
     {
  +      if(((FObj)this).properties.get("id") == null)
  +          return;
         idReferences.removeID( ((FObj)this).properties.get("id").getString());                            
         int numChildren = this.children.size();
       for (int i = 0; i < numChildren; i++)