You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/02/24 19:35:31 UTC
[2/3] incubator-juneau git commit: doc link fixes
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ins.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ins.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ins.java
index 0939c50..c36c641 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ins.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ins.java
@@ -60,6 +60,12 @@ public class Ins extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Ins style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Ins children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Kbd.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Kbd.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Kbd.java
index 6049912..a9e780f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Kbd.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Kbd.java
@@ -37,6 +37,12 @@ public class Kbd extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Kbd style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Kbd children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index 17bb0c4..4f69a64 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Keygen.java
@@ -105,4 +105,10 @@ public class Keygen extends HtmlElementVoid {
super.id(id);
return this;
}
+
+ @Override /* HtmlElement */
+ public final Keygen style(String style) {
+ super.style(style);
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Label.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Label.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Label.java
index d64564a..bf50d9c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Label.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Label.java
@@ -60,6 +60,12 @@ public class Label extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Label style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Label children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Legend.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Legend.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Legend.java
index 35e20c5..12a3989 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Legend.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Legend.java
@@ -37,6 +37,12 @@ public class Legend extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Legend style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Legend children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Li.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Li.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Li.java
index e53975c..2f2c732 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Li.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Li.java
@@ -37,6 +37,12 @@ public class Li extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Li style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Li children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
index 6826288..51e37d1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Link.java
@@ -117,4 +117,10 @@ public class Link extends HtmlElementVoid {
super.id(id);
return this;
}
+
+ @Override /* HtmlElement */
+ public final Link style(String style) {
+ super.style(style);
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Main.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Main.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Main.java
index 1433c0c..8e32a4f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Main.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Main.java
@@ -37,6 +37,12 @@ public class Main extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Main style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Main children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Map.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Map.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Map.java
index 19d1d85..383d50a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Map.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Map.java
@@ -49,6 +49,12 @@ public class Map extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Map style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Map children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Mark.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Mark.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Mark.java
index 07edcf9..528194d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Mark.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Mark.java
@@ -37,6 +37,12 @@ public class Mark extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Mark style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Mark children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
index f6009cb..27cc447 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Meter.java
@@ -110,6 +110,12 @@ public class Meter extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Meter style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Meter children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Nav.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Nav.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Nav.java
index 246dc97..4f15d99 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Nav.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Nav.java
@@ -37,6 +37,12 @@ public class Nav extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Nav style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Nav children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Noscript.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Noscript.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Noscript.java
index bd1e424..ed2971e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Noscript.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Noscript.java
@@ -38,6 +38,12 @@ public class Noscript extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Noscript style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Noscript children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
index 0fcf493..28ff4d1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Object2.java
@@ -129,6 +129,12 @@ public class Object2 extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Object2 style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Object2 children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
index 3a16500..7339383 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ol.java
@@ -73,6 +73,12 @@ public class Ol extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Ol style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Ol children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
index 61ec10f..6238c46 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
@@ -61,6 +61,12 @@ public class Optgroup extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Optgroup style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Optgroup children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
index 4e9f5a6..ca84eb9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Option.java
@@ -85,6 +85,12 @@ public class Option extends HtmlElementText {
return this;
}
+ @Override /* HtmlElement */
+ public final Option style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementText */
public Option text(Object text) {
super.text(text);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Output.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Output.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Output.java
index a6d9379..d80df55 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Output.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Output.java
@@ -71,6 +71,12 @@ public class Output extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Output style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Output children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/P.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/P.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/P.java
index 6d2e8b4..7c68588 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/P.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/P.java
@@ -37,6 +37,12 @@ public class P extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final P style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public P children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Pre.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Pre.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Pre.java
index 4f97bd6..63382fb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Pre.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Pre.java
@@ -49,6 +49,12 @@ public class Pre extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Pre style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Pre children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
index 1e27351..059bef7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Progress.java
@@ -62,6 +62,12 @@ public class Progress extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Progress style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Progress children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Q.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Q.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Q.java
index e60a900..85debcc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Q.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Q.java
@@ -49,6 +49,12 @@ public class Q extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Q style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Q children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rb.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rb.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rb.java
index ebbf6a8..9d6f2e5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rb.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rb.java
@@ -37,6 +37,12 @@ public class Rb extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Rb style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Rb children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rp.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rp.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rp.java
index 5b34c82..48f0d64 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rp.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rp.java
@@ -37,6 +37,12 @@ public class Rp extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Rp style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Rp children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rt.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rt.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rt.java
index 4b0e795..a91367b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rt.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rt.java
@@ -37,6 +37,12 @@ public class Rt extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Rt style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Rt children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rtc.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rtc.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rtc.java
index d886ce4..ec0717a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rtc.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Rtc.java
@@ -37,6 +37,12 @@ public class Rtc extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Rtc style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Rtc children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ruby.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ruby.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ruby.java
index bd9f52a..c172671 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ruby.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ruby.java
@@ -37,6 +37,12 @@ public class Ruby extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Ruby style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Ruby children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/S.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/S.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/S.java
index 1a65040..e3ac8ae 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/S.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/S.java
@@ -37,6 +37,12 @@ public class S extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final S style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public S children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Samp.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Samp.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Samp.java
index 38cea1a..f0c2740 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Samp.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Samp.java
@@ -37,6 +37,12 @@ public class Samp extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Samp style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Samp children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
index 8e5d4c9..06f2fb4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Script.java
@@ -15,14 +15,13 @@ package org.apache.juneau.dto.html5;
import java.net.*;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.xml.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-script-element"><script></a> element.
* <p>
*/
@Bean(typeName="script")
-public class Script extends HtmlElementText {
+public class Script extends HtmlElementRawText {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-async">async</a> attribute.
@@ -98,13 +97,6 @@ public class Script extends HtmlElementText {
// Overridden methods
//--------------------------------------------------------------------------------
- @Xml(format=XmlFormat.TEXT_PWS)
- @BeanProperty(name="c")
- @Override
- public Object getText() {
- return super.getText();
- }
-
@Override /* HtmlElement */
public final Script _class(String _class) {
super._class(_class);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Section.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Section.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Section.java
index d788072..4731a63 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Section.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Section.java
@@ -37,6 +37,12 @@ public class Section extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Section style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Section children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
index 43fd4d6..1279781 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Select.java
@@ -120,6 +120,12 @@ public class Select extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Select style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Select children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Small.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Small.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Small.java
index 459284a..d2f63c2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Small.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Small.java
@@ -37,6 +37,12 @@ public class Small extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Small style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Small children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Strong.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Strong.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Strong.java
index 4a9bcab..d74587e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Strong.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Strong.java
@@ -37,6 +37,12 @@ public class Strong extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Strong style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Strong children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Style.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Style.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Style.java
index 5c8516a..46a6eb4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Style.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Style.java
@@ -13,14 +13,13 @@
package org.apache.juneau.dto.html5;
import org.apache.juneau.annotation.*;
-import org.apache.juneau.xml.annotation.*;
/**
* DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-style-element"><style></a> element.
* <p>
*/
@Bean(typeName="style")
-public class Style extends HtmlElementText {
+public class Style extends HtmlElementRawText {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-style-media">media</a> attribute.
@@ -49,13 +48,6 @@ public class Style extends HtmlElementText {
// Overridden methods
//--------------------------------------------------------------------------------
- @Xml(format=XmlFormat.TEXT_PWS)
- @BeanProperty(name="c")
- @Override /* HtmlElementText */
- public Object getText() {
- return super.getText();
- }
-
@Override /* HtmlElement */
public final Style _class(String _class) {
super._class(_class);
@@ -63,6 +55,12 @@ public class Style extends HtmlElementText {
}
@Override /* HtmlElement */
+ public final Style style(String style) {
+ super.style(style);
+ return this;
+ }
+
+ @Override /* HtmlElement */
public final Style id(String id) {
super.id(id);
return this;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sub.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sub.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sub.java
index a3286e0..1780d34 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sub.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sub.java
@@ -37,6 +37,12 @@ public class Sub extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Sub style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Sub children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sup.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sup.java
index 074f4df..b4125f8 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Sup.java
@@ -37,6 +37,12 @@ public class Sup extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Sup style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Sup children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
index 136a3cc..b4a61f0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Table.java
@@ -50,6 +50,12 @@ public class Table extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Table style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Table children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tbody.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tbody.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tbody.java
index 15494f4..3606a65 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tbody.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tbody.java
@@ -37,6 +37,12 @@ public class Tbody extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Tbody style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Tbody children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
index 3b88acb..15acc90 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Td.java
@@ -73,6 +73,12 @@ public class Td extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Td style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Td children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Template.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Template.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Template.java
index 2508424..f6607ea 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Template.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Template.java
@@ -37,6 +37,12 @@ public class Template extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Template style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Template children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index 498d0d6..f92ed65 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Textarea.java
@@ -19,7 +19,7 @@ import org.apache.juneau.annotation.*;
* <p>
*/
@Bean(typeName="textarea")
-public class Textarea extends HtmlElementText {
+public class Textarea extends HtmlElementRawText {
/**
* <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autocomplete">autocomplete</a> attribute.
@@ -211,6 +211,12 @@ public class Textarea extends HtmlElementText {
return this;
}
+ @Override /* HtmlElement */
+ public final Textarea style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementText */
public Textarea text(Object text) {
super.text(text);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tfoot.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
index 0e94895..d02da16 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
@@ -37,6 +37,12 @@ public class Tfoot extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Tfoot style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Tfoot children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
index 26fb2c5..8b268e3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Th.java
@@ -106,6 +106,12 @@ public class Th extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Th style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Th children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Thead.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Thead.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Thead.java
index 9c9de54..499259c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Thead.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Thead.java
@@ -37,6 +37,12 @@ public class Thead extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Thead style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Thead children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Time.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Time.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Time.java
index ce67952..8b50675 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Time.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Time.java
@@ -49,6 +49,12 @@ public class Time extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Time style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Time children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Title.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Title.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Title.java
index fc5a9ba..1e16c29 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Title.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Title.java
@@ -19,7 +19,7 @@ import org.apache.juneau.annotation.*;
* <p>
*/
@Bean(typeName="title")
-public class Title extends HtmlElementText {
+public class Title extends HtmlElementRawText {
//--------------------------------------------------------------------------------
// Overridden methods
@@ -37,6 +37,12 @@ public class Title extends HtmlElementText {
return this;
}
+ @Override /* HtmlElement */
+ public final Title style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementText */
public Title text(Object text) {
super.text(text);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tr.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tr.java
index 1183a56..f937ee6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Tr.java
@@ -37,6 +37,12 @@ public class Tr extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Tr style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Tr children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/U.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/U.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/U.java
index 97696a6..5fab832 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/U.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/U.java
@@ -37,6 +37,12 @@ public class U extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final U style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public U children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ul.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ul.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ul.java
index 47743ed..c5c5945 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ul.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Ul.java
@@ -37,6 +37,12 @@ public class Ul extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Ul style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Ul children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Var.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Var.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Var.java
index 58955b5..5e30166 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Var.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Var.java
@@ -37,6 +37,12 @@ public class Var extends HtmlElementMixed {
return this;
}
+ @Override /* HtmlElement */
+ public final Var style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementMixed */
public Var children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
index 0ff65bf..0cd7b27 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Video.java
@@ -168,6 +168,12 @@ public class Video extends HtmlElementContainer {
return this;
}
+ @Override /* HtmlElement */
+ public final Video style(String style) {
+ super.style(style);
+ return this;
+ }
+
@Override /* HtmlElementContainer */
public final Video children(Object...children) {
super.children(children);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/html5/Wbr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Wbr.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Wbr.java
index a8ed623..f31f8c1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Wbr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Wbr.java
@@ -36,4 +36,10 @@ public class Wbr extends HtmlElementVoid {
super.id(id);
return this;
}
+
+ @Override /* HtmlElement */
+ public final Wbr style(String style) {
+ super.style(style);
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 3beae9e..9fcf5d0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -26,7 +26,7 @@ package org.apache.juneau.dto.jsonschema;
* </p>
*
* <p>
- * Refer to {@link org.apache.juneau.dto.jsonschema} for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public enum JsonType {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
index 56d1ff8..617af92 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
@@ -17,7 +17,7 @@ import java.util.*;
/**
* Represents a list of {@link JsonType} objects.
* <p>
- * Refer to {@link org.apache.juneau.dto.jsonschema} for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public final class JsonTypeArray extends LinkedList<JsonType> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
index f3a8eee..638ae24 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
@@ -24,7 +24,7 @@ import org.apache.juneau.transform.*;
/**
* Represents a top-level schema object bean in the JSON-Schema core specification.
* <p>
- * Refer to {@link org.apache.juneau.dto.jsonschema} for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
@SuppressWarnings("hiding")
@Bean(typeName="schema",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
index 3a20702..2a06e10 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
@@ -17,7 +17,7 @@ import java.util.*;
/**
* Represents a list of {@link Schema} objects.
* <p>
- * Refer to {@link org.apache.juneau.dto.jsonschema} for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public class SchemaArray extends LinkedList<Schema> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
index 5582877..365d09f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.jsonschema;
/**
* Represents a JSON property in the JSON-Schema core specification.
* <p>
- * Refer to {@link org.apache.juneau.dto.jsonschema} for usage information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.jsonschema</a> for usage information.
*/
public class SchemaProperty extends Schema {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Contact.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Contact.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Contact.java
index a171166..c8404f3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Contact.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Contact.java
@@ -25,6 +25,8 @@ import org.apache.juneau.annotation.*;
* <js>"email"</js>: <js>"support@swagger.io"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="name,url,email")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
index 7b9a1e5..2fed776 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
@@ -24,6 +24,8 @@ import org.apache.juneau.annotation.*;
* <js>"url"</js>: <js>"https://swagger.io"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="description,url")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index b2d3c44..8b36f83 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -28,6 +28,8 @@ import org.apache.juneau.json.*;
* <js>"type"</js>: <js>"integer"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="description,type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf")
@SuppressWarnings({"hiding", "unchecked"})
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Info.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Info.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Info.java
index 1a99ba0..08e41d5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Info.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Info.java
@@ -35,6 +35,8 @@ import org.apache.juneau.annotation.*;
* <js>"version"</js>: <js>"1.0.1"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="title,description,termsOfService,contact,license,version")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 3d23dac..a3d9633 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -28,6 +28,8 @@ import org.apache.juneau.json.*;
* <js>"minLength"</js>: 2
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf")
@SuppressWarnings({ "hiding", "unchecked" })
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/License.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/License.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/License.java
index bfe7c8b..c09414b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/License.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/License.java
@@ -24,6 +24,8 @@ import org.apache.juneau.annotation.*;
* <js>"url"</js>: <js>"http://www.apache.org/licenses/LICENSE-2.0.html"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="name,url")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 9c08cb8..0c1472e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -77,6 +77,8 @@ import org.apache.juneau.annotation.*;
* ]
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="operationId,summary,description,tags,externalDocs,consumes,produces,parameters,responses,schemes,deprecated,security")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 3e5c5f7..5b90235 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -49,6 +49,8 @@ import org.apache.juneau.json.*;
* </ul>
* </li>
* </ul>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="in,name,type,description,required,schema,format,allowEmptyValue,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
index d716915..d2ab656 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -31,6 +31,8 @@ import org.apache.juneau.annotation.*;
* }
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="description,schema,headers,examples")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 74b7741..0aec92f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -25,6 +25,8 @@ import org.apache.juneau.annotation.*;
* <p>
* Further information about the properties can be found in JSON Schema Core and JSON Schema Validation.
* Unless stated otherwise, the property definitions follow the JSON Schema specification as referenced here.
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="format,title,description,default,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,maxProperties,minProperties,required,enum,type,items,allOf,properties,additionalProperties,discriminator,readOnly,xml,externalDocs,example")
@SuppressWarnings({ "hiding", "unchecked" })
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index 97d449a..ec050c3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -48,6 +48,8 @@ import org.apache.juneau.json.*;
* }
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="type,description,name,in,flow,authorizationUrl,tokenUrl,scopes")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index 1065a0a..6463b3a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -19,6 +19,8 @@ import org.apache.juneau.annotation.*;
/**
* This is the root document object for the API specification.
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
index b45f740..1ff92ba 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.swagger;
/**
* Various useful static methods for creating Swagger elements.
* <p>
- * See {@link org.apache.juneau.dto.swagger} for documentation.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
public class SwaggerBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
index 5b610cf..9b33ffa 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
@@ -14,6 +14,8 @@ package org.apache.juneau.dto.swagger;
/**
* Root class for all Swagger beans.
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
public class SwaggerElement {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Tag.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Tag.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Tag.java
index 17b0092..be2cfdc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Tag.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Tag.java
@@ -26,6 +26,8 @@ import org.apache.juneau.annotation.*;
* <js>"description"</js>: <js>"Pets operations"</js>
* }
* </p>
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="name,description,externalDocs")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Xml.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Xml.java b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Xml.java
index 0c2df4f..a9d0b11 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Xml.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/swagger/Xml.java
@@ -18,6 +18,8 @@ import org.apache.juneau.annotation.*;
* A metadata object that allows for more fine-tuned XML model definitions.
* <p>
* When using arrays, XML element names are not inferred (for singular/plural forms) and the name property should be used to add that information.
+ * <p>
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> for usage information.
*/
@Bean(properties="name,namespace,prefix,attribute,wrapped")
@SuppressWarnings("hiding")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
index 70006c6..b55a2ab 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
@@ -32,7 +32,7 @@ import org.apache.juneau.svl.*;
/**
* Implements the API for accessing the contents of a config file.
* <p>
- * Refer to {@link org.apache.juneau.ini} for more information.
+ * Refer to <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.ini</a> for usage information.
*/
public abstract class ConfigFile implements Map<String,Section> {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
index e215aa4..8982b81 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
@@ -705,7 +705,7 @@ public final class ConfigFileImpl extends ConfigFile {
@Override /* ConfigFile */
public ConfigFile getResolving() {
- return getResolving(VarResolver.DEFAULT.clone().addVars(ConfigFileVar.class).setContextObject(ConfigFileVar.SESSION_config, this));
+ return getResolving(VarResolver.DEFAULT.clone().addVars(ConfigFileVar.class,IfVar.class,SwitchVar.class).setContextObject(ConfigFileVar.SESSION_config, this));
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/json/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/package.html b/juneau-core/src/main/java/org/apache/juneau/json/package.html
index bb0d4c3..50443bb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/json/package.html
@@ -212,7 +212,7 @@
<li>On bean properties through the <code><ja>@BeanProperty</ja></code> annotations.
</ul>
<p>
- For more information about transforms, refer to {@link org.apache.juneau.transform}.
+ For more information about transforms, refer to <a class='doclink' href='../transform/package-summary.html#TOC'>org.apache.juneau.transform</a>.
</p>
</div>
</div>
@@ -1030,7 +1030,7 @@
</p>
<p>
This document won't go into all the details of the Juneau <code>RestServlet</code> class.<br>
- Refer to the {@link org.apache.juneau.rest} documentation for more information on the REST servlet class in general.
+ Refer to the <a class='doclink' href='../rest/package-summary.html#TOC'>org.apache.juneau.rest</a> documentation for more information on the REST servlet class in general.
</p>
<p>
The rest of the code in the resource class consists of REST methods that simply accept and return POJOs.<br>
@@ -1109,7 +1109,7 @@
The {@link org.apache.juneau.rest.annotation.RestMethod#serializersInherit()} and
{@link org.apache.juneau.rest.annotation.RestMethod#parsersInherit()} control how various artifacts
are inherited from the parent class.<br>
- Refer to {@link org.apache.juneau.rest} for additional information on using these annotations.
+ Refer to <a class='doclink' href='../rest/package-summary.html#TOC'>org.apache.juneau.rest</a> for additional information on using these annotations.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/DefaultingVar.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/DefaultingVar.java b/juneau-core/src/main/java/org/apache/juneau/svl/DefaultingVar.java
index e8ae1f4..914c8c0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/DefaultingVar.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/DefaultingVar.java
@@ -39,7 +39,7 @@ public abstract class DefaultingVar extends SimpleVar {
public String doResolve(VarResolverSession session, String s) {
int i = s.indexOf(',');
if (i == -1)
- return resolve(session, s);
+ return resolve(session, s.trim());
String[] s2 = StringUtils.split(s, ',');
String v = resolve(session, s2[0]);
if (v == null)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/MapVar.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/MapVar.java b/juneau-core/src/main/java/org/apache/juneau/svl/MapVar.java
index 01783f9..c9561e6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/MapVar.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/MapVar.java
@@ -12,6 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.svl;
+import static org.apache.juneau.internal.ThrowableUtils.*;
import java.util.*;
/**
@@ -33,7 +34,7 @@ public abstract class MapVar extends DefaultingVar {
public MapVar(String name, Map m) {
super(name);
if (m == null)
- throw new IllegalArgumentException("''m'' parameter cannot be null.");
+ illegalArg("''m'' parameter cannot be null.");
this.m = m;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/MultipartVar.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/MultipartVar.java b/juneau-core/src/main/java/org/apache/juneau/svl/MultipartVar.java
index a74b754..a777aa7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/MultipartVar.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/MultipartVar.java
@@ -43,7 +43,7 @@ public abstract class MultipartVar extends SimpleVar {
@Override /* Var */
public String resolve(VarResolverSession session, String s) {
- String[] s2 = s.indexOf(',') == -1 ? new String[]{s} : StringUtils.split(s, ',');
+ String[] s2 = s.indexOf(',') == -1 ? new String[]{s.trim()} : StringUtils.split(s, ',');
return resolve(session, s2);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
index 37344b8..c6514fa 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolver.java
@@ -101,12 +101,14 @@ public class VarResolver extends CoreApi {
* <ul>
* <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.
* <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.
+ * <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.
+ * <li><code>$SWITCH{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.
* </ul>
*
* @see SystemPropertiesVar
* @see EnvVariablesVar
*/
- public static final VarResolver DEFAULT = new VarResolver().addVars(SystemPropertiesVar.class, EnvVariablesVar.class).lock();
+ public static final VarResolver DEFAULT = new VarResolver().addVars(SystemPropertiesVar.class, EnvVariablesVar.class, SwitchVar.class, IfVar.class).lock();
/**
* Construct an empty var resolver with no vars.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/vars/IfVar.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/vars/IfVar.java b/juneau-core/src/main/java/org/apache/juneau/svl/vars/IfVar.java
new file mode 100644
index 0000000..b0b0f1b
--- /dev/null
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/vars/IfVar.java
@@ -0,0 +1,65 @@
+// ***************************************************************************************************************************
+// * 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.juneau.svl.vars;
+
+import static org.apache.juneau.internal.ThrowableUtils.*;
+
+import org.apache.juneau.svl.*;
+
+/**
+ * A basic if-else logic variable resolver.
+ * <p>
+ * The format for this var is one of the following:
+ * <ul>
+ * <li><js>"$IF{booleanArg,thenValue}"</js>
+ * <li><js>"$IF{booleanArg,thenValue,elseValue}"</js>
+ * </ul>
+ * <p>
+ * The boolean argument is any string.
+ * <br>The following values are interpreted as <jk>true</jk>: <js>"true"</js>,<js>"TRUE"</js>,<js>"t"</js>,<js>"T"</js>,<js>"1"</js>.
+ * <br>All else are interpreted as <jk>false</jk>
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode'>
+ * <jc>// Create a variable resolver that resolves system properties and $IF vars.</jc>
+ * VarResolver r = <jk>new</jk> VarResolver().addVars(IfVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>);
+ *
+ * <jc>// Use it!</jc>
+ * System.<jsf>out</jsf>.println(r.resolve(<js>"Property $IF{$S{someBooleanFlag},IS,IS NOT} set!"</js>));
+ * </p>
+ * <p>
+ * Since this is a {@link MultipartVar}, any variables contained in the result will be recursively resolved.
+ * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ *
+ * @see org.apache.juneau.svl
+*/
+public class IfVar extends MultipartVar {
+
+ /**
+ * Constructor.
+ */
+ public IfVar() {
+ super("IF");
+ }
+
+ @Override /* MultipartVar */
+ public String resolve(VarResolverSession session, String[] args) {
+ if (args.length < 2 || args.length > 3)
+ illegalArg("Invalid number of arguments passed to $IF var. Must be either $IF{booleanArg,thenValue} or $IF{booleanArg,thenValue,elseValue}");
+
+ String b = args[0].toLowerCase();
+ if ("1".equals(b) || "t".equals(b) || "true".equals(b))
+ return args[1];
+ return args.length == 2 ? "" : args[2];
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java b/juneau-core/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
new file mode 100644
index 0000000..67bef8c
--- /dev/null
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
@@ -0,0 +1,76 @@
+// ***************************************************************************************************************************
+// * 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.juneau.svl.vars;
+
+import static org.apache.juneau.internal.ThrowableUtils.*;
+
+import java.util.regex.*;
+
+import org.apache.juneau.svl.*;
+
+/**
+ * A basic switch/case logic variable resolver.
+ * <p>
+ * The format for this var is one of the following:
+ * <ul>
+ * <li><js>"$SWITCH{stringArg,pattern,thenValue}"</js>
+ * <li><js>"$SWITCH{stringArg,pattern,thenValue,elseValue}"</js>
+ * <li><js>"$SWITCH{stringArg,pattern,thenValue,pattern,thenValue}"</js>
+ * <li><js>"$SWITCH{stringArg,pattern,thenValue,pattern,thenValue,elsePattern}"</js>
+ * <li>...
+ * </ul>
+ * <p>
+ * The pattern can be any string optionally containing <js>'*'</js> or <js>'?'</js> representing any or one character respectively.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode'>
+ * <jc>// Create a variable resolver that resolves system properties and $SWITCH vars.</jc>
+ * VarResolver r = <jk>new</jk> VarResolver().addVars(SwitchVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>);
+ *
+ * <jc>// Use it!</jc>
+ * System.<jsf>out</jsf>.println(r.resolve(<js>"We are running on $SWITCH{$P{os.name},*win*,Windows,Something else}!"</js>));
+ * </p>
+ * <p>
+ * Since this is a {@link MultipartVar}, any variables contained in the result will be recursively resolved.
+ * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
+ */
+public class SwitchVar extends MultipartVar {
+
+ /**
+ * Constructor.
+ */
+ public SwitchVar() {
+ super("SWITCH");
+ }
+
+ @Override /* MultipartVar */
+ public String resolve(VarResolverSession session, String[] args) {
+ if (args.length < 3)
+ illegalArg("Invalid number of arguments passed to $SWITCH var. Must have 3 or more arguments.");
+
+ String stringArg = args[0];
+ for (int i = 1; i < args.length;) {
+ String pattern = args[i++];
+ if (args.length == i)
+ return pattern; // We've reached an else.
+
+ Pattern p = Pattern.compile(pattern.replace("*", ".*").replace("?", "."));
+ if (p.matcher(stringArg).matches())
+ return args[i];
+ i++;
+ }
+
+ // Nothing matched and no else clause.
+ return "";
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index b56ce30..c579ae6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -41,7 +41,7 @@ import org.apache.juneau.*;
* </p>
*
* <h5 class='section'>Additional information:</h5>
- * See {@link org.apache.juneau.transform} for more information.
+ * See <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.transform</a> for more information.
*/
public abstract class BeanFilterBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
index 910561f..fdcd3bd 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -91,7 +91,7 @@ import org.apache.juneau.serializer.*;
* know it's a {@code Date} from just the JSON or XML text.
*
* <h5 class='section'>Additional information:</h5>
- * See {@link org.apache.juneau.transform} for more information.
+ * See <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.transform</a> for more information.
*
* @param <T> The normal form of the class.
* @param <S> The swapped form of the class.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/transform/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/package.html b/juneau-core/src/main/java/org/apache/juneau/transform/package.html
index f9722e3..e6e9f88 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/package.html
@@ -471,7 +471,7 @@
a2 = parser.parse(s2, <jk>byte</jk>[][].<jk>class</jk>); <jc>// Reproduces {{1,2,3},{4,5,6},null}</jc>
</p>
<p>
- It should be noted that the sample swaps shown above have already been implemented in the {@link org.apache.juneau.transforms} package.
+ It should be noted that the sample swaps shown above have already been implemented in the <a class='doclink' href='../transforms/package-summary.html#TOC'>org.apache.juneau.transforms</a> package.
The following are a list of out-of-the-box swaps:
</p>
<ul class='spaced-list'>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/transforms/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transforms/package.html b/juneau-core/src/main/java/org/apache/juneau/transforms/package.html
index 65016d3..a8de183 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transforms/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/transforms/package.html
@@ -61,6 +61,6 @@
This package contains various predefined instances of transforms for commonly-serialized/parsed class types.
</p>
<p>
- See {@link org.apache.juneau.transform} for more information about transforms.
+ See <a class='doclink' href='../transform/package-summary.html#TOC'>org.apache.juneau.transform</a> for more information about transforms.
</p>
</body>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
index 21227c7..2ada474 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
@@ -572,7 +572,7 @@ public class UonParser extends ReaderParser {
s = r.getMarked();
else if (c == EQ)
r.replace('=');
- else if (Character.isWhitespace(c)) {
+ else if (Character.isWhitespace(c) && ! isUrlParamValue) {
s = r.getMarked(0, -1);
skipSpace(r);
c = -1;
@@ -580,6 +580,9 @@ public class UonParser extends ReaderParser {
isInEscape = isInEscape(c, r, isInEscape);
}
+ if (isUrlParamValue)
+ s = StringUtils.trim(s);
+
return ("null".equals(s) ? null : session.trim(s));
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d473b4b3/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
index 35f591c..1282922 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
@@ -294,7 +294,7 @@
http://localhost/sample?<ua>a1=<us>'Sun,+03+Mar+1901+09:05:06+GMT'</us>
</p>
<p>
- For more information about transforms, refer to {@link org.apache.juneau.transform}.
+ For more information about transforms, refer to <a class='doclink' href='../transform/package-summary.html#TOC'>org.apache.juneau.transform</a>.
</p>
</div>
@@ -1009,7 +1009,7 @@
</p>
<p>
This document won't go into all the details of the Juneau <code>RestServlet</code> class.<br>
- Refer to the {@link org.apache.juneau.rest} documentation for more information on the REST servlet class in general.
+ Refer to the <a class='doclink' href='../rest/package-summary.html#TOC'>org.apache.juneau.rest</a> documentation for more information on the REST servlet class in general.
</p>
<p>
The rest of the code in the resource class consists of REST methods that simply accept and return POJOs.<br>
@@ -1088,7 +1088,7 @@
The {@link org.apache.juneau.rest.annotation.RestMethod#serializersInherit()} and
{@link org.apache.juneau.rest.annotation.RestMethod#parsersInherit()} control how various artifacts
are inherited from the parent class.<br>
- Refer to {@link org.apache.juneau.rest} for additional information on using these annotations.
+ Refer to <a class='doclink' href='../rest/package-summary.html#TOC'>org.apache.juneau.rest</a> for additional information on using these annotations.
</p>
</div>