You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2007/11/27 05:21:11 UTC

svn commit: r598513 - in /xmlgraphics/batik/trunk/sources/org/apache/batik: swing/svg/AbstractJSVGComponent.java util/SVGConstants.java

Author: cam
Date: Mon Nov 26 20:21:10 2007
New Revision: 598513

URL: http://svn.apache.org/viewvc?rev=598513&view=rev
Log:
More realistic feature string reporting.

Modified:
    xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java
    xmlgraphics/batik/trunk/sources/org/apache/batik/util/SVGConstants.java

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java?rev=598513&r1=598512&r2=598513&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java Mon Nov 26 20:21:10 2007
@@ -3654,75 +3654,66 @@
     static {
         // SVG 1.0 feature strings
         FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_FEATURE);
-        FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_LANG_FEATURE);
         FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_STATIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_ANIMATION_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_DYNAMIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_ALL_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_DOM_SVG_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_DOM_SVG_STATIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_DOM_SVG_ANIMATION_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_DOM_SVG_DYNAMIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_ORG_W3C_DOM_SVG_ALL_FEATURE);
 
         // SVG 1.1 feature strings
-        // Due to various other feature strings not being supported
+        // Due to SVG_SVG11_VIEWPORT_ATTRIBUTE_FEATURE not being supported
         // FEATURES.add(SVGConstants.SVG_SVG11_SVG_FEATURE);
-        // FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_FEATURE);
         // FEATURES.add(SVGConstants.SVG_SVG11_SVG_STATIC_FEATURE);
-        // FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_STATIC_FEATURE);
         // FEATURES.add(SVGConstants.SVG_SVG11_SVG_ANIMATION_FEATURE);
-        // FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_ANIMATION_FEATURE);
         // FEATURES.add(SVGConstants.SVG_SVG11_SVG_DYNAMIC_FEATURE);
-        // FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_DYNAMIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_STATIC_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_ANIMATION_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_SVG_DOM_DYNAMIC_FEATURE);
 
         FEATURES.add(SVGConstants.SVG_SVG11_CORE_ATTRIBUTE_FEATURE);
-        // baseProfile="", contentStyleType="" and 'clip' not supported on <svg>
-        // FEATURES.add(SVGConstants.SVG_SVG11_STRUCTURE_FEATURE);
-        // baseProfile="", and 'clip' not supported on <svg>
-        // FEATURES.add(SVGConstants.SVG_SVG11_BASIC_STRUCTURE_FEATURE);
-        // 'enable-background' not supported on all container elements
-        // FEATURES.add(SVGConstants.SVG_SVG11_CONTAINER_ATTRIBUTE_FEATURE);
-        // Conditional processing attributes not supported on animation elements
-        // FEATURES.add(SVGConstants.SVG_SVG11_CONDITIONAL_PROCESSING_FEATURE);
-        // 'clip' on <image> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_IMAGE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_STRUCTURE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_BASIC_STRUCTURE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_CONTAINER_ATTRIBUTE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_CONDITIONAL_PROCESSING_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_IMAGE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_STYLE_FEATURE);
         // 'clip' on various elements not supported
         // FEATURES.add(SVGConstants.SVG_SVG11_VIEWPORT_ATTRIBUTE_FEATURE);
-        // pathLength="" on <path> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_SHAPE_FEATURE);
-        // Various font properties on <text> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_TEXT_FEATURE);
-        // Various font properties on <text> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_BASIC_TEXT_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_SHAPE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_TEXT_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_BASIC_TEXT_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_PAINT_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_BASIC_PAINT_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_OPACITY_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_GRAPHICS_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_BASIC_GRAPHICS_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_MARKER_FEATURE);
-        // local="" not supported on <color-profile>
-        // FEATURES.add(SVGConstants.SVG_SVG11_COLOR_PROFILE_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_COLOR_PROFILE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_GRADIENT_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_PATTERN_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_CLIP_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_BASIC_CLIP_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_MASK_FEATURE);
-        // kernelUnitLength="" on <feDiffuseLighting> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_FILTER_FEATURE);
-        // preserveAspectRatio="" and 'clip' on <feImage> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_BASIC_FILTER_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_FILTER_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_BASIC_FILTER_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_DOCUMENT_EVENTS_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_GRAPHICAL_EVENTS_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_ANIMATION_EVENTS_ATTRIBUTE_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_CURSOR_FEATURE);
-        // target="" on <a> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_HYPERLINKING_FEATURE);
-        // FEATURES.add(SVGConstants.SVG_SVG11_XLINK_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_HYPERLINKING_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_XLINK_FEATURE);
         // externalResourcesRequired="" not supported
         // FEATURES.add(SVGConstants.SVG_SVG11_EXTERNAL_RESOURCES_REQUIRED_FEATURE);
-        // viewTarget="" on <view> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_VIEW_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_VIEW_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_SCRIPT_FEATURE);
         FEATURES.add(SVGConstants.SVG_SVG11_ANIMATION_FEATURE);
-        // <definition-src> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_FONT_FEATURE);
-        // Various attributes on <font-face> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_BASIC_FONT_FEATURE);
-        // <foreignObject> not supported
-        // FEATURES.add(SVGConstants.SVG_SVG11_EXTENSIBILITY_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_FONT_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_BASIC_FONT_FEATURE);
+        FEATURES.add(SVGConstants.SVG_SVG11_EXTENSIBILITY_FEATURE);
     }
 }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/util/SVGConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/util/SVGConstants.java?rev=598513&r1=598512&r2=598513&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/util/SVGConstants.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/util/SVGConstants.java Mon Nov 26 20:21:10 2007
@@ -278,11 +278,19 @@
     // SVG features
     /////////////////////////////////////////////////////////////////////////
 
+    // SVG 1.0 feature strings
     String SVG_ORG_W3C_SVG_FEATURE = "org.w3c.svg";
-    String SVG_ORG_W3C_SVG_LANG_FEATURE = "org.w3c.svg.lang";
     String SVG_ORG_W3C_SVG_STATIC_FEATURE = "org.w3c.svg.static";
-    // TODO More SVG 1.0 feature strings
+    String SVG_ORG_W3C_SVG_ANIMATION_FEATURE = "org.w3c.svg.animation";
+    String SVG_ORG_W3C_SVG_DYNAMIC_FEATURE = "org.w3c.svg.dynamic";
+    String SVG_ORG_W3C_SVG_ALL_FEATURE = "org.w3c.svg.all";
+    String SVG_ORG_W3C_DOM_SVG_FEATURE = "org.w3c.dom.svg";
+    String SVG_ORG_W3C_DOM_SVG_STATIC_FEATURE = "org.w3c.dom.svg.static";
+    String SVG_ORG_W3C_DOM_SVG_ANIMATION_FEATURE = "org.w3c.dom.svg.animation";
+    String SVG_ORG_W3C_DOM_SVG_DYNAMIC_FEATURE = "org.w3c.dom.svg.dynamic";
+    String SVG_ORG_W3C_DOM_SVG_ALL_FEATURE = "org.w3c.dom.svg.all";
 
+    // SVG 1.1 feature strings
     String SVG_SVG11_SVG_FEATURE = "http://www.w3.org/TR/SVG11/feature#SVG";
     String SVG_SVG11_SVG_DOM_FEATURE = "http://www.w3.org/TR/SVG11/feature#SVGDOM";
     String SVG_SVG11_SVG_STATIC_FEATURE = "http://www.w3.org/TR/SVG11/feature#SVG-static";