Author: nbelaevski
Date: 2011-04-01 11:13:53 -0400 (Fri, 01 Apr 2011)
New Revision: 22354
Modified:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/faces/VariableMapperImpl.java
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractMediaOutput.java
Log:
Minor cleanup in core
Added a4jSkin variable in resources plugin
Modified:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/faces/VariableMapperImpl.java
===================================================================
---
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/faces/VariableMapperImpl.java 2011-04-01
15:12:51 UTC (rev 22353)
+++
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/faces/VariableMapperImpl.java 2011-04-01
15:13:53 UTC (rev 22354)
@@ -62,7 +62,7 @@
*/
@Override
public ValueExpression resolveVariable(String variable) {
- if ("richSkin".equals(variable)) {
+ if ("richSkin".equals(variable) ||
"a4jSkin".equals(variable)) {
return SKIN_VALUE_EXPRESSION;
} else if ("resource".equals(variable)) {
return RESOURCE_VALUE_EXPRESSION;
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractMediaOutput.java
===================================================================
---
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2011-04-01
15:12:51 UTC (rev 22353)
+++
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2011-04-01
15:13:53 UTC (rev 22354)
@@ -30,7 +30,6 @@
import javax.faces.application.ResourceHandler;
import javax.faces.component.UIOutput;
-import org.ajax4jsf.resource.ResourceComponent;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.JsfComponent;
@@ -47,7 +46,7 @@
tag = @Tag(generate = false, handler =
"org.richfaces.view.facelets.html.MediaOutputHandler", type =
TagType.Facelets),
renderer = @JsfRenderer(type = "org.richfaces.MediaOutputRenderer")
)
-public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent
{
+public abstract class AbstractMediaOutput extends UIOutput {
public static final String COMPONENT_TYPE = "org.richfaces.MediaOutput";
@@ -131,6 +130,8 @@
@Attribute
public abstract MethodExpression getCreateContent();
+
+ public abstract void setCreateContent(MethodExpression createContent);
@Attribute
public abstract String getRel();
@@ -171,6 +172,9 @@
@Attribute
public abstract String getFileName();
+ @Attribute
+ public abstract Object getValue();
+
@Attribute(events = @EventName("blur"))
public abstract String getOnblur();
@@ -207,15 +211,4 @@
@Attribute(events = @EventName("mouseup"))
public abstract String getOnmouseup();
- @Deprecated
- public boolean isSession() {
- return true;
- }
-
- @Deprecated
- public void setSession(boolean session) {
- if (!session) {
- // TODO: log
- }
- }
}
Show replies by date