Thomas Broyer has submitted this change and it was merged.
Change subject: Use correct return types for createFooInputBuilder()
methods in HtmlBuilderFactory. Also adjust the return types of affected
methods in HtmlBuilderImpl.
......................................................................
Use correct return types for createFooInputBuilder() methods in
HtmlBuilderFactory.
Also adjust the return types of affected methods in HtmlBuilderImpl.
Bug: Issue 8070
Change-Id: I9c8d711a04021deeb83ea8672203c2a36239ccbc
---
M tools/api-checker/config/gwt25_26userApi.conf
M user/src/com/google/gwt/dom/builder/shared/HtmlBuilderFactory.java
M user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
3 files changed, 33 insertions(+), 21 deletions(-)
Approvals:
Leeroy Jenkins: Verified
Thomas Broyer: Looks good to me, approved
diff --git a/tools/api-checker/config/gwt25_26userApi.conf
b/tools/api-checker/config/gwt25_26userApi.conf
index 82d5a92..1071419 100644
--- a/tools/api-checker/config/gwt25_26userApi.conf
+++ b/tools/api-checker/config/gwt25_26userApi.conf
@@ -172,3 +172,15 @@
com.google.gwt.dom.client.ObjectElement::setData(Ljava/lang/String;)
OVERLOADED_METHOD_CALL
com.google.gwt.dom.client.QuoteElement::setCite(Ljava/lang/String;)
OVERLOADED_METHOD_CALL
com.google.gwt.user.client.ui.Anchor::setHref(Ljava/lang/String;)
OVERLOADED_METHOD_CALL
+
+# Let HtmlBuilderFactory return HtmlInputBuilders instead of just
InputBuilders
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createButtonInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createCheckboxInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createFileInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createHiddenInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createImageInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createPasswordInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createRadioInputBuilder(Ljava/lang/String;)
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createResetInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createSubmitInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
+com.google.gwt.dom.builder.shared.HtmlBuilderFactory::createTextInputBuilder()
OVERRIDABLE_METHOD_RETURN_TYPE_CHANGE
diff --git
a/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderFactory.java
b/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderFactory.java
index 6a74146..9605032 100644
--- a/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderFactory.java
+++ b/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderFactory.java
@@ -85,7 +85,7 @@
}
@Override
- public InputBuilder createButtonInputBuilder() {
+ public HtmlInputBuilder createButtonInputBuilder() {
return impl().startButtonInput();
}
@@ -95,7 +95,7 @@
}
@Override
- public InputBuilder createCheckboxInputBuilder() {
+ public HtmlInputBuilder createCheckboxInputBuilder() {
return impl().startCheckboxInput();
}
@@ -125,7 +125,7 @@
}
@Override
- public InputBuilder createFileInputBuilder() {
+ public HtmlInputBuilder createFileInputBuilder() {
return impl().startFileInput();
}
@@ -180,7 +180,7 @@
}
@Override
- public InputBuilder createHiddenInputBuilder() {
+ public HtmlInputBuilder createHiddenInputBuilder() {
return impl().startHiddenInput();
}
@@ -200,7 +200,7 @@
}
@Override
- public InputBuilder createImageInputBuilder() {
+ public HtmlInputBuilder createImageInputBuilder() {
return impl().startImageInput();
}
@@ -260,7 +260,7 @@
}
@Override
- public InputBuilder createPasswordInputBuilder() {
+ public HtmlInputBuilder createPasswordInputBuilder() {
return impl().startPasswordInput();
}
@@ -280,7 +280,7 @@
}
@Override
- public InputBuilder createRadioInputBuilder(String name) {
+ public HtmlInputBuilder createRadioInputBuilder(String name) {
return impl().startRadioInput(name);
}
@@ -290,7 +290,7 @@
}
@Override
- public InputBuilder createResetInputBuilder() {
+ public HtmlInputBuilder createResetInputBuilder() {
return impl().startResetInput();
}
@@ -325,7 +325,7 @@
}
@Override
- public InputBuilder createSubmitInputBuilder() {
+ public HtmlInputBuilder createSubmitInputBuilder() {
return impl().startSubmitInput();
}
@@ -355,7 +355,7 @@
}
@Override
- public InputBuilder createTextInputBuilder() {
+ public HtmlInputBuilder createTextInputBuilder() {
return impl().startTextInput();
}
diff --git
a/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
b/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
index 66919c5..7a2585d 100644
--- a/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
+++ b/user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
@@ -211,7 +211,7 @@
return brBuilder;
}
- public InputBuilder startButtonInput() {
+ public HtmlInputBuilder startButtonInput() {
return startInput(ButtonElement.TAG);
}
@@ -223,7 +223,7 @@
return canvasBuilder;
}
- public InputBuilder startCheckboxInput() {
+ public HtmlInputBuilder startCheckboxInput() {
return startInput("checkbox");
}
@@ -256,7 +256,7 @@
return fieldSetBuilder;
}
- public InputBuilder startFileInput() {
+ public HtmlInputBuilder startFileInput() {
return startInput("file");
}
@@ -316,7 +316,7 @@
return headBuilder;
}
- public InputBuilder startHiddenInput() {
+ public HtmlInputBuilder startHiddenInput() {
return startInput("hidden");
}
@@ -344,7 +344,7 @@
return imageBuilder;
}
- public InputBuilder startImageInput() {
+ public HtmlInputBuilder startImageInput() {
return startInput("image");
}
@@ -430,7 +430,7 @@
return paramBuilder;
}
- public InputBuilder startPasswordInput() {
+ public HtmlInputBuilder startPasswordInput() {
return startInput("password");
}
@@ -450,8 +450,8 @@
return startQuote(QuoteElement.TAG_Q);
}
- public InputBuilder startRadioInput(String name) {
- InputBuilder builder = startInput("radio");
+ public HtmlInputBuilder startRadioInput(String name) {
+ HtmlInputBuilder builder = startInput("radio");
attribute("name", name);
return builder;
}
@@ -460,7 +460,7 @@
return startButton("reset");
}
- public InputBuilder startResetInput() {
+ public HtmlInputBuilder startResetInput() {
return startInput("reset");
}
@@ -505,7 +505,7 @@
return startButton("submit");
}
- public InputBuilder startSubmitInput() {
+ public HtmlInputBuilder startSubmitInput() {
return startInput("submit");
}
@@ -542,7 +542,7 @@
return textAreaBuilder;
}
- public InputBuilder startTextInput() {
+ public HtmlInputBuilder startTextInput() {
return startInput("text");
}
--
To view, visit https://gwt-review.googlesource.com/3331
To unsubscribe, visit https://gwt-review.googlesource.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c8d711a04021deeb83ea8672203c2a36239ccbc
Gerrit-PatchSet: 2
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Tom Wieczorek <[email protected]>
Gerrit-Reviewer: Leeroy Jenkins <[email protected]>
Gerrit-Reviewer: Thomas Broyer <[email protected]>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
---
You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.