You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/04/04 17:27:25 UTC
svn commit: r391338 - in
/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib:
component/ decl/ extension/
Author: lofwyr
Date: Tue Apr 4 08:27:20 2006
New Revision: 391338
URL: http://svn.apache.org/viewcvs?rev=391338&view=rev
Log:
declare old width and height attributes as deprecated for all tag instead of tc:page, tc:image and tc:popup, all other tag should get their dimensions from a layout manager
Added:
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java (with props)
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java (with props)
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java (with props)
Modified:
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/RichTextEditorTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelAndAccessKey.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelWithAccessKey.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -18,7 +18,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.taglib.decl.HasDimension;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
@@ -31,5 +31,5 @@
rendererType = "Box")
public interface BoxTagDeclaration extends TobagoBodyTagDeclaration,
- HasIdBindingAndRendered, HasDimension, HasLabel {
+ HasIdBindingAndRendered, HasDeprecatedDimension, HasLabel {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTag.java Tue Apr 4 08:27:20 2006
@@ -28,6 +28,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL_WITH_ACCESS_KEY;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.faces.component.UIComponent;
@@ -38,6 +40,8 @@
public class ButtonTag extends CommandTag
implements ButtonTagDeclaration {
+ private static final Log LOG = LogFactory.getLog(ButtonTag.class);
+
private String label;
private String image;
private String accessKey;
@@ -46,6 +50,7 @@
private String defaultCommand;
+ @Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
@@ -56,6 +61,7 @@
ComponentUtil.setBooleanProperty(component, ATTR_DEFAULT_COMMAND, defaultCommand);
}
+ @Override
public void release() {
super.release();
label = null;
@@ -83,10 +89,12 @@
this.image = image;
}
+ @Override
public String getLabel() {
return label;
}
+ @Override
public void setLabel(String label) {
this.label = label;
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -22,11 +22,11 @@
import org.apache.myfaces.tobago.taglib.decl.HasAction;
import org.apache.myfaces.tobago.taglib.decl.HasActionListener;
import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasImage;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
-import org.apache.myfaces.tobago.taglib.decl.HasWidth;
import org.apache.myfaces.tobago.taglib.decl.IsDefaultCommand;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsImmediateCommand;
@@ -52,5 +52,5 @@
public interface ButtonTagDeclaration extends CommandTagDeclaration,
HasIdBindingAndRendered, HasLabelAndAccessKey, HasImage,
IsDisabled, HasAction, HasActionListener, HasCommandType,
- IsImmediateCommand, IsDefaultCommand, HasWidth, HasTip, IsInline {
+ IsImmediateCommand, IsDefaultCommand, HasDeprecatedWidth, HasTip, IsInline {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTag.java Tue Apr 4 08:27:20 2006
@@ -20,6 +20,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_BORDER;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
import org.apache.myfaces.tobago.component.ComponentUtil;
import javax.faces.component.UIComponent;
@@ -31,25 +33,34 @@
private String alt;
private String border;
private String tip;
+ private String width;
+ private String height;
+ @Override
public String getComponentType() {
return UIGraphic.COMPONENT_TYPE;
}
+ @Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
ComponentUtil.setStringProperty(component, ATTR_ALT, alt);
ComponentUtil.setStringProperty(component, ATTR_BORDER, border);
ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ ComponentUtil.setStringProperty(component, ATTR_WIDTH, width);
+ ComponentUtil.setStringProperty(component, ATTR_HEIGHT, height);
}
+ @Override
public void release() {
super.release();
this.alt = null;
this.border = null;
this.value = null;
this.tip = null;
+ width = null;
+ height = null;
}
public String getValue() {
@@ -82,5 +93,21 @@
public void setTip(String tip) {
this.tip = tip;
+ }
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public String getHeight() {
+ return height;
+ }
+
+ public void setHeight(String height) {
+ this.height = height;
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -20,13 +20,13 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasOnchangeListener;
import org.apache.myfaces.tobago.taglib.decl.HasSuggestMethod;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
-import org.apache.myfaces.tobago.taglib.decl.HasWidth;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
@@ -49,7 +49,7 @@
rendererType = "In")
public interface InTagDeclaration
extends TextInputTagDeclaration, HasValue, HasIdBindingAndRendered,
- HasConverter, IsReadonly, IsDisabled, HasWidth, HasOnchangeListener,
+ HasConverter, IsReadonly, IsDisabled, HasDeprecatedWidth, HasOnchangeListener,
IsInline, IsFocus, IsRequired, HasTip, HasLabelAndAccessKey,
IsPassword, HasSuggestMethod {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -21,12 +21,12 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
import org.apache.myfaces.tobago.taglib.decl.HasFor;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabelWithAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
-import org.apache.myfaces.tobago.taglib.decl.HasWidth;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
/*
@@ -43,7 +43,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UILabel",
rendererType = "Label")
public interface LabelTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered,
- HasLabelWithAccessKey, HasFor, IsInline, HasWidth, HasTip, HasValue {
+ HasLabelWithAccessKey, HasFor, IsInline, HasDeprecatedWidth, HasTip, HasValue {
/**
* Text value to display as label. Overwritten by 'labelWithAccessKey'
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -19,8 +19,8 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
-import org.apache.myfaces.tobago.taglib.decl.HasWidth;
/*
* Created by IntelliJ IDEA.
@@ -44,5 +44,5 @@
@UIComponentTag(
uiComponent = "javax.faces.component.UIPanel",
rendererType = "MenuBar")
-public interface MenuBarTagDeclaration extends TobagoBodyTagDeclaration, HasIdBindingAndRendered, HasWidth {
+public interface MenuBarTagDeclaration extends TobagoBodyTagDeclaration, HasIdBindingAndRendered, HasDeprecatedWidth {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Tue Apr 4 08:27:20 2006
@@ -21,6 +21,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_METHOD;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STATE;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.component.UIPopup;
@@ -29,8 +31,6 @@
import javax.servlet.jsp.JspException;
import java.util.List;
-
-
public class PageTag extends TobagoBodyTag
implements PageTagDeclaration {
@@ -45,6 +45,9 @@
private String label;
+ private String width;
+
+ private String height;
public int doEndTag() throws JspException {
UIPage page = (UIPage) getComponentInstance();
@@ -71,6 +74,8 @@
state = null;
focusId = null;
label = null;
+ width = null;
+ height = null;
}
protected void setProperties(UIComponent component) {
@@ -80,10 +85,10 @@
ComponentUtil.setStringProperty(component, ATTR_FOCUS_ID, focusId);
ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
ComponentUtil.setValueBinding(component, ATTR_STATE, state);
+ ComponentUtil.setStringProperty(component, ATTR_WIDTH, width);
+ ComponentUtil.setStringProperty(component, ATTR_HEIGHT, height);
}
-
-
public void setDoctype(String doctype) {
this.doctype = doctype;
}
@@ -110,6 +115,22 @@
public void setLabel(String label) {
this.label = label;
+ }
+
+ public String getWidth() {
+ return width;
+ }
+
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ public String getHeight() {
+ return height;
+ }
+
+ public void setHeight(String height) {
+ this.height = height;
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -18,7 +18,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.taglib.decl.HasDimension;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
/*
@@ -37,5 +37,5 @@
uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
rendererType = "Panel")
public interface PanelTagDeclaration extends TobagoBodyTagDeclaration,
- HasIdBindingAndRendered, HasDimension {
+ HasIdBindingAndRendered, HasDeprecatedDimension {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -25,11 +25,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
/*
- * Created by IntelliJ IDEA.
* User: bommel
* Date: 02.04.2006
* Time: 16:11:02
- * To change this template use File | Settings | File Templates.
*/
/**
* Renders a popup panel.
@@ -39,9 +37,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UIPopup",
rendererType = "Popup")
public interface PopupTagDeclaration extends TobagoBodyTagDeclaration, HasId, IsRendered, HasDimension {
- /**
- *
- */
+
@TagAttribute
@UIComponentTagAttribute()
void setLeft(String left);
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/RichTextEditorTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/RichTextEditorTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/RichTextEditorTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/RichTextEditorTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -21,7 +21,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasValue;
-import org.apache.myfaces.tobago.taglib.decl.HasWidth;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedWidth;
/*
* Created: Aug 5, 2005 4:58:19 PM
@@ -33,7 +33,7 @@
*/
// TODO: switched off @Tag(name="richTextEditor")
public interface RichTextEditorTagDeclaration extends TextInputTagDeclaration,
- HasIdBindingAndRendered, HasValue, HasLabelAndAccessKey, HasWidth {
+ HasIdBindingAndRendered, HasValue, HasLabelAndAccessKey, HasDeprecatedWidth {
@TagAttribute @UIComponentTagAttribute(type = "java.lang.Boolean")
void setStatePreview(String statePreview);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -27,6 +27,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedHeight;
/*
* Created: Aug 5, 2005 5:58:55 PM
@@ -43,6 +44,6 @@
public interface SelectManyListboxTagDeclaration
extends SelectManyTagDeclaration, HasId, HasValue, IsDisabled,
- HasHeight, IsInline, HasLabelAndAccessKey, IsRendered, HasBinding, HasTip {
+ HasDeprecatedHeight, IsInline, HasLabelAndAccessKey, IsRendered, HasBinding, HasTip {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -31,6 +31,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedHeight;
/*
* Created: Aug 5, 2005 6:08:24 PM
@@ -46,7 +47,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneListbox")
public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, HasValue, IsDisabled,
- IsReadonly, HasOnchangeListener, HasLabelAndAccessKey, IsRendered, HasBinding, HasHeight, HasTip {
+ IsReadonly, HasOnchangeListener, HasLabelAndAccessKey, IsRendered, HasBinding, HasDeprecatedHeight, HasTip {
/**
* Flag indicating that selecting an Item representing a Value is Required.
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java Tue Apr 4 08:27:20 2006
@@ -30,7 +30,7 @@
import static org.apache.myfaces.tobago.component.UITabGroup.SWITCH_TYPE_CLIENT;
import static org.apache.myfaces.tobago.component.UITabGroup.SWITCH_TYPE_RELOAD_PAGE;
import static org.apache.myfaces.tobago.component.UITabGroup.SWITCH_TYPE_RELOAD_TAB;
-import org.apache.myfaces.tobago.taglib.decl.HasDimension;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasState;
@@ -45,7 +45,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UITabGroup",
rendererType = "TabGroupTag")
public class TabGroupTag extends TobagoTag
- implements HasIdBindingAndRendered, HasDimension, HasState {
+ implements HasIdBindingAndRendered, HasDeprecatedDimension, HasState {
private static final Log LOG = LogFactory.getLog(TabGroupTag.class);
@@ -53,10 +53,12 @@
private String state;
private String switchType;
+ @Override
public String getComponentType() {
return UITabGroup.COMPONENT_TYPE;
}
+ @Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
ComponentUtil.setValueBinding(component, ATTR_STATE, state);
@@ -82,6 +84,7 @@
}
+ @Override
public void release() {
super.release();
serverside = null;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java Tue Apr 4 08:27:20 2006
@@ -21,7 +21,7 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
-import org.apache.myfaces.tobago.taglib.decl.HasDimension;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasOnchangeListener;
@@ -46,7 +46,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UIInput",
rendererType = "Textarea")
public interface TextAreaTagDeclaration extends TextInputTagDeclaration, HasIdBindingAndRendered,
- HasValue, HasConverter, IsReadonly, IsDisabled, HasDimension, HasOnchangeListener,
+ HasValue, HasConverter, IsReadonly, IsDisabled, HasDeprecatedDimension, HasOnchangeListener,
IsFocus, IsRequired, HasLabelAndAccessKey, HasTip {
/**
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java Tue Apr 4 08:27:20 2006
@@ -93,9 +93,14 @@
ComponentUtil.setBooleanProperty(component, ATTR_HIDDEN, hidden);
ComponentUtil.setBooleanProperty(component, ATTR_INLINE, inline);
+ if (width != null) {
+ LOG.warn("the with attribute is deprecated, please use a layout manager. (" + getClass().getSimpleName() + ")");
+ }
ComponentUtil.setStringProperty(component, ATTR_WIDTH, width);
+ if (height != null) {
+ LOG.warn("the height attribute is deprecated, please use a layout manager. (" + getClass().getSimpleName() + ")");
+ }
ComponentUtil.setStringProperty(component, ATTR_HEIGHT, height);
-
}
public String getDisabled() {
Added: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java?rev=391338&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java (added)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java Tue Apr 4 08:27:20 2006
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2006 Atanion GmbH, Germany
+ * All rights reserved. Created 04.04.2006 16:31:40.
+ * $Id$
+ */
+package org.apache.myfaces.tobago.taglib.decl;
+
+/**
+ * Created: Apr 9, 2005 2:32:53 PM
+ * User: bommel
+ * $Id$
+ */
+@Deprecated
+public interface HasDeprecatedDimension extends HasDeprecatedWidth, HasDeprecatedHeight{
+
+}
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedDimension.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java?rev=391338&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java (added)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java Tue Apr 4 08:27:20 2006
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2006 Atanion GmbH, Germany
+ * All rights reserved. Created 04.04.2006 16:32:54.
+ * $Id$
+ */
+package org.apache.myfaces.tobago.taglib.decl;
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+/**
+ * $Id$
+ */
+@Deprecated
+public interface HasDeprecatedHeight {
+ /**
+ * The height for this component.
+ */
+ @TagAttribute @UIComponentTagAttribute()
+ void setHeight(String height);
+}
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedHeight.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java?rev=391338&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java (added)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java Tue Apr 4 08:27:20 2006
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2006 Atanion GmbH, Germany
+ * All rights reserved. Created 04.04.2006 16:32:01.
+ * $Id$
+ */
+package org.apache.myfaces.tobago.taglib.decl;
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+/**
+ * $Id$
+ */
+@Deprecated
+public interface HasDeprecatedWidth {
+ /**
+ * The width for this component.
+ */
+ @TagAttribute @UIComponentTagAttribute()
+ void setWidth(String width);
+}
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasDeprecatedWidth.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelAndAccessKey.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelAndAccessKey.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelAndAccessKey.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelAndAccessKey.java Tue Apr 4 08:27:20 2006
@@ -22,5 +22,6 @@
/**
* $Id$
*/
+@Deprecated
public interface HasLabelAndAccessKey extends HasLabel, HasLabelWithAccessKey {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelWithAccessKey.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelWithAccessKey.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelWithAccessKey.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasLabelWithAccessKey.java Tue Apr 4 08:27:20 2006
@@ -22,6 +22,7 @@
/**
* $Id$
*/
+@Deprecated
public interface HasLabelWithAccessKey {
/**
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Tue Apr 4 08:27:20 2006
@@ -20,7 +20,7 @@
import org.apache.myfaces.tobago.taglib.component.SelectManyListboxTag;
import org.apache.myfaces.tobago.taglib.decl.HasBinding;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
-import org.apache.myfaces.tobago.taglib.decl.HasHeight;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedHeight;
import org.apache.myfaces.tobago.taglib.decl.HasId;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
@@ -42,7 +42,7 @@
*/
@Tag(name = "selectManyListbox")
public class SelectManyListboxExtensionTag extends BodyTagSupport
- implements HasId, HasValue, IsDisabled, HasHeight, IsInline,
+ implements HasId, HasValue, IsDisabled, HasDeprecatedHeight, IsInline,
HasLabel, //HasLabelAndAccessKey,
IsRendered, HasBinding, HasTip, HasConverter, HasValidator {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=391338&r1=391337&r2=391338&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Tue Apr 4 08:27:20 2006
@@ -20,7 +20,7 @@
import org.apache.myfaces.tobago.taglib.component.SelectOneListboxTag;
import org.apache.myfaces.tobago.taglib.decl.HasBinding;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
-import org.apache.myfaces.tobago.taglib.decl.HasHeight;
+import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedHeight;
import org.apache.myfaces.tobago.taglib.decl.HasId;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
import org.apache.myfaces.tobago.taglib.decl.HasOnchangeListener;
@@ -50,7 +50,7 @@
extends BodyTagSupport implements HasId, HasValue, IsDisabled,
HasLabel, // HasLabelAndAccessKey,
IsReadonly, HasOnchangeListener, IsRendered,
- HasBinding, HasHeight, HasTip , IsRequired, HasConverter, HasValidator {
+ HasBinding, HasDeprecatedHeight, HasTip , IsRequired, HasConverter, HasValidator {
private String required;
private String value;
private String disabled;