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 2007/10/09 15:29:09 UTC
svn commit: r583160 - in /myfaces/tobago/trunk/extension/facelets: ./
src/main/java/org/apache/myfaces/tobago/facelets/
src/main/java/org/apache/myfaces/tobago/facelets/extension/
Author: bommel
Date: Tue Oct 9 06:29:09 2007
New Revision: 583160
URL: http://svn.apache.org/viewvc?rev=583160&view=rev
Log:
(TOBAGO-499) Create direct jdk 1.4 compatible version of the tobago-facelets lib without retrotranslator
Modified:
myfaces/tobago/trunk/extension/facelets/pom.xml
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
Modified: myfaces/tobago/trunk/extension/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/pom.xml?rev=583160&r1=583159&r2=583160&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/pom.xml Tue Oct 9 06:29:09 2007
@@ -35,7 +35,7 @@
<build>
<plugins>
- <!--plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
@@ -45,7 +45,7 @@
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
</configuration>
- </plugin-->
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=583160&r1=583159&r2=583160&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Tue Oct 9 06:29:09 2007
@@ -21,7 +21,7 @@
import com.sun.facelets.tag.MetaRuleset;
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentHandler;
-import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_COMPONENT_CREATED;
+import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.component.OnComponentCreated;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UIInput;
@@ -67,8 +67,8 @@
protected void onComponentCreated(FaceletContext context, UIComponent component,
UIComponent parent) {
if (component instanceof OnComponentCreated
- && component.getAttributes().get(TOBAGO_COMPONENT_CREATED) == null) {
- component.getAttributes().put(TOBAGO_COMPONENT_CREATED, Boolean.TRUE);
+ && component.getAttributes().get(TobagoConstants.TOBAGO_COMPONENT_CREATED) == null) {
+ component.getAttributes().put(TobagoConstants.TOBAGO_COMPONENT_CREATED, Boolean.TRUE);
((OnComponentCreated) component).onComponentCreated();
}
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=583160&r1=583159&r2=583160&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Tue Oct 9 06:29:09 2007
@@ -132,7 +132,9 @@
private boolean checkForAlreadyCreated(UIComponent panel, String uid) {
if (panel.getChildCount() > 0) {
- for (UIComponent child:(List<UIComponent>) panel.getChildren()) {
+ List list = panel.getChildren();
+ for (int i = 0; i < list.size(); i++) {
+ UIComponent child = (UIComponent) list.get(i);
if (uid.equals(child.getId())) {
return true;
}
@@ -159,7 +161,9 @@
protected MetaRuleset createMetaRuleset(Class aClass) {
MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
if (UIPanel.class.isAssignableFrom(aClass)) {
- for (TagAttribute attr : tag.getAttributes().getAll()) {
+ TagAttribute [] attrs = tag.getAttributes().getAll();
+ for (int i = 0; i < attrs.length; i++) {
+ TagAttribute attr = attrs[i];
if (!attr.getLocalName().equals("rendered")) {
metaRuleset.ignore(attr.getLocalName());
}
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java?rev=583160&r1=583159&r2=583160&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java Tue Oct 9 06:29:09 2007
@@ -74,7 +74,9 @@
metaRuleset.ignore(TobagoConstants.ATTR_VALUE);
return metaRuleset;
} else {
- for (TagAttribute attr : tag.getAttributes().getAll()) {
+ TagAttribute [] attrs = tag.getAttributes().getAll();
+ for (int i = 0; i < attrs.length; i++) {
+ TagAttribute attr = attrs[i];
if (!(attr.getLocalName().equals(TobagoConstants.ATTR_CONVERTER)
|| attr.getLocalName().equals(TobagoConstants.ATTR_VALUE))) {
metaRuleset.ignore(attr.getLocalName());