diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java index 1c90cb9d172..6db1274a924 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java @@ -84,11 +84,11 @@ public class AppController extends Controller implements AMParams { public void info() { AppInfo info = new AppInfo(app, app.context); info("Application Master Overview"). - _("Application ID:", info.getId()). - _("Application Name:", info.getName()). - _("User:", info.getUser()). - _("Started on:", Times.format(info.getStartTime())). - _("Elasped: ", org.apache.hadoop.util.StringUtils.formatTime( + __("Application ID:", info.getId()). + __("Application Name:", info.getName()). + __("User:", info.getUser()). + __("Started on:", Times.format(info.getStartTime())). + __("Elasped: ", org.apache.hadoop.util.StringUtils.formatTime( info.getElapsedTime() )); render(InfoPage.class); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java index 7fde95b592a..7a3e2b357e3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppView.java @@ -25,14 +25,14 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*; public class AppView extends TwoColumnLayout { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); set(DATATABLES_ID, "jobs"); set(initID(DATATABLES, "jobs"), jobsTableInit()); setTableStyles(html, "jobs"); } - protected void commonPreHead(Page.HTML<_> html) { + protected void commonPreHead(Page.HTML<__> html) { set(ACCORDION_ID, "nav"); set(initID(ACCORDION, "nav"), "{autoHeight:false, active:1}"); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java index 98a2ce1d0cc..76ef6bdcb65 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ConfBlock.java @@ -30,10 +30,10 @@ import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.app.webapp.dao.ConfEntryInfo; import org.apache.hadoop.mapreduce.v2.app.webapp.dao.ConfInfo; import org.apache.hadoop.mapreduce.v2.util.MRApps; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; -import org.apache.hadoop.yarn.webapp.hamlet.HamletSpec.InputType; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.InputType; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -56,21 +56,21 @@ public class ConfBlock extends HtmlBlock { String jid = $(JOB_ID); if (jid.isEmpty()) { html. - p()._("Sorry, can't do anything without a JobID.")._(); + p().__("Sorry, can't do anything without a JobID.").__(); return; } JobId jobID = MRApps.toJobID(jid); Job job = appContext.getJob(jobID); if (job == null) { html. - p()._("Sorry, ", jid, " not found.")._(); + p().__("Sorry, ", jid, " not found.").__(); return; } Path confPath = job.getConfFile(); try { ConfInfo info = new ConfInfo(job); - html.div().a("/jobhistory/downloadconf/" + jid, confPath.toString())._(); + html.div().a("/jobhistory/downloadconf/" + jid, confPath.toString()).__(); TBODY
> table() { + closeAttrs(); + return table_(this, false); + } + + @Override + public TABLE | > table(String selector) {
+ return setSelector(table(), selector);
+ }
+
+ @Override
+ public TD> address() {
+ closeAttrs();
+ return address_(this, false);
+ }
+
+ @Override
+ public P | > p(String selector) {
+ return setSelector(p(), selector);
+ }
+
+ @Override
+ public P | > p() {
+ closeAttrs();
+ return p_(this, false);
+ }
+
+ @Override
+ public TD | > hr() {
+ closeAttrs();
+ return hr_(this, false);
+ }
+
+ @Override
+ public TD | > dl(String selector) {
+ return setSelector(dl(), selector);
+ }
+
+ @Override
+ public DL | > dl() {
+ closeAttrs();
+ return dl_(this, false);
+ }
+
+ @Override
+ public DIV | > div(String selector) {
+ return setSelector(div(), selector);
+ }
+
+ @Override
+ public DIV | > div() {
+ closeAttrs();
+ return div_(this, false);
+ }
+
+ @Override
+ public BLOCKQUOTE | > blockquote() {
+ closeAttrs();
+ return blockquote_(this, false);
+ }
+
+ @Override
+ public BLOCKQUOTE | > bq() {
+ closeAttrs();
+ return blockquote_(this, false);
+ }
+
+ @Override
+ public TD | > h1() {
+ closeAttrs();
+ return h1_(this, false);
+ }
+
+ @Override
+ public TD | > h2() {
+ closeAttrs();
+ return h2_(this, false);
+ }
+
+ @Override
+ public TD | > h3() {
+ closeAttrs();
+ return h3_(this, false);
+ }
+
+ @Override
+ public TD | > h4() {
+ closeAttrs();
+ return h4_(this, false);
+ }
+
+ @Override
+ public TD | > h5() {
+ closeAttrs();
+ return h5_(this, false);
+ }
+
+ @Override
+ public TD | > h6() {
+ closeAttrs();
+ return h6_(this, false);
+ }
+
+ @Override
+ public TD | > ul() {
+ closeAttrs();
+ return ul_(this, false);
+ }
+
+ @Override
+ public UL | > ul(String selector) {
+ return setSelector(ul(), selector);
+ }
+
+ @Override
+ public OL | > ol() {
+ closeAttrs();
+ return ol_(this, false);
+ }
+
+ @Override
+ public OL | > ol(String selector) {
+ return setSelector(ol(), selector);
+ }
+
+ @Override
+ public PRE | > pre() {
+ closeAttrs();
+ return pre_(this, false);
+ }
+
+ @Override
+ public PRE | > pre(String selector) {
+ return setSelector(pre(), selector);
+ }
+
+ @Override
+ public FORM | > form() {
+ closeAttrs();
+ return form_(this, false);
+ }
+
+ @Override
+ public FORM | > form(String selector) {
+ return setSelector(form(), selector);
+ }
+
+ @Override
+ public FIELDSET | > fieldset() {
+ closeAttrs();
+ return fieldset_(this, false);
+ }
+
+ @Override
+ public FIELDSET | > fieldset(String selector) {
+ return setSelector(fieldset(), selector);
+ }
+
+ @Override
+ public TD | > b() {
+ closeAttrs();
+ return b_(this, true);
+ }
+
+ @Override
+ public TD | > i() {
+ closeAttrs();
+ return i_(this, true);
+ }
+
+ @Override
+ public TD | > small() {
+ closeAttrs();
+ return small_(this, true);
+ }
+
+ @Override
+ public TD | > em() {
+ closeAttrs();
+ return em_(this, true);
+ }
+
+ @Override
+ public TD | > strong() {
+ closeAttrs();
+ return strong_(this, true);
+ }
+
+ @Override
+ public TD | > dfn() {
+ closeAttrs();
+ return dfn_(this, true);
+ }
+
+ @Override
+ public TD | > code() {
+ closeAttrs();
+ return code_(this, true);
+ }
+
+ @Override
+ public TD | > samp() {
+ closeAttrs();
+ return samp_(this, true);
+ }
+
+ @Override
+ public TD | > kbd() {
+ closeAttrs();
+ return kbd_(this, true);
+ }
+
+ @Override
+ public TD | > var() {
+ closeAttrs();
+ return var_(this, true);
+ }
+
+ @Override
+ public TD | > cite() {
+ closeAttrs();
+ return cite_(this, true);
+ }
+
+ @Override
+ public TD | > abbr() {
+ closeAttrs();
+ return abbr_(this, true);
+ }
+
+ @Override
+ public TD | > a() {
+ closeAttrs();
+ return a_(this, true);
+ }
+
+ @Override
+ public A | > a(String selector) {
+ return setSelector(a(), selector);
+ }
+
+ @Override
+ public TD | > img() {
+ closeAttrs();
+ return img_(this, true);
+ }
+
+ @Override
+ public TD | > object() {
+ closeAttrs();
+ return object_(this, true);
+ }
+
+ @Override
+ public OBJECT | > object(String selector) {
+ return setSelector(object(), selector);
+ }
+
+ @Override
+ public SUB | > sub() {
+ closeAttrs();
+ return sub_(this, true);
+ }
+
+ @Override
+ public TD | > sup() {
+ closeAttrs();
+ return sup_(this, true);
+ }
+
+ @Override
+ public TD | > map() {
+ closeAttrs();
+ return map_(this, true);
+ }
+
+ @Override
+ public MAP | > map(String selector) {
+ return setSelector(map(), selector);
+ }
+
+ @Override
+ public TD | > q() {
+ closeAttrs();
+ return q_(this, true);
+ }
+
+ @Override
+ public BR | > br() {
+ closeAttrs();
+ return br_(this, true);
+ }
+
+ @Override
+ public TD | > bdo() {
+ closeAttrs();
+ return bdo_(this, true);
+ }
+
+ @Override
+ public TD | > span() {
+ closeAttrs();
+ return span_(this, true);
+ }
+
+ @Override
+ public TD | > script() {
+ closeAttrs();
+ return script_(this, true);
+ }
+
+ @Override
+ public TD | > ins() {
+ closeAttrs();
+ return ins_(this, true);
+ }
+
+ @Override
+ public TD | > del() {
+ closeAttrs();
+ return del_(this, true);
+ }
+
+ @Override
+ public TD | > label() {
+ closeAttrs();
+ return label_(this, true);
+ }
+
+ @Override
+ public TD | > input(String selector) {
+ return setSelector(input(), selector);
+ }
+
+ @Override
+ public INPUT | > input() {
+ closeAttrs();
+ return input_(this, true);
+ }
+
+ @Override
+ public SELECT | > select() {
+ closeAttrs();
+ return select_(this, true);
+ }
+
+ @Override
+ public SELECT | > select(String selector) {
+ return setSelector(select(), selector);
+ }
+
+ @Override
+ public TEXTAREA | > textarea(String selector) {
+ return setSelector(textarea(), selector);
+ }
+
+ @Override
+ public TEXTAREA | > textarea() {
+ closeAttrs();
+ return textarea_(this, true);
+ }
+
+ @Override
+ public TD | > button() {
+ closeAttrs();
+ return button_(this, true);
+ }
+
+ @Override
+ public BUTTON | > button(String selector) {
+ return setSelector(button(), selector);
+ }
+
+ @Override
+ public TD | |