You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/02/10 11:46:47 UTC
svn commit: r742931 - in /myfaces/tobago/branches/tobago-1.0.x:
core/src/main/java/org/apache/myfaces/tobago/taglib/extension/
example/nonfacesrequest/
Author: bommel
Date: Tue Feb 10 10:46:33 2009
New Revision: 742931
URL: http://svn.apache.org/viewvc?rev=742931&view=rev
Log:
clean up code
added jsf 1.2 profiles to nonfacresrequest example
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/example/nonfacesrequest/pom.xml
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java?rev=742931&r1=742930&r2=742931&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java Tue Feb 10 10:46:33 2009
@@ -28,7 +28,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.ComponentUtil;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RENDERED_PARTIALLY;
+import org.apache.myfaces.tobago.TobagoConstants;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.JspException;
@@ -125,11 +125,11 @@
// Move attribute renderedPartially from selectBoolean to menuCommand component
UIComponent selectBooleanComponent = selectBooleanCheckbox.getComponentInstance();
UICommand command = (UICommand) menuCommandTag.getComponentInstance();
- ValueBinding binding = selectBooleanComponent.getValueBinding(ATTR_RENDERED_PARTIALLY);
+ ValueBinding binding = selectBooleanComponent.getValueBinding(TobagoConstants.ATTR_RENDERED_PARTIALLY);
if (binding != null) {
- command.setValueBinding(ATTR_RENDERED_PARTIALLY, binding);
+ command.setValueBinding(TobagoConstants.ATTR_RENDERED_PARTIALLY, binding);
} else {
- Object renderedPartially = selectBooleanComponent.getAttributes().get(ATTR_RENDERED_PARTIALLY);
+ Object renderedPartially = selectBooleanComponent.getAttributes().get(TobagoConstants.ATTR_RENDERED_PARTIALLY);
ComponentUtil.setRenderedPartially(command, (String) renderedPartially);
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java?rev=742931&r1=742930&r2=742931&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java Tue Feb 10 10:46:33 2009
@@ -29,7 +29,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.ComponentUtil;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RENDERED_PARTIALLY;
+import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.webapp.FacetTag;
import javax.faces.component.UIComponent;
@@ -133,11 +133,11 @@
// Move attribute renderedPartially from selectOne to menuCommand component
UIComponent selectOneComponent = selectOneRadio.getComponentInstance();
UICommand command = (UICommand) menuCommandTag.getComponentInstance();
- ValueBinding binding = selectOneComponent.getValueBinding(ATTR_RENDERED_PARTIALLY);
+ ValueBinding binding = selectOneComponent.getValueBinding(TobagoConstants.ATTR_RENDERED_PARTIALLY);
if (binding != null) {
- command.setValueBinding(ATTR_RENDERED_PARTIALLY, binding);
+ command.setValueBinding(TobagoConstants.ATTR_RENDERED_PARTIALLY, binding);
} else {
- Object renderedPartially = selectOneComponent.getAttributes().get(ATTR_RENDERED_PARTIALLY);
+ Object renderedPartially = selectOneComponent.getAttributes().get(TobagoConstants.ATTR_RENDERED_PARTIALLY);
ComponentUtil.setRenderedPartially(command, (String) renderedPartially);
}
Modified: myfaces/tobago/branches/tobago-1.0.x/example/nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/nonfacesrequest/pom.xml?rev=742931&r1=742930&r2=742931&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/nonfacesrequest/pom.xml Tue Feb 10 10:46:33 2009
@@ -113,6 +113,27 @@
</dependencies>
</profile>
<profile>
+ <id>myfaces12</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces12</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces12.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces12.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>sunjsf</id>
<activation>
<property>
@@ -136,5 +157,34 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>sunjsf12</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri12</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${sunjsf12.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${sunjsf12.version}</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ </profile>
</profiles>
</project>
\ No newline at end of file