You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by vh...@apache.org on 2001/02/01 18:16:46 UTC
cvs commit: xml-batik/sources/org/apache/batik/gvt DecoratedShapeNode.java
vhardy 01/02/01 09:16:46
Modified: sources/org/apache/batik/bridge CSSUtilities.java
SVGDecoratedShapeElementBridge.java
SVGPolygonElementBridge.java
sources/org/apache/batik/gvt DecoratedShapeNode.java
Log:
a. Removed trace
b. Prepared DecoratedShapeNode bridge for move to marker shorthand.
Revision Changes Path
1.5 +1 -4 xml-batik/sources/org/apache/batik/bridge/CSSUtilities.java
Index: CSSUtilities.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/CSSUtilities.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CSSUtilities.java 2001/02/01 16:41:48 1.4
+++ CSSUtilities.java 2001/02/01 17:16:38 1.5
@@ -61,7 +61,7 @@
* A collection of utility methods involving CSS.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: CSSUtilities.java,v 1.4 2001/02/01 16:41:48 vhardy Exp $
+ * @version $Id: CSSUtilities.java,v 1.5 2001/02/01 17:16:38 vhardy Exp $
*/
public class CSSUtilities implements SVGConstants {
@@ -612,17 +612,14 @@
(CSSPrimitiveValue) decl.getPropertyCSSValue(markerProperty);
if(v == null){
- System.out.println(markerProperty + " Null marker value...");
return null;
}
switch(v.getPrimitiveType()){
case CSSPrimitiveValue.CSS_IDENT:
// value is 'none'
- System.out.println(markerProperty + "Marker value is none ..");
return null;
case CSSPrimitiveValue.CSS_URI:
- System.out.println(markerProperty + "Marker value is : " + v.getStringValue());
return convertURIToMarker(v.getStringValue(),
paintedElement,
ctx, decl, uctx);
1.2 +8 -1 xml-batik/sources/org/apache/batik/bridge/SVGDecoratedShapeElementBridge.java
Index: SVGDecoratedShapeElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGDecoratedShapeElementBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGDecoratedShapeElementBridge.java 2001/02/01 16:41:50 1.1
+++ SVGDecoratedShapeElementBridge.java 2001/02/01 17:16:39 1.2
@@ -42,7 +42,7 @@
* A factory for the SVG elements that represents a shape.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: SVGDecoratedShapeElementBridge.java,v 1.1 2001/02/01 16:41:50 vhardy Exp $
+ * @version $Id: SVGDecoratedShapeElementBridge.java,v 1.2 2001/02/01 17:16:39 vhardy Exp $
*/
public abstract class SVGDecoratedShapeElementBridge
extends SVGShapeElementBridge {
@@ -84,6 +84,10 @@
// Extract the marker properties
//
+ //
+ // <!> TO BE REMOVED WHEN marker IMPLEMENTED AS SHORT-HAND
+ //
+
// Start with marker, a short-hand for start/middle/end
Marker marker = CSSUtilities.convertMarker(svgElement,
CSS_MARKER_PROPERTY,
@@ -95,6 +99,9 @@
node.setEndMarker(marker);
}
else{
+
+ // <!> END TO BE REMOVED
+
// Extract start, middle and end markers
if(hasStartMarker()){
Marker startMarker
1.4 +3 -3 xml-batik/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java
Index: SVGPolygonElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPolygonElementBridge.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGPolygonElementBridge.java 2001/02/01 16:41:52 1.3
+++ SVGPolygonElementBridge.java 2001/02/01 17:16:40 1.4
@@ -31,7 +31,7 @@
* A factory for the <polygon> element.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: SVGPolygonElementBridge.java,v 1.3 2001/02/01 16:41:52 vhardy Exp $
+ * @version $Id: SVGPolygonElementBridge.java,v 1.4 2001/02/01 17:16:40 vhardy Exp $
*/
public class SVGPolygonElementBridge extends SVGDecoratedShapeElementBridge {
@@ -74,10 +74,10 @@
}
protected boolean hasStartMarker(){
- return false;
+ return true;
}
protected boolean hasEndMarker(){
- return false;
+ return true;
}
}
1.2 +1 -11 xml-batik/sources/org/apache/batik/gvt/DecoratedShapeNode.java
Index: DecoratedShapeNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/DecoratedShapeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DecoratedShapeNode.java 2001/02/01 16:41:56 1.1
+++ DecoratedShapeNode.java 2001/02/01 17:16:44 1.2
@@ -35,7 +35,7 @@
*
* @author <a mailto:"vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @author <a mailto:"tkormann@apache.org">Thierry Kormann</a>
- * @version $Id: DecoratedShapeNode.java,v 1.1 2001/02/01 16:41:56 vhardy Exp $
+ * @version $Id: DecoratedShapeNode.java,v 1.2 2001/02/01 17:16:44 vhardy Exp $
*/
public class DecoratedShapeNode extends ShapeNode {
/**
@@ -84,7 +84,6 @@
private CompositeGraphicsNode markerGroup = new CompositeGraphicsNode();
public void setStartMarker(Marker startMarker){
- System.out.println("Setting start : " + startMarker);
this.startMarker = startMarker;
this.startMarkerProxy = null;
invalidateGeometryCache();
@@ -92,7 +91,6 @@
}
public void setMiddleMarker(Marker middleMarker){
- System.out.println("Setting middle");
this.middleMarker = middleMarker;
this.middleMarkerProxies = null;
invalidateGeometryCache();
@@ -100,7 +98,6 @@
}
public void setEndMarker(Marker endMarker){
- System.out.println("Setting end");
this.endMarker = endMarker;
this.endMarkerProxy = null;
invalidateGeometryCache();
@@ -124,7 +121,6 @@
* markers
*/
private CompositeGraphicsNode buildMarkerGroup(){
- System.out.println("Building markerGroup : " + startMarker);
if(startMarker != null && startMarkerProxy == null){
startMarkerProxy = buildStartMarkerProxy();
}
@@ -153,7 +149,6 @@
children.add(endMarkerProxy);
}
- System.out.println("List has : " + children.size() + " children");
return group;
}
@@ -162,7 +157,6 @@
* <tt>Marker</tt> to be drawn at the start position
*/
public ProxyGraphicsNode buildStartMarkerProxy(){
- System.out.println("Building startMarkerProxy");
PathIterator iter = getShape().getPathIterator(null);
// Get initial point on the path
@@ -170,7 +164,6 @@
int segType = 0;
if(iter.isDone()){
- System.out.println("No points in Shape");
return null;
}
@@ -468,8 +461,6 @@
double outSlope = computeOutSlope(cur, curSegType,
next, nextSegType, moveTo);
- System.out.println("inSlope / outSlope : " + inSlope + "/" + outSlope);
-
if(Double.isNaN(inSlope)){
inSlope = outSlope;
}
@@ -586,7 +577,6 @@
if(curSegType != PathIterator.SEG_CLOSE){
curEndPoint = getSegmentTerminatingPoint(cur, curSegType);
if(curEndPoint == null){
- System.out.println("Cannot compute curEndPoint");
return Double.NaN;
}
}
Re: cvs commit:
xml-batik/sources/org/apache/batik/gvtDecoratedShapeNode.java
Posted by Vincent Hardy <vh...@eng.sun.com>.
I will.
V.
Thomas E Deweese wrote:
>
> >>>>> "VH" == Vincent Hardy <vh...@apache.org> writes:
>
> VH> Log: a. Removed trace
>
> VH> b. Prepared DecoratedShapeNode bridge for move to marker
> VH> shorthand.
>
> You still have a stack trace when a composite is empty.
>
> Can this be safely removed?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
> For additional commands, e-mail: batik-dev-help@xml.apache.org
Re: cvs commit:
xml-batik/sources/org/apache/batik/gvtDecoratedShapeNode.java
Posted by Vincent Hardy <vh...@eng.sun.com>.
Thomas,
There should no longer be any trace now (do an update).
V.
Thomas E Deweese wrote:
>
> >>>>> "VH" == Vincent Hardy <vh...@apache.org> writes:
>
> VH> Log: a. Removed trace
>
> VH> b. Prepared DecoratedShapeNode bridge for move to marker
> VH> shorthand.
>
> You still have a stack trace when a composite is empty.
>
> Can this be safely removed?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
> For additional commands, e-mail: batik-dev-help@xml.apache.org
cvs commit: xml-batik/sources/org/apache/batik/gvt
DecoratedShapeNode.java
Posted by Thomas E Deweese <th...@kodak.com>.
>>>>> "VH" == Vincent Hardy <vh...@apache.org> writes:
VH> Log: a. Removed trace
VH> b. Prepared DecoratedShapeNode bridge for move to marker
VH> shorthand.
You still have a stack trace when a composite is empty.
Can this be safely removed?