myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r820225 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/component/ theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ theme/standard/src/main/java/org/apache/myfaces/t...
Date Wed, 30 Sep 2009 09:20:49 GMT
Author: lofwyr
Date: Wed Sep 30 09:20:42 2009
New Revision: 820225

URL: http://svn.apache.org/viewvc?rev=820225&view=rev
Log:
TOBAGO-658: JSF 1.2 Compatibility
- getter for java.lang.Boolean attribute must have "get" prefix instead of "is" prefix, according
to bean spec. (This is also required by the Sun RI 1.2 impl.)

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeData.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeData.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeData.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeData.java
Wed Sep 30 09:20:42 2009
@@ -71,7 +71,7 @@
     setRowIndex(facesContext, null);
 
     // XXX hack: fix this if there is a Listener
-    if (templateComponent.isMarked()) {
+    if (templateComponent.getMarked()) {
       marker = templateComponent.getValue();
     }
 
@@ -101,7 +101,7 @@
     AbstractUITreeNode template = getTemplateComponent();
     pathStates.put(this.rowIndex, template.saveState(facesContext));
     if (LOG.isDebugEnabled()) {
-      LOG.debug("save   " + this.rowIndex + " ex=" + template.isExpanded());
+      LOG.debug("save   " + this.rowIndex + " ex=" + template.getExpanded());
     }
 
     // reset the client id (see spec 3.1.6)
@@ -121,7 +121,7 @@
     if (state != null) {
       template.restoreState(facesContext, state);
       if (LOG.isDebugEnabled()) {
-        LOG.debug("restore " + this.rowIndex + " ex=" + template.isExpanded());
+        LOG.debug("restore " + this.rowIndex + " ex=" + template.getExpanded());
       }
     }
   }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
Wed Sep 30 09:20:42 2009
@@ -304,7 +304,7 @@
 
   public abstract void setMarked(Boolean b);
 
-  public abstract Boolean isMarked();
+  public abstract Boolean getMarked();
 
-  public abstract Boolean isExpanded();
+  public abstract Boolean getExpanded();
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
(original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UICommandBase.java
Wed Sep 30 09:20:42 2009
@@ -90,7 +90,7 @@
     return FacesUtils.invokeOnComponent(context, this, clientId, callback);
   }
 
-  public abstract Boolean isJsfResource();
+  public abstract Boolean getJsfResource();
 
   public abstract String getResource();
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
Wed Sep 30 09:20:42 2009
@@ -67,7 +67,7 @@
 
     UIMessages messages = (UIMessages) component;
 
-    if (messages.isConfirmation()) {
+    if (messages.getConfirmation()) {
       createPopup(facesContext, messages);
       return;
     }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
Wed Sep 30 09:20:42 2009
@@ -42,8 +42,8 @@
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
-    boolean escape = out.isEscape();
-    boolean createSpan = out.isCreateSpan();
+    boolean escape = out.getEscape();
+    boolean createSpan = out.getCreateSpan();
 
     if (createSpan) {
       String id = out.getClientId(facesContext);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
Wed Sep 30 09:20:42 2009
@@ -102,7 +102,7 @@
     //contentStyle.append("top: ");
     //contentStyle.append(top);
     //contentStyle.append("; ");
-    if (component.isModal()) {
+    if (component.getModal()) {
       writer.startElement(HtmlConstants.DIV, component);
       writer.writeIdAttribute(clientId);
       writer.writeStyleAttribute("z-index: " + (zIndex + 1) + ";");
@@ -122,7 +122,7 @@
       writer.writeClassAttribute("tobago-popup-iframe tobago-popup-none");
       writer.writeStyleAttribute("z-index: " + (zIndex + 2) + ";");
       UIPage page = (UIPage) ComponentUtil.findPage(facesContext);
-      if (component.isModal()) {
+      if (component.getModal()) {
         final StringBuilder frameSize = new StringBuilder(32);
         // full client area
         frameSize.append("width: ");
@@ -145,7 +145,7 @@
     StyleClasses styleClasses = new StyleClasses();
     styleClasses.addClass("popup", "content");
     styleClasses.addClass("popup", "none");
-    if (component.isModal()) {
+    if (component.getModal()) {
       styleClasses.addClass("popup", "modal");
     }
     writer.writeClassAttribute(styleClasses);
@@ -169,7 +169,7 @@
     writer.write("', '");
     writer.write(component.getTop().getPixel());
     writer.write("', ");
-    writer.write(String.valueOf(component.isModal()));
+    writer.write(String.valueOf(component.getModal()));
     writer.write(");");
     writer.endJavascript();
   }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
Wed Sep 30 09:20:42 2009
@@ -236,7 +236,7 @@
     }
 
 
-    final boolean showHeader = data.isShowHeader();
+    final boolean showHeader = data.getShowHeader();
     if (showHeader) {
       // begin rendering header
       writer.startElement(HtmlConstants.DIV, null);

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
Wed Sep 30 09:20:42 2009
@@ -109,7 +109,7 @@
 
     String treeId = tree.getClientId(facesContext);
     boolean folder = node.isFolder();
-    boolean marked = node.isMarked();
+    boolean marked = node.getMarked();
     String id = node.getClientId(facesContext);
     int depth = node.getDepth();
     boolean hasNextSibling = node.isHasNextSibling();
@@ -415,8 +415,8 @@
     TreeState state = (TreeState) tree.getState();
     if (state != null) {
       return state.getExpanded().contains(node.getPath());
-    } else if (node.isExpanded() != null) {
-      return node.isExpanded();
+    } else if (node.getExpanded() != null) {
+      return node.getExpanded();
     } else {
       return false;
     }
@@ -435,7 +435,7 @@
       node.setExpanded(expanded);
     }
     if (oldExpanded != expanded) {
-      new TreeExpansionEvent(node, node.isExpanded(), expanded).queue();
+      new TreeExpansionEvent(node, node.getExpanded(), expanded).queue();
     }
   }
 }

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
(original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
Wed Sep 30 09:20:42 2009
@@ -176,7 +176,7 @@
     ExternalContext externalContext = facesContext.getExternalContext();
 
     if (component.getResource() != null) {
-      boolean jsfResource = component.isJsfResource();
+      boolean jsfResource = component.getJsfResource();
       url = ResourceManagerUtil.getPageWithoutContextPath(facesContext, component.getResource());
       if (url != null) {
         if (jsfResource) {

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
Wed Sep 30 09:20:42 2009
@@ -307,7 +307,7 @@
 
 BooleanProperty(property) ::= <<
 
-public java.lang.Boolean is<property.upperCamelCaseName>() {
+public java.lang.Boolean get<property.upperCamelCaseName>() {
   if (<property.propertyName> != null) {
     return <property.propertyName>;
   }

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg?rev=820225&r1=820224&r2=820225&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
Wed Sep 30 09:20:42 2009
@@ -214,7 +214,7 @@
 
 BooleanProperty(property) ::= <<
 
-public java.lang.Boolean is<property.upperCamelCaseName>() {
+public java.lang.Boolean get<property.upperCamelCaseName>() {
   if (<property.propertyName> != null) {
     return <property.propertyName>;
   }



Mime
View raw message