myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1793807 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago: component/ facelets/ internal/component/ internal/renderkit/renderer/ internal/taglib/component/
Date Thu, 04 May 2017 14:09:51 GMT
Author: lofwyr
Date: Thu May  4 14:09:50 2017
New Revision: 1793807

URL: http://svn.apache.org/viewvc?rev=1793807&view=rev
Log:
TOBAGO-1738: No UIComponents for <tc:script> and <tc:style>.

Added:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIScript.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIStyle.java
Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
Thu May  4 14:09:50 2017
@@ -61,6 +61,8 @@ public enum RendererTypes {
   Popup,
   Progress,
   Row,
+  /** @deprecated since 3.1.0 */
+  @Deprecated
   Script,
   Section,
   SegmentLayout,
@@ -79,6 +81,8 @@ public enum RendererTypes {
   Separator,
   Sheet,
   SheetPageCommand,
+  /** @deprecated since 3.1.0 */
+  @Deprecated
   Style,
   Suggest,
   Textarea,
@@ -133,6 +137,8 @@ public enum RendererTypes {
   public static final String POPUP = "Popup";
   public static final String PROGRESS = "Progress";
   public static final String ROW = "Row";
+  /** @deprecated since 3.1.0 */
+  @Deprecated
   public static final String SCRIPT = "Script";
   public static final String SECTION = "Section";
   public static final String SEGMENT_LAYOUT = "SegmentLayout";
@@ -151,6 +157,8 @@ public enum RendererTypes {
   public static final String SEPARATOR = "Separator";
   public static final String SHEET = "Sheet";
   public static final String SHEET_PAGE_COMMAND = "SheetPageCommand";
+  /** @deprecated since 3.1.0 */
+  @Deprecated
   public static final String STYLE = "Style";
   public static final String SUGGEST = "Suggest";
   public static final String TEXTAREA = "Textarea";

Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIScript.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIScript.java?rev=1793807&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIScript.java
(added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIScript.java
Thu May  4 14:09:50 2017
@@ -0,0 +1,54 @@
+package org.apache.myfaces.tobago.component;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.internal.component.AbstractUIScript;
+
+/**
+ * @deprecated Since Tobago 3.1.0. The tag &lt;tc:script&gt; is using a handler
+ * now: {@link org.apache.myfaces.tobago.facelets.ScriptHandler}.
+ */
+@Deprecated
+public class UIScript
+    extends AbstractUIScript {
+
+  public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Script";
+
+  public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.Script";
+
+  enum PropertyKeys {
+    file,
+  }
+
+  public String getFamily() {
+    return COMPONENT_FAMILY;
+  }
+
+  /**
+   * File name to include into the rendered page. The name must be full qualified, or relative.
+   * If using a complete path from root, you'll need to add the contextPath from the web
application.
+   * This can be done with the EL #{request.contextPath}.
+   */
+  public java.lang.String getFile() {
+    return (java.lang.String) getStateHelper().eval(PropertyKeys.file);
+  }
+
+  public void setFile(java.lang.String file) {
+    getStateHelper().put(PropertyKeys.file, file);
+  }
+}

Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIStyle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIStyle.java?rev=1793807&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIStyle.java
(added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIStyle.java
Thu May  4 14:09:50 2017
@@ -0,0 +1,355 @@
+package org.apache.myfaces.tobago.component;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.layout.Measure;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * <p>
+ * Add a style tag with the given file name to the header (using file attribute) or add
+ * some CSS styles to the parent component.
+ * </p>
+ * UIComponent class, generated from template {@code component.stg} with class
+ * {@link org.apache.myfaces.tobago.internal.taglib.component.StyleTagDeclaration}.
+ *
+ * @deprecated Since Tobago 3.1.0. The tag &lt;tc:style&gt; is using a handler
+ * now: {@link org.apache.myfaces.tobago.facelets.StyleHandler}.
+ */
+@Deprecated
+public class UIStyle extends UIComponentBase {
+
+  public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Style";
+
+  public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.Style";
+
+  enum PropertyKeys {
+    paddingRight,
+    minHeight,
+    marginRight,
+    file,
+    paddingBottom,
+    top,
+    maxHeight,
+    paddingTop,
+    height,
+    maxWidth,
+    textAlign,
+    bottom,
+    display,
+    minWidth,
+    right,
+    marginLeft,
+    overflowX,
+    overflowY,
+    left,
+    width,
+    customClass,
+    marginBottom,
+    position,
+    paddingLeft,
+    marginTop,
+  }
+
+  public String getFamily() {
+    return COMPONENT_FAMILY;
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getPaddingRight() {
+    Object object = getStateHelper().eval(PropertyKeys.paddingRight);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setPaddingRight(org.apache.myfaces.tobago.layout.Measure paddingRight) {
+    getStateHelper().put(PropertyKeys.paddingRight, paddingRight);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMinHeight() {
+    Object object = getStateHelper().eval(PropertyKeys.minHeight);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMinHeight(org.apache.myfaces.tobago.layout.Measure minHeight) {
+    getStateHelper().put(PropertyKeys.minHeight, minHeight);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMarginRight() {
+    Object object = getStateHelper().eval(PropertyKeys.marginRight);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMarginRight(org.apache.myfaces.tobago.layout.Measure marginRight) {
+    getStateHelper().put(PropertyKeys.marginRight, marginRight);
+  }
+
+  /**
+   * Name of the stylesheet file to add to page. The name must be full qualified, or relative.
+   * If using a complete path from root, you'll need to add the contextPath from the web
application.
+   * This can be done with the EL #{request.contextPath}.
+   */
+  public java.lang.String getFile() {
+    return (java.lang.String) getStateHelper().eval(PropertyKeys.file);
+  }
+
+  public void setFile(java.lang.String file) {
+    getStateHelper().put(PropertyKeys.file, file);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getPaddingBottom() {
+    Object object = getStateHelper().eval(PropertyKeys.paddingBottom);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setPaddingBottom(org.apache.myfaces.tobago.layout.Measure paddingBottom) {
+    getStateHelper().put(PropertyKeys.paddingBottom, paddingBottom);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getTop() {
+    Object object = getStateHelper().eval(PropertyKeys.top);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setTop(org.apache.myfaces.tobago.layout.Measure top) {
+    getStateHelper().put(PropertyKeys.top, top);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMaxHeight() {
+    Object object = getStateHelper().eval(PropertyKeys.maxHeight);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMaxHeight(org.apache.myfaces.tobago.layout.Measure maxHeight) {
+    getStateHelper().put(PropertyKeys.maxHeight, maxHeight);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getPaddingTop() {
+    Object object = getStateHelper().eval(PropertyKeys.paddingTop);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setPaddingTop(org.apache.myfaces.tobago.layout.Measure paddingTop) {
+    getStateHelper().put(PropertyKeys.paddingTop, paddingTop);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getHeight() {
+    Object object = getStateHelper().eval(PropertyKeys.height);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setHeight(org.apache.myfaces.tobago.layout.Measure height) {
+    getStateHelper().put(PropertyKeys.height, height);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMaxWidth() {
+    Object object = getStateHelper().eval(PropertyKeys.maxWidth);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMaxWidth(org.apache.myfaces.tobago.layout.Measure maxWidth) {
+    getStateHelper().put(PropertyKeys.maxWidth, maxWidth);
+  }
+
+  /**
+   * The alignment of the elements inside of the container, possible values are:
+   * {
+   * <br>Allowed Values: <code>left,right,center,justify</code>
+   */
+  public org.apache.myfaces.tobago.layout.TextAlign getTextAlign() {
+    return (org.apache.myfaces.tobago.layout.TextAlign) getStateHelper().eval(PropertyKeys.textAlign);
+  }
+
+  public void setTextAlign(org.apache.myfaces.tobago.layout.TextAlign textAlign) {
+    getStateHelper().put(PropertyKeys.textAlign, textAlign);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getBottom() {
+    Object object = getStateHelper().eval(PropertyKeys.bottom);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setBottom(org.apache.myfaces.tobago.layout.Measure bottom) {
+    getStateHelper().put(PropertyKeys.bottom, bottom);
+  }
+
+  public org.apache.myfaces.tobago.layout.Display getDisplay() {
+    return (org.apache.myfaces.tobago.layout.Display) getStateHelper().eval(PropertyKeys.display);
+  }
+
+  public void setDisplay(org.apache.myfaces.tobago.layout.Display display) {
+    getStateHelper().put(PropertyKeys.display, display);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMinWidth() {
+    Object object = getStateHelper().eval(PropertyKeys.minWidth);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMinWidth(org.apache.myfaces.tobago.layout.Measure minWidth) {
+    getStateHelper().put(PropertyKeys.minWidth, minWidth);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getRight() {
+    Object object = getStateHelper().eval(PropertyKeys.right);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setRight(org.apache.myfaces.tobago.layout.Measure right) {
+    getStateHelper().put(PropertyKeys.right, right);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMarginLeft() {
+    Object object = getStateHelper().eval(PropertyKeys.marginLeft);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMarginLeft(org.apache.myfaces.tobago.layout.Measure marginLeft) {
+    getStateHelper().put(PropertyKeys.marginLeft, marginLeft);
+  }
+
+  public org.apache.myfaces.tobago.layout.Overflow getOverflowX() {
+    return (org.apache.myfaces.tobago.layout.Overflow) getStateHelper().eval(PropertyKeys.overflowX);
+  }
+
+  public void setOverflowX(org.apache.myfaces.tobago.layout.Overflow overflowX) {
+    getStateHelper().put(PropertyKeys.overflowX, overflowX);
+  }
+
+  public org.apache.myfaces.tobago.layout.Overflow getOverflowY() {
+    return (org.apache.myfaces.tobago.layout.Overflow) getStateHelper().eval(PropertyKeys.overflowY);
+  }
+
+  public void setOverflowY(org.apache.myfaces.tobago.layout.Overflow overflowY) {
+    getStateHelper().put(PropertyKeys.overflowY, overflowY);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getLeft() {
+    Object object = getStateHelper().eval(PropertyKeys.left);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setLeft(org.apache.myfaces.tobago.layout.Measure left) {
+    getStateHelper().put(PropertyKeys.left, left);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getWidth() {
+    Object object = getStateHelper().eval(PropertyKeys.width);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setWidth(org.apache.myfaces.tobago.layout.Measure width) {
+    getStateHelper().put(PropertyKeys.width, width);
+  }
+
+  public org.apache.myfaces.tobago.renderkit.css.CustomClass getCustomClass() {
+    return (org.apache.myfaces.tobago.renderkit.css.CustomClass) getStateHelper().eval(PropertyKeys.customClass);
+  }
+
+  public void setCustomClass(org.apache.myfaces.tobago.renderkit.css.CustomClass customClass)
{
+    getStateHelper().put(PropertyKeys.customClass, customClass);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMarginBottom() {
+    Object object = getStateHelper().eval(PropertyKeys.marginBottom);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMarginBottom(org.apache.myfaces.tobago.layout.Measure marginBottom) {
+    getStateHelper().put(PropertyKeys.marginBottom, marginBottom);
+  }
+
+  public org.apache.myfaces.tobago.layout.Position getPosition() {
+    return (org.apache.myfaces.tobago.layout.Position) getStateHelper().eval(PropertyKeys.position);
+  }
+
+  public void setPosition(org.apache.myfaces.tobago.layout.Position position) {
+    getStateHelper().put(PropertyKeys.position, position);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getPaddingLeft() {
+    Object object = getStateHelper().eval(PropertyKeys.paddingLeft);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setPaddingLeft(org.apache.myfaces.tobago.layout.Measure paddingLeft) {
+    getStateHelper().put(PropertyKeys.paddingLeft, paddingLeft);
+  }
+
+  public org.apache.myfaces.tobago.layout.Measure getMarginTop() {
+    Object object = getStateHelper().eval(PropertyKeys.marginTop);
+    if (object != null) {
+      return Measure.valueOf(object);
+    }
+    return null;
+  }
+
+  public void setMarginTop(org.apache.myfaces.tobago.layout.Measure marginTop) {
+    getStateHelper().put(PropertyKeys.marginTop, marginTop);
+  }
+}

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java
Thu May  4 14:09:50 2017
@@ -19,22 +19,41 @@
 
 package org.apache.myfaces.tobago.facelets;
 
+import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
+
+import javax.el.ELException;
 import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.ComponentConfig;
 import javax.faces.view.facelets.ComponentHandler;
 import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagConfig;
+import javax.faces.view.facelets.TagHandler;
 
-public class ScriptHandler extends ComponentHandler {
+public class ScriptHandler extends TagHandler {
 
-  public ScriptHandler(final ComponentConfig config) {
+  public ScriptHandler(final TagConfig config) {
     super(config);
-  }
 
-  @Override
-  public void onComponentCreated(final FaceletContext context, final UIComponent component,
final UIComponent parent) {
+    this.file = getAttribute(Attributes.file.getName());
   }
 
+  private final TagAttribute file;
+
   @Override
-  public void applyNextHandler(final FaceletContext ctx, final UIComponent c) {
+  public void apply(final FaceletContext faceletContext, final UIComponent parent) throws
ELException {
+
+    if (ComponentHandler.isNew(parent)) {
+
+      // file
+      if (file != null) {
+        final String value = file.getValue(faceletContext);
+        if (StringUtils.isNotBlank(value)) {
+          FacesContextUtils.addScriptFile(faceletContext.getFacesContext(), value);
+        }
+      }
+
+    }
   }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
Thu May  4 14:09:50 2017
@@ -25,6 +25,8 @@ import javax.faces.component.UIComponent
  * {@link org.apache.myfaces.tobago.internal.taglib.component.ScriptTagDeclaration}
  *
  * @since 3.0.0
+ * @deprecated since 3.1.0
  */
+@Deprecated
 public abstract class AbstractUIScript extends UIComponentBase {
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
Thu May  4 14:09:50 2017
@@ -29,6 +29,10 @@ import javax.faces.event.ComponentSystem
 import javax.faces.event.ListenerFor;
 import javax.faces.event.PostAddToViewEvent;
 
+/**
+ * @deprecated since 3.1.0
+ */
+@Deprecated
 @ListenerFor(systemEventClass = PostAddToViewEvent.class)
 public class ScriptRenderer extends RendererBase implements ComponentSystemEventListener
{
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
Thu May  4 14:09:50 2017
@@ -35,6 +35,10 @@ import javax.faces.event.ComponentSystem
 import javax.faces.event.ListenerFor;
 import javax.faces.event.PostAddToViewEvent;
 
+/**
+ * @deprecated since 3.1.0
+ */
+@Deprecated
 @ListenerFor(systemEventClass = PostAddToViewEvent.class)
 public class StyleRenderer extends RendererBase implements ComponentSystemEventListener {
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ScriptTagDeclaration.java
Thu May  4 14:09:50 2017
@@ -19,26 +19,17 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 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.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 
 /**
  * This tag adds script files to include into the rendered page.
- * <br>
- * Some features are deprecated (because of CSP): This tag adds client side script to the
rendered page.
  */
 @Tag(name = "script")
-@UIComponentTag(
-    uiComponent = "org.apache.myfaces.tobago.component.UIScript",
-    uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIScript",
-    componentFamily = "org.apache.myfaces.tobago.Script",
-    faceletHandler = "org.apache.myfaces.tobago.facelets.ScriptHandler",
-    rendererType = RendererTypes.SCRIPT,
-    allowedChildComponenents = "NONE")
+@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.ScriptHandler")
 public interface ScriptTagDeclaration extends HasIdBindingAndRendered {
 
   /**

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java?rev=1793807&r1=1793806&r2=1793807&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
Thu May  4 14:09:50 2017
@@ -19,11 +19,10 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 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.component.RendererTypes;
 import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.layout.Display;
 import org.apache.myfaces.tobago.layout.Overflow;
@@ -37,11 +36,7 @@ import org.apache.myfaces.tobago.layout.
  * </p>
  */
 @Tag(name = "style")
-@UIComponentTag(
-    uiComponent = "org.apache.myfaces.tobago.component.UIStyle",
-    componentFamily = "org.apache.myfaces.tobago.Style",
-    rendererType = RendererTypes.STYLE,
-    allowedChildComponenents = "NONE")
+@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.StyleHandler")
 public interface StyleTagDeclaration extends HasIdBindingAndRendered {
 
   /**



Mime
View raw message