Menu
▾
▴
[HtmlUnit] SVN: [8882] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-12-20 16:01:30
|
Revision: 8882
http://sourceforge.net/p/htmlunit/code/8882
Author: rbri
Date: 2013-12-20 16:01:24 +0000 (Fri, 20 Dec 2013)
Log Message:
-----------
refactor the determination of the default display style (we do not need any string compares any longer);
minor performance imporvements;
one more test to be sure we have testcases for all supported tags;
nextId tag support for IE added
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAbbreviated.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAcronym.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAudio.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBidirectionalOverride.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBig.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBlink.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBold.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBreak.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlButton.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCanvas.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCaption.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCitation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCode.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDataList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDefinition.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDeletedText.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmbed.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmphasis.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlExample.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFont.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineQuotation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInsertedText.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlItalic.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlKeyboard.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLabel.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLegend.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListItem.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListing.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMap.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMark.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMeter.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMultiColumn.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoBreak.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoScript.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOption.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlOptionGroup.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlParameter.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPlainText.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlProgress.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRp.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRt.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlRuby.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlS.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSample.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlScript.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSelect.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSmall.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSource.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSpan.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlStrike.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlStrong.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSubscript.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlSuperscript.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableBody.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableCell.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableColumn.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableColumnGroup.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableFooter.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableHeader.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTableRow.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTeletype.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlTextArea.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnderlined.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlUnknownElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlVariable.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlVideo.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlWordBreak.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Element.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAreaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBRElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCanvasElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDataListElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLEmbedElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFontElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInlineQuotationElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLIElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLegendElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMapElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLModElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLNoShowElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLObjectElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptGroupElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParagraphElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLParamElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLPhraseElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLProgressElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSourceElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCaptionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableCellElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableColElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableRowElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTableSectionElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLVideoElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLWBRElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/AttributesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLElementsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
Added Paths:
-----------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNextId.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLNextIdElement.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-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DefaultElementFactory.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -80,7 +80,7 @@
HtmlLegend.TAG_NAME, HtmlListing.TAG_NAME, HtmlListItem.TAG_NAME,
HtmlLink.TAG_NAME, HtmlMap.TAG_NAME, HtmlMark.TAG_NAME, HtmlMarquee.TAG_NAME,
HtmlMenu.TAG_NAME, HtmlMeta.TAG_NAME, HtmlMeter.TAG_NAME, HtmlMultiColumn.TAG_NAME,
- HtmlNav.TAG_NAME,
+ HtmlNav.TAG_NAME, HtmlNextId.TAG_NAME,
HtmlNoBreak.TAG_NAME, HtmlNoEmbed.TAG_NAME, HtmlNoFrames.TAG_NAME,
HtmlNoScript.TAG_NAME, HtmlObject.TAG_NAME, HtmlOrderedList.TAG_NAME,
HtmlOptionGroup.TAG_NAME, HtmlOption.TAG_NAME, HtmlParagraph.TAG_NAME,
@@ -442,6 +442,9 @@
return UnknownElementFactory.instance.createElementNS(page, namespaceURI, qualifiedName, attributes);
}
}
+ else if (tagName.equals(HtmlNextId.TAG_NAME)) {
+ element = new HtmlNextId(namespaceURI, qualifiedName, page, attributeMap);
+ }
else if (tagName.equals(HtmlNoBreak.TAG_NAME)) {
element = new HtmlNoBreak(namespaceURI, qualifiedName, page, attributeMap);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAbbreviated.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAbbreviated.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAbbreviated.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlAbbreviated extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAcronym.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAcronym.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAcronym.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlAcronym extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAnchor.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -317,4 +317,16 @@
protected boolean isEmptyXmlTagExpanded() {
return true;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlArea.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -14,6 +14,8 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
+
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
@@ -266,4 +268,19 @@
return false;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ if (hasFeature(CSS_DISPLAY_DEFAULT)) {
+ return DisplayStyle.NONE;
+ }
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAudio.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAudio.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlAudio.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -41,4 +41,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.NONE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBidirectionalOverride.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBidirectionalOverride.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBidirectionalOverride.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlBidirectionalOverride extends HtmlElement {
@@ -45,4 +46,15 @@
super(namespaceURI, qualifiedName, page, attributes);
}
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBig.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBig.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBig.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlBig extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBlink.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBlink.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBlink.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlBlink extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBold.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBold.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBold.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlBold extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBreak.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBreak.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlBreak.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlBreak extends HtmlElement {
@@ -55,4 +56,16 @@
public final String getClearAttribute() {
return getAttribute("clear");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlButton.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlButton.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlButton.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -304,4 +304,16 @@
public Collection<String> getPreviousNames() {
return previousNames_;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE_BLOCK;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCanvas.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCanvas.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCanvas.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlCanvas extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCaption.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCaption.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCaption.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -55,4 +55,16 @@
public final String getAlignAttribute() {
return getAttribute("align");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.TABLE_CAPTION;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCitation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCitation.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCitation.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlCitation extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCode.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlCode.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlCode extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDataList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDataList.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDataList.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -41,4 +41,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.NONE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDefinition.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDefinition.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDefinition.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlDefinition extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDeletedText.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDeletedText.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlDeletedText.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlDeletedText extends HtmlElement {
@@ -66,4 +67,16 @@
public final String getDateTimeAttribute() {
return getAttribute("datetime");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -80,6 +80,57 @@
*/
public abstract class HtmlElement extends DomElement {
+ /**
+ * Enum for the different display styles.
+ */
+ public enum DisplayStyle {
+ /** none. */
+ NONE("none"),
+ /** block. */
+ BLOCK("block"),
+ /** inline. */
+ INLINE("inline"),
+ /** inline-block. */
+ INLINE_BLOCK("inline-block"),
+ /** list-item. */
+ LIST_ITEM("list-item"),
+ /** table. */
+ TABLE("table"),
+ /** table-cell. */
+ TABLE_CELL("table-cell"),
+ /** table-column. */
+ TABLE_COLUMN("table-column"),
+ /** table-column-group. */
+ TABLE_COLUMN_GROUP("table-column-group"),
+ /** table-row. */
+ TABLE_ROW("table-row"),
+ /** table-row-group. */
+ TABLE_ROW_GROUP("table-row-group"),
+ /** table-header-group. */
+ TABLE_HEADER_GROUP("table-header-group"),
+ /** table-footer-group. */
+ TABLE_FOOTER_GROUP("table-footer-group"),
+ /** table-caption. */
+ TABLE_CAPTION("table-caption"),
+ /** ruby. */
+ RUBY("ruby"),
+ /** ruby-text. */
+ RUBY_TEXT("ruby-text");
+
+ private final String value_;
+ DisplayStyle(final String value) {
+ value_ = value;
+ }
+
+ /**
+ * The string used from js.
+ * @return the value as string
+ */
+ public String value() {
+ return value_;
+ }
+ }
+
private static final Log LOG = LogFactory.getLog(HtmlElement.class);
/**
@@ -1519,4 +1570,15 @@
public DomNode querySelector(final String selectors) {
return super.querySelector(selectors);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.BLOCK;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmbed.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmbed.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmbed.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -32,6 +32,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlEmbed extends HtmlElement {
@@ -68,4 +69,16 @@
IOUtils.copy(webResponse.getContentAsStream(), fos);
fos.close();
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmphasis.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmphasis.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlEmphasis.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlEmphasis extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlExample.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlExample.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlExample.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlExample extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFont.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFont.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlFont.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -86,4 +86,16 @@
protected boolean isTrimmedText() {
return false;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlImage.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -512,4 +512,16 @@
}
}
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -27,6 +27,7 @@
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Marc Guillemot
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlInlineFrame extends BaseFrameElement {
@@ -55,4 +56,16 @@
protected boolean isEmptyXmlTagExpanded() {
return true;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineQuotation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineQuotation.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInlineQuotation.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlInlineQuotation extends HtmlElement {
@@ -56,4 +57,16 @@
public final String getCiteAttribute() {
return getAttribute("cite");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInput.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.HTMLINPUT_SET_DEFAULT_VALUE_UPDATES_VALUE;
import java.io.IOException;
@@ -589,4 +590,19 @@
Object getInternalValue() {
return getValueAttribute();
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ if (hasFeature(CSS_DISPLAY_DEFAULT)) {
+ return DisplayStyle.INLINE;
+ }
+ return DisplayStyle.INLINE_BLOCK;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInsertedText.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInsertedText.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlInsertedText.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlInsertedText extends HtmlElement {
@@ -68,4 +69,16 @@
public final String getDateTimeAttribute() {
return getAttribute("datetime");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlItalic.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlItalic.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlItalic.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlItalic extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlKeyboard.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlKeyboard.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlKeyboard.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlKeyboard extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLabel.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLabel.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLabel.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -30,6 +30,7 @@
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Marc Guillemot
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlLabel extends HtmlElement {
@@ -166,4 +167,16 @@
return response;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLegend.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLegend.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlLegend.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -14,6 +14,8 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
+
import java.util.Map;
import com.gargoylesoftware.htmlunit.SgmlPage;
@@ -26,6 +28,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlLegend extends HtmlElement {
@@ -68,4 +71,19 @@
public final String getAlignAttribute() {
return getAttribute("align");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ if (hasFeature(CSS_DISPLAY_DEFAULT)) {
+ return DisplayStyle.BLOCK;
+ }
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListItem.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListItem.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListItem.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -68,4 +68,16 @@
public final String getValueAttribute() {
return getAttribute("value");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.LIST_ITEM;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListing.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListing.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlListing.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlListing extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMap.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMap.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMap.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -26,6 +26,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlMap extends HtmlElement {
@@ -56,4 +57,16 @@
public final String getNameAttribute() {
return getAttribute("name");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMark.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMark.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMark.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -41,4 +41,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMeter.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMeter.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMeter.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -14,6 +14,8 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
+
import java.util.Map;
import com.gargoylesoftware.htmlunit.SgmlPage;
@@ -24,6 +26,7 @@
* @see <a href="https://developer.mozilla.org/en-US/docs/HTML/Element/meter">MDN documentation</a>
* @version $Revision$
* @author Marc Guillemot
+ * @author Ronald Brill
*/
public class HtmlMeter extends HtmlMedia {
@@ -42,4 +45,19 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ if (hasFeature(CSS_DISPLAY_DEFAULT)) {
+ return DisplayStyle.INLINE_BLOCK;
+ }
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMultiColumn.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMultiColumn.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlMultiColumn.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlMultiColumn extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Added: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNextId.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNextId.java (rev 0)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNextId.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -0,0 +1,44 @@
+/*
+ * 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 "nextId".
+ *
+ * @version $Revision$
+ * @author Ronald Brill
+ */
+public class HtmlNextId extends HtmlElement {
+
+ /** The HTML tag represented by this element. */
+ public static final String TAG_NAME = "nextid";
+
+ /**
+ * 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
+ */
+ HtmlNextId(final String namespaceURI, final String qualifiedName, final SgmlPage page,
+ final Map<String, DomAttr> attributes) {
+ super(namespaceURI, qualifiedName, page, attributes);
+ }
+}
Property changes on: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNextId.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoBreak.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoBreak.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoBreak.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -23,6 +23,7 @@
*
* @version $Revision$
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlNoBreak extends HtmlElement {
@@ -41,4 +42,16 @@
final Map<String, DomAttr> attributes) {
super(namespaceURI, qualifiedName, page, attributes);
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoScript.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoScript.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlNoScript.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.html;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.CSS_DISPLAY_DEFAULT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.NOSCRIPT_BODY_AS_TEXT;
import java.util.Map;
@@ -31,6 +32,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlNoScript extends HtmlElement {
@@ -59,4 +61,22 @@
}
return null;
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ if (!getPage().getWebClient().getOptions().isJavaScriptEnabled()) {
+ return DisplayStyle.BLOCK;
+ }
+ if (hasFeature(CSS_DISPLAY_DEFAULT)) {
+ return DisplayStyle.NONE;
+ }
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java 2013-12-20 15:54:23 UTC (rev 8881)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlObject.java 2013-12-20 16:01:24 UTC (rev 8882)
@@ -27,6 +27,7 @@
* @author David K. Taylor
* @author <a href="mailto:cs...@dy...">Christian Sell</a>
* @author Ahmed Ashour
+ * @author Ronald Brill
*/
public class HtmlObject extends HtmlElement {
@@ -255,4 +256,16 @@
public final String getVspaceAttribute() {
return getAttribute("vspace");
}
+
+ /**
+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+ *
+ * Returns the default display style.
+ *
+ * @return the default display style.
+ */
+ @Override
+ public DisplayStyle getDefaultStyleDisplay() {
+ return DisplayStyle.INLINE;
+ }
}
Modified: trunk/htmlunit/src/main/java/com/gargoyle...
[truncated message content] |
