You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/08/17 16:20:13 UTC
svn commit: r1756648 - in
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src:
main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java
Author: lofwyr
Date: Wed Aug 17 16:20:13 2016
New Revision: 1756648
URL: http://svn.apache.org/viewvc?rev=1756648&view=rev
Log:
cleanup
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java?rev=1756648&r1=1756647&r2=1756648&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java Wed Aug 17 16:20:13 2016
@@ -74,39 +74,6 @@ public class Command {
this.omit = omit;
}
- /**
- * @deprecated use with "execute" and "render" instead
- */
- @Deprecated
- public Command(
- final String action, final Boolean transition, final String target, final String url, final String partially,
- final String focus, final String confirmation, final Integer delay, final Collapse collapse, final Boolean omit) {
- this.action = action;
- this.transition = transition;
- this.target = target;
- this.url = url;
- setPartially(partially);
- this.focus = focus;
- this.confirmation = confirmation;
- this.delay = delay;
- this.collapse = collapse;
- this.omit = omit;
- }
-
- public Command(final FacesContext facesContext, final AbstractUICommand command, String[] ids) {
- this(
- null,
- command.isTransition(),
- command.getTarget(),
- RenderUtils.generateUrl(facesContext, command),
- ComponentUtils.evaluateClientIds(facesContext, command, ids),
- null,
- getConfirmation(command),
- null,
- AjaxClientBehaviorRenderer.createCollapsible(facesContext, command),
- command.isOmit());
- }
-
public Command(final FacesContext facesContext, final AbstractUICommand command) {
this(
null,
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java?rev=1756648&r1=1756647&r2=1756648&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java Wed Aug 17 16:20:13 2016
@@ -90,6 +90,7 @@ public class JsonUtilsUnitTest extends A
false,
"_blank", "http://www.apache.org/",
StringUtils.join(Arrays.asList("id1", "id2"), ' '),
+ StringUtils.join(Arrays.asList("id1", "id2"), ' '),
"id_focus",
"Really?", 1000, new Collapse(Collapse.Action.show, "myId"), true));
final String expected = (
@@ -99,7 +100,8 @@ public class JsonUtilsUnitTest extends A
+ "'transition':false,"
+ "'target':'_blank',"
+ "'url':'http://www.apache.org/',"
- + "'partially':'id1 id2',"
+ + "'execute':'id1 id2',"
+ + "'render':'id1 id2',"
+ "'collapse':{"
+ "'transition':'show',"
+ "'forId':'myId'"