Changeset 3138

Show
Ignore:
Timestamp:
03/02/10 18:46:49 (5 months ago)
Author:
martijn
Message:

Prevent flood of 'unkown shape None' log messages

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/core/org/pathvisio/view/GraphicsShape.java

    r3130 r3138  
    381381                java.awt.Shape s = null; 
    382382 
    383                 if (gdata.getShapeType() == null) 
     383                if (gdata.getShapeType() == null || gdata.getShapeType() == ShapeType.NONE) 
    384384                { 
    385385                        s = ShapeRegistry.getShape ("Rectangle", x, y, w, h); 

  • trunk/src/core/org/pathvisio/view/Shape.java

    r3092 r3138  
    2525 
    2626import org.pathvisio.model.PathwayElement; 
     27import org.pathvisio.model.ShapeType; 
    2728 
    2829/** 
    … …  
    8687                java.awt.Shape s = null; 
    8788 
    88                 if (gdata.getShapeType() == null) 
     89                if (gdata.getShapeType() == null || gdata.getShapeType() == ShapeType.NONE) 
    8990                { 
    9091                        s = ShapeRegistry.getShape ("Default", x, y, w, h); 

  • trunk/tools/cytoscape-gpml/src/org/pathvisio/cytoscape/Shape.java

    r2979 r3138  
    8181                java.awt.Shape s = null; 
    8282 
    83                 if (pwElm.getShapeType() == null) 
     83                if (pwElm.getShapeType() == null || pwElm.getShapeType() == ShapeType.NONE) 
    8484                { 
    8585                        s = ShapeRegistry.getShape ("Default", x, y, w, h);