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/02/03 10:18:05 UTC
svn commit: r503187 -
/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/
Author: bommel
Date: Sat Feb 3 01:18:04 2007
New Revision: 503187
URL: http://svn.apache.org/viewvc?view=rev&rev=503187
Log:
some cleanups
Modified:
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/UIPageRule.java
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Sat Feb 3 01:18:04 2007
@@ -37,8 +37,7 @@
import org.apache.myfaces.tobago.component.UICommand;
public final class AttributeHandler extends TagHandler {
- private static final Class [] VALIDATOR =
- new Class[] {FacesContext.class, UIComponent.class, Object.class};
+ private static final Class [] VALIDATOR = new Class[] {FacesContext.class, UIComponent.class, Object.class};
private final TagAttribute name;
@@ -46,8 +45,8 @@
public AttributeHandler(TagConfig config) {
super(config);
- this.name = this.getRequiredAttribute("name");
- this.value = this.getRequiredAttribute("value");
+ this.name = getRequiredAttribute("name");
+ this.value = getRequiredAttribute("value");
}
public void apply(FaceletContext ctx, UIComponent parent)
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java Sat Feb 3 01:18:04 2007
@@ -22,6 +22,7 @@
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.tag.TagAttributeException;
import com.sun.facelets.tag.TagException;
+import com.sun.facelets.tag.jsf.ComponentSupport;
import com.sun.facelets.FaceletContext;
import javax.faces.component.UIComponent;
@@ -41,12 +42,10 @@
*/
public class ConverterHandler extends TagHandler {
-
private final TagAttribute converterId;
private final TagAttribute binding;
-
public ConverterHandler(TagConfig config) {
super(config);
binding = getAttribute("binding");
@@ -56,8 +55,7 @@
public void apply(FaceletContext faceletContext, UIComponent parent)
throws IOException, FacesException, ELException {
if (parent instanceof ValueHolder) {
- // only process if parent was just created
- if (parent.getParent() == null) {
+ if (ComponentSupport.isNew(parent)) {
ValueHolder valueHolder = (ValueHolder) parent;
Converter converter = null;
ValueExpression valueExpression = null;
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java Sat Feb 3 01:18:04 2007
@@ -26,7 +26,6 @@
import java.io.IOException;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 19.04.2006
* Time: 20:23:15
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java Sat Feb 3 01:18:04 2007
@@ -32,7 +32,6 @@
import java.io.IOException;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 20.04.2006
* Time: 19:35:29
@@ -44,8 +43,8 @@
public LoadBundleHandler(TagConfig config) {
super(config);
- this.basename = this.getRequiredAttribute("basename");
- this.var = this.getRequiredAttribute("var");
+ this.basename = getRequiredAttribute("basename");
+ this.var = getRequiredAttribute("var");
}
public void apply(FaceletContext faceletContext, UIComponent parent)
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java Sat Feb 3 01:18:04 2007
@@ -21,6 +21,7 @@
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagException;
+import com.sun.facelets.tag.jsf.ComponentSupport;
import com.sun.facelets.FaceletContext;
import javax.el.ELException;
@@ -32,7 +33,6 @@
import org.apache.myfaces.tobago.event.PopupActionListener;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: Jan 4, 2007
* Time: 6:25:09 PM
@@ -49,8 +49,7 @@
public void apply(FaceletContext faceletContext, UIComponent parent)
throws IOException, FacesException, ELException {
if (parent instanceof ActionSource) {
- // only process if parent was just created
- if (parent.getParent() == null) {
+ if (ComponentSupport.isNew(parent)) {
ActionSource actionSource = (ActionSource) parent;
actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
}
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java Sat Feb 3 01:18:04 2007
@@ -27,13 +27,12 @@
import org.apache.myfaces.tobago.event.SheetStateChangeSource;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 15.04.2006
* Time: 14:25:10
*/
public class SheetStateChangeSourceRule extends MetaRule {
- static final Class[] ACTION_LISTENER_SIG = new Class[]{SheetStateChangeEvent.class};
+ static final Class[] ACTION_LISTENER = new Class[]{SheetStateChangeEvent.class};
public static final SheetStateChangeSourceRule INSTANCE = new SheetStateChangeSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
@@ -58,7 +57,7 @@
((SheetStateChangeSource) instance)
.setStateChangeListener(new LegacyMethodBinding(attribute
.getMethodExpression(ctx, null,
- SortActionSourceRule.ACTION_LISTENER_SIG)));
+ SheetStateChangeSourceRule.ACTION_LISTENER)));
}
}
}
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java Sat Feb 3 01:18:04 2007
@@ -27,13 +27,12 @@
import org.apache.myfaces.tobago.event.SortActionEvent;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 15.04.2006
* Time: 13:53:41
*/
public class SortActionSourceRule extends MetaRule {
- static final Class[] ACTION_LISTENER_SIG = new Class[]{SortActionEvent.class};
+ static final Class[] ACTION_LISTENER = new Class[]{SortActionEvent.class};
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
@@ -58,7 +57,7 @@
((SortActionSource) instance)
.setSortActionListener(new LegacyMethodBinding(attribute
.getMethodExpression(ctx, null,
- SortActionSourceRule.ACTION_LISTENER_SIG)));
+ SortActionSourceRule.ACTION_LISTENER)));
}
}
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java Sat Feb 3 01:18:04 2007
@@ -37,7 +37,6 @@
import javax.el.ELException;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 20.04.2006
* Time: 18:14:11
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java Sat Feb 3 01:18:04 2007
@@ -27,13 +27,12 @@
import org.apache.myfaces.tobago.event.TabChangeEvent;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 15.04.2006
* Time: 14:24:54
*/
public class TabChangeSourceRule extends MetaRule {
- static final Class[] ACTION_LISTENER_SIG = new Class[]{TabChangeEvent.class};
+ static final Class[] ACTION_LISTENER = new Class[]{TabChangeEvent.class};
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
@@ -58,7 +57,7 @@
((TabChangeSource) instance)
.setTabChangeListener(new LegacyMethodBinding(attribute
.getMethodExpression(ctx, null,
- SortActionSourceRule.ACTION_LISTENER_SIG)));
+ TabChangeSourceRule.ACTION_LISTENER)));
}
}
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Sat Feb 3 01:18:04 2007
@@ -32,7 +32,6 @@
import javax.faces.component.UIComponent;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 15.04.2006
* Time: 13:31:39
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/UIPageRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/UIPageRule.java?view=diff&rev=503187&r1=503186&r2=503187
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/UIPageRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/UIPageRule.java Sat Feb 3 01:18:04 2007
@@ -29,7 +29,6 @@
import javax.faces.component.UIComponent;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: Jan 2, 2007
* Time: 3:35:58 PM