Menu
▾
▴
[HtmlUnit] SVN: [8872] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-12-18 21:44:01
|
Revision: 8872
http://sourceforge.net/p/htmlunit/code/8872
Author: rbri
Date: 2013-12-18 21:43:54 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
and again fixes for our javascript objects
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLSerializer.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/AttributesTest.java
Removed Paths:
-------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSpacer.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpacerElement.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -89,7 +89,7 @@
HtmlRp.TAG_NAME, HtmlRt.TAG_NAME, HtmlRuby.TAG_NAME,
HtmlS.TAG_NAME, HtmlSample.TAG_NAME,
HtmlScript.TAG_NAME, HtmlSection.TAG_NAME, HtmlSelect.TAG_NAME, HtmlSmall.TAG_NAME,
- HtmlSource.TAG_NAME, HtmlSpacer.TAG_NAME, HtmlSpan.TAG_NAME,
+ HtmlSource.TAG_NAME, HtmlSpan.TAG_NAME,
HtmlStrike.TAG_NAME, HtmlStrong.TAG_NAME, HtmlStyle.TAG_NAME,
HtmlSubscript.TAG_NAME, HtmlSuperscript.TAG_NAME,
HtmlTable.TAG_NAME, HtmlTableColumn.TAG_NAME, HtmlTableColumnGroup.TAG_NAME,
@@ -536,9 +536,6 @@
return UnknownElementFactory.instance.createElementNS(page, namespaceURI, qualifiedName, attributes);
}
}
- else if (tagName.equals(HtmlSpacer.TAG_NAME)) {
- element = new HtmlSpacer(namespaceURI, qualifiedName, page, attributeMap);
- }
else if (tagName.equals(HtmlSpan.TAG_NAME)) {
element = new HtmlSpan(namespaceURI, qualifiedName, page, attributeMap);
}
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSpacer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSpacer.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSpacer.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2002-2013 Gargoyle Software Inc.
- *
- * Licensed 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 com.gargoylesoftware.htmlunit.html;
-
-import java.util.Map;
-
-import com.gargoylesoftware.htmlunit.SgmlPage;
-
-/**
- * Wrapper for the HTML element "spacer".
- *
- * @version $Revision$
- * @author Ahmed Ashour
- */
-public class HtmlSpacer extends HtmlElement {
-
- /** The HTML tag represented by this element. */
- public static final String TAG_NAME = "spacer";
-
- /**
- * Creates a new instance.
- *
- * @param namespaceURI the URI that identifies an XML namespace
- * @param qualifiedName the qualified name of the element type to instantiate
- * @param page the page that contains this element
- * @param attributes the initial attributes
- */
- HtmlSpacer(final String namespaceURI, final String qualifiedName, final SgmlPage page,
- final Map<String, DomAttr> attributes) {
- super(namespaceURI, qualifiedName, page, attributes);
- }
-}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -177,7 +177,6 @@
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLScriptElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSelectElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSourceElement;
-import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSpacerElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSpanElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLStyleElement;
import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLTableCaptionElement;
@@ -315,7 +314,7 @@
HTMLOptionElement.class, HTMLOptionsCollection.class, HTMLParagraphElement.class, HTMLParamElement.class,
HTMLPhraseElement.class,
HTMLPreElement.class, HTMLProgressElement.class, HTMLScriptElement.class,
- HTMLSelectElement.class, HTMLSourceElement.class, HTMLSpacerElement.class, HTMLSpanElement.class,
+ HTMLSelectElement.class, HTMLSourceElement.class, HTMLSpanElement.class,
HTMLStyleElement.class, HTMLTableCaptionElement.class, HTMLTableCellElement.class, HTMLTableColElement.class,
HTMLTableComponent.class, HTMLTableElement.class, HTMLTableRowElement.class, HTMLTableSectionElement.class,
HTMLTextElement.class, HTMLTextAreaElement.class, HTMLTitleElement.class,
Deleted: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpacerElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpacerElement.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpacerElement.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002-2013 Gargoyle Software Inc.
- *
- * Licensed 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 com.gargoylesoftware.htmlunit.javascript.host.html;
-
-import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF;
-
-import com.gargoylesoftware.htmlunit.html.HtmlSpacer;
-import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.configuration.WebBrowser;
-
-/**
- * The JavaScript object "HTMLSpacerElement".
- *
- * @version $Revision$
- * @author Ahmed Ashour
- * @author Ronald Brill
- */
-@JsxClass(domClass = HtmlSpacer.class, browsers = { @WebBrowser(FF), @WebBrowser(CHROME) })
-public class HTMLSpacerElement extends HTMLElement {
-
- /**
- * {@inheritDoc}
- */
- protected boolean isLowerCaseInOuterHtml() {
- return true;
- }
-}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLSerializer.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLSerializer.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLSerializer.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -85,7 +85,7 @@
HtmlPlainText.TAG_NAME, HtmlPreformattedText.TAG_NAME,
HtmlInlineQuotation.TAG_NAME, HtmlS.TAG_NAME, HtmlSample.TAG_NAME,
HtmlScript.TAG_NAME, HtmlSelect.TAG_NAME, HtmlSmall.TAG_NAME,
- HtmlSource.TAG_NAME, HtmlSpacer.TAG_NAME, HtmlSpan.TAG_NAME,
+ HtmlSource.TAG_NAME, HtmlSpan.TAG_NAME,
HtmlStrike.TAG_NAME, HtmlStrong.TAG_NAME, HtmlStyle.TAG_NAME,
HtmlSubscript.TAG_NAME, HtmlSuperscript.TAG_NAME, HtmlTitle.TAG_NAME,
HtmlTable.TAG_NAME, HtmlTableColumn.TAG_NAME, HtmlTableColumnGroup.TAG_NAME,
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/AttributesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/AttributesTest.java 2013-12-18 19:59:25 UTC (rev 8871)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/AttributesTest.java 2013-12-18 21:43:54 UTC (rev 8872)
@@ -101,7 +101,7 @@
"HtmlPlainText",
"HtmlPreformattedText", "HtmlRadioButtonInput", "HtmlResetInput",
"HtmlS", "HtmlSample", "HtmlScript", "HtmlSelect", "HtmlSmall",
- "HtmlSpacer", "HtmlSpan", "HtmlSource", "HtmlStrike",
+ "HtmlSpan", "HtmlSource", "HtmlStrike",
"HtmlStrong", "HtmlStyle", "HtmlSubmitInput",
"HtmlSubscript", "HtmlSuperscript",
"HtmlTable", "HtmlTableBody", /*"HtmlTableCell",*/ "HtmlTableColumn",
|
