svn commit: r1672423 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/ tobago-theme/tobago-theme-standard/src/main/java/org/...

[lo...@apache.org]

Author: lofwyr
Date: Thu Apr  9 17:03:45 2015
New Revision: 1672423

URL: http://svn.apache.org/r1672423
Log:
cleanup deprecated class

Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=1672423&r1=1672422&r2=1672423&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Thu Apr  9 17:03:45 2015
@@ -93,12 +93,6 @@ public class TobagoComponentHandler exte
     if (SupportsCss.class.isAssignableFrom(aClass)) {
       metaRuleset.addRule(SupportsCssRule.INSTANCE);
     }
-/*
-    todo: check for command, that not combination of these attributes is set: action, onclick, link
-    todo: this should be backported to 2.0
-    if (AbstractUICommandBase.class.isAssignableFrom(aClass)) {
-    }
-*/
 
     return metaRuleset;
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java?rev=1672423&r1=1672422&r2=1672423&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java Thu Apr  9 17:03:45 2015
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.event.P
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
+import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.event.FacesEvent;
@@ -34,7 +35,7 @@ import javax.faces.event.PhaseId;
 import java.util.Iterator;
 
 public abstract class AbstractUICommand
-    extends AbstractUICommandBase
+    extends UICommand
     implements SupportsRenderedPartially, SupportsAccessKey, OnComponentPopulated, LayoutComponent {
 
   public void onComponentPopulated(final FacesContext facesContext, final UIComponent parent) {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java?rev=1672423&r1=1672422&r2=1672423&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ToolBarRenderer.java Thu Apr  9 17:03:45 2015
@@ -152,8 +152,8 @@ public class ToolBarRenderer extends Lay
     writer.writeClassAttribute("nav navbar-nav");
 
     for (final UIComponent child : toolBar.getChildren()) {
-      if (child instanceof AbstractUICommandBase) {
-        final AbstractUICommandBase command =  (AbstractUICommandBase) child;
+      if (child instanceof AbstractUICommand) {
+        final AbstractUICommand command =  (AbstractUICommand) child;
         writer.startElement(HtmlElements.LI);
         writer.writeClassAttribute("nav navbar-nav");
 
@@ -167,7 +167,7 @@ public class ToolBarRenderer extends Lay
       } else if (child instanceof UIToolBarSeparator) {
         final UIToolBarSeparator separator =  (UIToolBarSeparator) child;
       } else {
-        LOG.error("Illegal UIComponent class in toolbar (not a AbstractUICommandBase):" + child.getClass().getName());
+        LOG.error("Illegal UIComponent class in toolbar (not a AbstractUICommand):" + child.getClass().getName());
       }
     }