svn commit: r565692 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java

[bo...@apache.org]

Author: bommel
Date: Tue Aug 14 03:14:57 2007
New Revision: 565692

URL: http://svn.apache.org/viewvc?view=rev&rev=565692
Log:
(TOBAGO-469) ObjectTag stores the src attribute under the target attribute instead of src
(TOBAGO-468) iframe in ObjectRenderer has no id

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java?view=diff&rev=565692&r1=565691&r2=565692
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java Tue Aug 14 03:14:57 2007
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SRC;
 import org.apache.myfaces.tobago.component.ComponentUtil;
 
 import javax.faces.component.UIComponent;
@@ -34,7 +34,7 @@
 
   protected void setProperties(UIComponent component) {
     super.setProperties(component);
-    ComponentUtil.setStringProperty(component, ATTR_TARGET, src);
+    ComponentUtil.setStringProperty(component, ATTR_SRC, src);
   }
 
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java?view=diff&rev=565692&r1=565691&r2=565692
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Tue Aug 14 03:14:57 2007
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SRC;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -34,7 +34,8 @@
       throws IOException {
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
     writer.startElement(HtmlConstants.IFRAME, component);
-    writer.writeAttributeFromComponent(HtmlAttributes.SRC, ATTR_TARGET);
+    writer.writeIdAttribute(component.getClientId(facesContext));
+    writer.writeAttributeFromComponent(HtmlAttributes.SRC, ATTR_SRC);
     writer.writeClassAttribute();
     writer.writeStyleAttribute();
 
@@ -42,8 +43,8 @@
         facesContext, "tobago", "browser.noframe.message.prefix");
     writer.writeText(noframes + " ");
     writer.startElement(HtmlConstants.A, component);
-    writer.writeAttributeFromComponent(HtmlAttributes.HREF, ATTR_TARGET);
-    writer.writeTextFromComponent(ATTR_TARGET);
+    writer.writeAttributeFromComponent(HtmlAttributes.HREF, ATTR_SRC);
+    writer.writeTextFromComponent(ATTR_SRC);
     writer.endElement(HtmlConstants.A);
     noframes = ResourceManagerUtil.getPropertyNotNull(
         facesContext, "tobago", "browser.noframe.message.postfix");