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 2006/03/22 06:02:24 UTC

svn commit: r387722 - in /xmlgraphics/batik/branches/webapi: ./ sources/org/apache/batik/bridge/ sources/org/apache/batik/dom/ sources/org/w3c/dom/window/

Author: cam
Date: Tue Mar 21 21:02:22 2006
New Revision: 387722

URL: http://svn.apache.org/viewcvs?rev=387722&view=rev
Log:
1. Added org.w3c.dom.window.* interfaces.
2. Made the window object implement org.w3c.dom.window.Window,
   and the document object implement org.w3c.dom.window.DocumentWindow.

Added:
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java   (with props)
    xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java   (with props)
Modified:
    xmlgraphics/batik/branches/webapi/build.xml
    xmlgraphics/batik/branches/webapi/sources/org/apache/batik/bridge/ScriptingEnvironment.java
    xmlgraphics/batik/branches/webapi/sources/org/apache/batik/dom/AbstractStylableDocument.java

Modified: xmlgraphics/batik/branches/webapi/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/build.xml?rev=387722&r1=387721&r2=387722&view=diff
==============================================================================
--- xmlgraphics/batik/branches/webapi/build.xml (original)
+++ xmlgraphics/batik/branches/webapi/build.xml Tue Mar 21 21:02:22 2006
@@ -548,6 +548,7 @@
         <include name="org/w3c/dom/smil/**"/>
         <include name="org/w3c/dom/svg/**"/>
         <include name="org/w3c/dom/svg12/**"/>
+        <include name="org/w3c/dom/window/**"/>
       </fileset>
       <fileset dir="${resources}" excludes="**/.svn/">
         <include name="**"/>

Modified: xmlgraphics/batik/branches/webapi/sources/org/apache/batik/bridge/ScriptingEnvironment.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/apache/batik/bridge/ScriptingEnvironment.java?rev=387722&r1=387721&r2=387722&view=diff
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/apache/batik/bridge/ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/branches/webapi/sources/org/apache/batik/bridge/ScriptingEnvironment.java Tue Mar 21 21:02:22 2006
@@ -61,6 +61,7 @@
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.MutationEvent;
 import org.w3c.dom.svg.SVGDocument;
+import org.w3c.dom.views.DocumentView;
 
 /**
  * This class contains the informations needed by the SVG scripting.
@@ -801,7 +802,8 @@
     /**
      * Represents the window object of this environment.
      */
-    protected class Window implements org.apache.batik.script.Window {
+    protected class Window implements org.apache.batik.script.Window,
+                                      org.w3c.dom.window.Window {
 
         /**
          * The associated interpreter.
@@ -1295,6 +1297,31 @@
          */
         public Interpreter getInterpreter() {
             return interpreter;
+        }
+
+        // AbstractView //////////////////////////////////////////////////////
+
+        /**
+         * Returns the document that has this window object as its view.
+         */
+        public DocumentView getDocument() {
+            return (DocumentView) document;
+        }
+
+        // org.w3c.dom.window.Window /////////////////////////////////////////
+
+        /**
+         * Returns the window object.
+         */
+        public org.w3c.dom.window.Window getWindow() {
+            return this;
+        }
+
+        /**
+         * Returns this window object.
+         */
+        public org.w3c.dom.window.Window getSelf() {
+            return this;
         }
     }
 

Modified: xmlgraphics/batik/branches/webapi/sources/org/apache/batik/dom/AbstractStylableDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/apache/batik/dom/AbstractStylableDocument.java?rev=387722&r1=387721&r2=387722&view=diff
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/apache/batik/dom/AbstractStylableDocument.java (original)
+++ xmlgraphics/batik/branches/webapi/sources/org/apache/batik/dom/AbstractStylableDocument.java Tue Mar 21 21:02:22 2006
@@ -28,6 +28,7 @@
 import org.w3c.dom.stylesheets.StyleSheetList;
 import org.w3c.dom.views.DocumentView;
 import org.w3c.dom.views.AbstractView;
+import org.w3c.dom.window.DocumentWindow;
 
 /**
  * A Document that supports CSS styling.
@@ -37,7 +38,7 @@
  */
 public abstract class AbstractStylableDocument extends AbstractDocument
     implements DocumentCSS,
-               DocumentView {
+               DocumentWindow {
 
     /**
      * The default view.

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,5 @@
+package org.w3c.dom.window;
+
+public interface DocumentLocation {
+    Location getLocation();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentLocation.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,6 @@
+package org.w3c.dom.window;
+
+import org.w3c.dom.views.DocumentView;
+
+public interface DocumentWindow extends DocumentView {
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/DocumentWindow.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,8 @@
+package org.w3c.dom.window;
+
+import org.w3c.dom.Document;
+
+public interface EmbeddingElement {
+    Document getContentDocument();
+    Window getContentWindow();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/EmbeddingElement.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,26 @@
+package org.w3c.dom.window;
+
+public interface Location {
+    void setHref(String href);
+    String getHref();
+    void setHash(String hash);
+    String getHash();
+    void setHost(String host);
+    String getHost();
+    void setHostname(String host);
+    String getHostname();
+    void setPathname(String pathname);
+    String getPathname();
+    void setPort(String port);
+    String getPort();
+    void setProtocol(String protocol);
+    String getProtocol();
+    void setSearch(String search);
+    String getSearch();
+
+    void assign(String url);
+    void replace(String url);
+    void reload();
+
+    String toString();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Location.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,4 @@
+package org.w3c.dom.window;
+
+public interface TimerListener {
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/TimerListener.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,8 @@
+package org.w3c.dom.window;
+
+import org.w3c.dom.views.AbstractView;
+
+public interface Window extends AbstractView {
+    Window getWindow();
+    Window getSelf();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/Window.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,12 @@
+package org.w3c.dom.window;
+
+import org.w3c.dom.Element;
+
+public interface WindowEmbedding {
+    void setName(String name);
+    String getName();
+
+    Window getParent();
+    Window getTop();
+    Element getFrameElement();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowEmbedding.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,5 @@
+package org.w3c.dom.window;
+
+public interface WindowLocation {
+    Location getLocation();
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowLocation.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java?rev=387722&view=auto
==============================================================================
--- xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java (added)
+++ xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java Tue Mar 21 21:02:22 2006
@@ -0,0 +1,9 @@
+package org.w3c.dom.window;
+
+public interface WindowTimers {
+    int setTimeout(TimerListener listener, int milliseconds);
+    void clearTimeout(int timerID);
+
+    int setInterval(TimerListener listener, int milliseconds);
+    void clearInterval(int timerID);
+}

Propchange: xmlgraphics/batik/branches/webapi/sources/org/w3c/dom/window/WindowTimers.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision