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 ss...@apache.org on 2018/04/30 10:17:31 UTC
svn commit: r1830543 - in /xmlgraphics/batik/trunk:
batik-bridge/src/main/java/org/apache/batik/bridge/
batik-dom/src/main/java/org/apache/batik/dom/
batik-ext/src/main/java/org/apache/
batik-ext/src/main/java/org/apache/batik/ batik-ext/src/main/java/...
Author: ssteiner
Date: Mon Apr 30 10:17:31 2018
New Revision: 1830543
URL: http://svn.apache.org/viewvc?rev=1830543&view=rev
Log:
BATIK-1216: Compile error on Java 10
Added:
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java (with props)
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java (with props)
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java (with props)
Removed:
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/ElementTraversal.java
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/Location.java
xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/Window.java
Modified:
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Window.java
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java
xmlgraphics/batik/trunk/batik-script/src/main/resources/META-INF/imports/script.txt
xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java Mon Apr 30 10:17:31 2018
@@ -46,6 +46,7 @@ import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.XMLConstants;
+import org.apache.batik.w3c.dom.Location;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -920,14 +921,14 @@ public class BaseScriptingEnvironment {
/**
* Returns the Location.
*/
- public org.w3c.dom.Location getLocation() {
+ public Location getLocation() {
return null;
}
/**
* Returns the parent Window object.
*/
- public org.w3c.dom.Window getParent() {
+ public org.apache.batik.w3c.dom.Window getParent() {
return null;
}
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java Mon Apr 30 10:17:31 2018
@@ -21,12 +21,13 @@ package org.apache.batik.bridge;
import org.apache.batik.dom.AbstractDocument;
/**
- * This class implements the org.w3c.dom.Location interface for Batik
+ * This class implements the org.apache.batik.w3c.dom.Location interface for Batik
*
* @author <a href="mailto:gwadej@anomaly.org">G. Wade Johnson</a>
* @version $Id: Location.java$
*/
-public class Location implements org.w3c.dom.Location {
+public class Location implements org.apache.batik.w3c.dom.Location
+{
private BridgeContext bridgeContext;
/**
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java Mon Apr 30 10:17:31 2018
@@ -1324,14 +1324,14 @@ public class ScriptingEnvironment extend
/**
* Returns a Window object representing the parent of this Window.
*/
- public org.w3c.dom.Window getParent() {
+ public org.apache.batik.w3c.dom.Window getParent() {
return null;
}
/**
* Returns a Location object representing this Window.
*/
- public org.w3c.dom.Location getLocation() {
+ public org.apache.batik.w3c.dom.Location getLocation() {
if (location == null) {
location = new Location(bridgeContext);
}
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Window.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Window.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Window.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/Window.java Mon Apr 30 10:17:31 2018
@@ -31,7 +31,8 @@ import org.w3c.dom.Node;
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public interface Window extends org.w3c.dom.Window {
+public interface Window extends org.apache.batik.w3c.dom.Window
+{
/**
* Evaluates the given string repeatedly after the given amount of
* time. This method does not stall the script: the evaluation is
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java Mon Apr 30 10:17:31 2018
@@ -33,7 +33,7 @@ import org.mozilla.javascript.Scriptable
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.w3c.dom.Location;
+import org.apache.batik.w3c.dom.Location;
/**
* This class wraps a Window object to expose it to the interpreter.
Modified: xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java (original)
+++ xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java Mon Apr 30 10:17:31 2018
@@ -27,7 +27,7 @@ import org.apache.batik.util.XMLConstant
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
-import org.w3c.dom.ElementTraversal;
+import org.apache.batik.w3c.dom.ElementTraversal;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.TypeInfo;
Added: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java?rev=1830543&view=auto
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java (added)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java Mon Apr 30 10:17:31 2018
@@ -0,0 +1,30 @@
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.batik.w3c.dom;
+
+import org.w3c.dom.Element;
+
+public interface ElementTraversal {
+
+ Element getFirstElementChild();
+ Element getLastElementChild();
+ Element getNextElementSibling();
+ Element getPreviousElementSibling();
+ int getChildElementCount();
+}
Propchange: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/ElementTraversal.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java?rev=1830543&view=auto
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java (added)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java Mon Apr 30 10:17:31 2018
@@ -0,0 +1,35 @@
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.batik.w3c.dom;
+
+public interface Location {
+ /**
+ * Invocation of this method causes the user agent to navigate to the
+ * supplied location.
+ *
+ * @param url A string containing the URL where the user agent should
+ * navigate to.
+ */
+ void assign(String url);
+
+ /**
+ * The user agent reloads the current document.
+ */
+ void reload();
+}
Propchange: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Location.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java?rev=1830543&view=auto
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java (added)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java Mon Apr 30 10:17:31 2018
@@ -0,0 +1,24 @@
+/*
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package org.apache.batik.w3c.dom;
+
+public interface Window {
+ Window getParent();
+ Location getLocation();
+}
Propchange: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/apache/batik/w3c/dom/Window.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: xmlgraphics/batik/trunk/batik-script/src/main/resources/META-INF/imports/script.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-script/src/main/resources/META-INF/imports/script.txt?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-script/src/main/resources/META-INF/imports/script.txt (original)
+++ xmlgraphics/batik/trunk/batik-script/src/main/resources/META-INF/imports/script.txt Mon Apr 30 10:17:31 2018
@@ -1,8 +1,8 @@
class java.lang.System # Optional
# The rest are needed for SVG DOM conformance.
-# class org.w3c.dom.Window # conflicts with our Window class..
-class org.w3c.dom.Location
+# class org.apache.batik.w3c.dom.Window # conflicts with our Window class..
+class org.apache.batik.w3c.dom.Location
class org.w3c.dom.Attr
class org.w3c.dom.CDATASection
class org.w3c.dom.CharacterData
@@ -249,4 +249,4 @@ class org.w3c.dom.events.MutationEvent
class org.w3c.dom.events.MutationNameEvent
class org.w3c.dom.events.TextEvent
class org.w3c.dom.events.UIEvent
-class org.w3c.dom.ElementTraversal
+class org.apache.batik.w3c.dom.ElementTraversal
Modified: xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java?rev=1830543&r1=1830542&r2=1830543&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java (original)
+++ xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java Mon Apr 30 10:17:31 2018
@@ -26,7 +26,7 @@ import org.apache.batik.test.AbstractTes
import org.apache.batik.util.XMLResourceDescriptor;
import org.w3c.dom.Document;
-import org.w3c.dom.ElementTraversal;
+import org.apache.batik.w3c.dom.ElementTraversal;
/**
* Tests the {@link ElementTraversal} interface.