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 2015/06/08 09:22:37 UTC
svn commit: r1684103 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/event/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/comp...
Author: lofwyr
Date: Mon Jun 8 07:22:36 2015
New Revision: 1684103
URL: http://svn.apache.org/r1684103
Log:
Removing deprecated stuff:
- old tree
- incompatible CSP
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/TreeModelBuilder.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedListener.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeDataTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnchange.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasOnclick.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasSuggestMethod.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Node.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageState.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageStateImpl.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeSelectable.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/MixedTreeModelUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/NodeUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Layout.java
Modified:
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-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIIn.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/AbstractCommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Selectable.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreePath.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/time/time.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/time.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.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/InRenderer.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/TextareaRenderer.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/ToolBarRendererBase.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/TreeListboxNodeRenderer.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/TreeListboxRenderer.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/TreeNodeRendererBase.java
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=1684103&r1=1684102&r2=1684103&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 Mon Jun 8 07:22:36 2015
@@ -108,8 +108,6 @@ public abstract class AbstractUICommand
public abstract String getLink();
- public abstract String getOnclick();
-
public abstract String getTarget();
public abstract boolean isTransition();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.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/AbstractUIData.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java Mon Jun 8 07:22:36 2015
@@ -95,9 +95,6 @@ public abstract class AbstractUIData ext
}
}
- /**
- * Will be obsolete later when selectable has the type TreeSelectable.
- */
public Selectable getSelectableAsEnum() {
final Selectable selectable = Selectable.parse(ComponentUtils.getStringAttribute(this, Attributes.SELECTABLE));
return selectable != null ? selectable : Selectable.NONE; // should not happen
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIIn.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/AbstractUIIn.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIIn.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIIn.java Mon Jun 8 07:22:36 2015
@@ -19,36 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.InputSuggest2;
-import org.apache.myfaces.tobago.component.OnComponentPopulated;
-import org.apache.myfaces.tobago.component.RendererTypes;
-import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.apache.myfaces.tobago.util.CreateComponentUtils;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-public abstract class AbstractUIIn extends AbstractUIInput implements OnComponentPopulated, InputSuggest2 {
-
- public void onComponentPopulated(final FacesContext facesContext, final UIComponent parent) {
- if (getSuggestMethodExpression() != null) {
- if (getSuggest() == null) {
- final AbstractUISuggest suggest = (AbstractUISuggest) CreateComponentUtils.createComponent(
- facesContext, AbstractUISuggest.COMPONENT_TYPE, RendererTypes.SUGGEST, null);
- getChildren().add(suggest);
- suggest.setSuggestMethodExpression(getSuggestMethodExpression());
- suggest.setMinimumCharacters(getSuggestMinChars());
- suggest.setDelay(getSuggestDelay());
- }
- }
- }
-
- public AbstractUISuggest getSuggest() {
- return ComponentUtils.findDescendant(this, AbstractUISuggest.class);
- }
-
- public abstract Integer getSuggestDelay();
-
- public abstract Integer getSuggestMinChars();
+public abstract class AbstractUIIn extends AbstractUIInput {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.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/AbstractUIPage.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java Mon Jun 8 07:22:36 2015
@@ -20,14 +20,12 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.ajax.AjaxUtils;
-import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.DeprecatedDimension;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.OnComponentPopulated;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
import org.apache.myfaces.tobago.internal.ajax.AjaxResponseRenderer;
import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
-import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.internal.webapp.TobagoMultipartFormdataRequest;
import org.apache.myfaces.tobago.layout.Box;
@@ -35,8 +33,6 @@ import org.apache.myfaces.tobago.layout.
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.model.PageState;
-import org.apache.myfaces.tobago.model.PageStateImpl;
import org.apache.myfaces.tobago.util.ApplyRequestValuesCallback;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.DebugUtils;
@@ -47,8 +43,6 @@ import org.apache.myfaces.tobago.util.Up
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
import javax.faces.application.FacesMessage;
import javax.faces.component.ContextCallback;
import javax.faces.component.UIComponent;
@@ -315,32 +309,6 @@ public abstract class AbstractUIPage ext
}
}
- /**
- * @deprecated PageState is deprecated since 1.5.0
- */
- @Deprecated
- public void updatePageState(final FacesContext facesContext) {
- }
-
- /**
- * @deprecated PageState is deprecated since 1.5.0
- */
- @Deprecated
- public PageState getPageState(final FacesContext facesContext) {
- final ValueExpression expression = getValueExpression(Attributes.STATE);
- if (expression != null) {
- final ELContext elContext = facesContext.getELContext();
- PageState state = (PageState) expression.getValue(elContext);
- if (state == null) {
- state = new PageStateImpl();
- expression.setValue(elContext, state);
- }
- return state;
- } else {
- return null;
- }
- }
-
public String getActionId() {
return actionId;
}
@@ -357,21 +325,6 @@ public abstract class AbstractUIPage ext
this.actionPosition = actionPosition;
}
- /**
- * @deprecated since 1.5.7 and 2.0.0
- */
- public String getDefaultActionId() {
- Deprecation.LOG.error("The default action handling has been changed!");
- return null;
- }
-
- /**
- * @deprecated since 1.5.7 and 2.0.0
- */
- public void setDefaultActionId(final String defaultActionId) {
- Deprecation.LOG.error("The default action handling has been changed!");
- }
-
public void onComponentPopulated(final FacesContext facesContext, final UIComponent parent) {
/*
if (getLayoutManager() == null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.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/AbstractUITree.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java Mon Jun 8 07:22:36 2015
@@ -20,10 +20,8 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.model.ExpandedState;
-import org.apache.myfaces.tobago.model.MixedTreeModel;
import org.apache.myfaces.tobago.model.SelectedState;
import org.apache.myfaces.tobago.model.TreeState;
@@ -33,9 +31,7 @@ import javax.faces.component.NamingConta
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-public abstract class AbstractUITree extends AbstractUIData
-// extends javax.faces.component.UIInput
- implements NamingContainer, LayoutComponent {
+public abstract class AbstractUITree extends AbstractUIData implements NamingContainer, LayoutComponent {
public static final String MESSAGE_NOT_LEAF = "tobago.tree.MESSAGE_NOT_LEAF";
@@ -99,22 +95,10 @@ public abstract class AbstractUITree ext
if (child instanceof AbstractUITreeNode) {
return child;
}
- if (child instanceof AbstractUITreeData) {
- return child;
- }
}
return null;
}
- /**
- * @deprecated Since 2.0.0.
- */
- @Deprecated
- public MixedTreeModel getModel() {
- Deprecation.LOG.error("Doesn't work anymore.");
- return null;
- }
-
@Override
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.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/AbstractUITreeNode.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java Mon Jun 8 07:22:36 2015
@@ -20,25 +20,18 @@
package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsMarkup;
-import org.apache.myfaces.tobago.component.TreeModelBuilder;
import org.apache.myfaces.tobago.config.Configurable;
-import org.apache.myfaces.tobago.event.TreeExpansionListener;
-import org.apache.myfaces.tobago.event.TreeMarkedListener;
-import org.apache.myfaces.tobago.internal.util.Deprecation;
-import org.apache.myfaces.tobago.model.MixedTreeModel;
import org.apache.myfaces.tobago.model.TreeDataModel;
import org.apache.myfaces.tobago.model.TreePath;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIData;
import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.swing.tree.TreeNode;
import java.io.IOException;
import java.util.List;
public abstract class AbstractUITreeNode
- extends AbstractUIColumn implements SupportsMarkup, TreeModelBuilder, Configurable {
+ extends AbstractUIColumn implements SupportsMarkup, Configurable {
@Override
public void encodeBegin(final FacesContext facesContext) throws IOException {
@@ -78,234 +71,4 @@ public abstract class AbstractUITreeNode
final String dataId = data.getClientId(facesContext);
return clientId.substring(dataId.length() + 1);
}
-
- // ///////////////////////////////////////////////////////////////////////////////////////////////////////////
- // below only deprecated
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- protected TreeNode getRowData() {
- final UIData data = ComponentUtils.findAncestor(this, UIData.class);
- final Object rowData = data.getRowData();
- return (TreeNode) rowData;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void buildTreeModelBegin(final FacesContext facesContext, final MixedTreeModel model) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void buildTreeModelChildren(final FacesContext facesContext, final MixedTreeModel model) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void buildTreeModelEnd(final FacesContext facesContext, final MixedTreeModel model) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public int getDepth() {
- Deprecation.LOG.error("Doesn't work anymore.");
- return 1;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setDepth(final int depth) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setFolder(final boolean folder) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setPath(final TreePath path) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setJunctions(final List<Boolean> junctions) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public boolean isHasNextSibling() {
- Deprecation.LOG.error("Doesn't work anymore.");
- return false;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setHasNextSibling(final boolean hasNextSibling) {
- Deprecation.LOG.error("Doesn't work anymore.");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public MethodBinding getTreeExpansionListener(){
- Deprecation.LOG.error("treeExpansionListener!");
- return null;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setTreeExpansionListener(final MethodBinding treeExpansionListener){
- Deprecation.LOG.error("treeExpansionListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void addTreeExpansionListener(final TreeExpansionListener listener) {
- Deprecation.LOG.error("treeExpansionListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public TreeExpansionListener[] getTreeExpansionListeners() {
- Deprecation.LOG.error("treeExpansionListener!");
- return null;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void removeStateChangeListener(final TreeExpansionListener listener) {
- Deprecation.LOG.error("treeExpansionListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public MethodBinding getTreeMarkedListener(){
- Deprecation.LOG.error("treeMarkedListener!");
- return null;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setTreeMarkedListener(final MethodBinding treeMarkedListener){
- Deprecation.LOG.error("treeMarkedListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void addTreeMarkedListener(final TreeMarkedListener listener) {
- Deprecation.LOG.error("treeMarkedListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public TreeMarkedListener[] getTreeMarkedListeners() {
- Deprecation.LOG.error("treeMarkedListener!");
- return null;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void removeStateChangeListener(final TreeMarkedListener listener) {
- Deprecation.LOG.error("treeMarkedListener!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public boolean isMarked() {
- Deprecation.LOG.error("The marked attribute is no longer supported, please use a tree state!");
- return false;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setMarked(final boolean b) {
- Deprecation.LOG.error("The marked attribute is no longer supported, please use a tree state!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public boolean isExpanded() {
- Deprecation.LOG.error("The expanded attribute is no longer supported, please use a tree state!");
- return false;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setExpanded(final boolean expanded) {
- Deprecation.LOG.error("The expanded attribute is no longer supported, please use a tree state!");
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public boolean isSelected() {
- Deprecation.LOG.error("The selected attribute is no longer supported, please use a tree select!");
- return false;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public void setSelected(final boolean selected) {
- Deprecation.LOG.error("The selected attribute is no longer supported, please use a tree select!");
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -35,8 +35,7 @@ import org.apache.myfaces.tobago.interna
import javax.faces.component.UICommand;
/**
- * Use this tag only as a facet for click, change in selectOneRadio,
- * selectBooleanCheckbox, selectManyCheckbox and selectOneChoice
+ * A general command.
*/
@Tag(name = "command")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -30,7 +30,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@@ -63,7 +62,7 @@ import javax.faces.component.UIInput;
rendererType = RendererTypes.FILE,
allowedChildComponenents = "NONE")
public interface FileTagDeclaration
- extends HasValidator, HasValidatorMessage, HasRequiredMessage, HasConverterMessage, HasOnchange,
+ extends HasValidator, HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasValueChangeListener, HasIdBindingAndRendered, IsDisabled, HasMarkup, HasCurrentMarkup, IsFocus,
HasLabel, HasTip, IsReadonly, IsRequired, HasTabIndex, IsGridLayoutComponent {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -34,7 +34,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasInputLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasPlaceholder;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasSuggestMethod;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.InputTagDeclaration;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
@@ -65,7 +64,7 @@ import javax.faces.component.UIInput;
})
public interface InTagDeclaration
extends HasIdBindingAndRendered, HasConverter, IsReadonly, IsDisabled, IsRequired, HasTip, IsPassword,
- HasSuggestMethod, HasMarkup, HasCurrentMarkup, InputTagDeclaration, HasInputLabel,
+ HasMarkup, HasCurrentMarkup, InputTagDeclaration, HasInputLabel,
HasAutocomplete, HasPlaceholder, HasCss, HasCurrentCss {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@@ -73,7 +72,7 @@ import javax.faces.component.UISelectBoo
})
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
- HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
+ HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
IsRequiredForSelect, HasConverter, IsFocus,
HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasInputLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRenderRange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
@@ -67,7 +66,7 @@ import javax.faces.component.UISelectMan
public interface SelectManyCheckboxTagDeclaration extends
IsDisabled, HasId, HasTip, IsInline, HasRenderRange, IsRendered, IsRequiredForSelect,
HasBinding, IsReadonly, HasConverter,
- HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasOnchange, HasValueChangeListener,
+ HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasValueChangeListener,
HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@@ -62,7 +61,7 @@ import javax.faces.component.UISelectMan
public interface SelectManyListboxTagDeclaration
extends HasId, IsDisabled, IsRendered, HasBinding, HasTip,
IsReadonly, HasConverter, IsRequiredForSelect, HasMarkup, HasCurrentMarkup,
- HasLabel, HasValidator, HasOnchange, HasValueChangeListener,
+ HasLabel, HasValidator, HasValueChangeListener,
HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -32,7 +32,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasInputLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessageForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@@ -61,7 +60,7 @@ import javax.faces.component.UISelectMan
"javax.faces.SelectItems"})
public interface SelectManyShuttleTagDeclaration extends
IsDisabled, HasId, HasTip, IsRendered, IsRequiredForSelect, HasBinding, IsReadonly, HasConverter,
- HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasOnchange, HasValueChangeListener,
+ HasMarkup, HasCurrentMarkup, HasInputLabel, HasValidator, HasValueChangeListener,
HasValidatorMessage, HasConverterMessage, HasRequiredMessageForSelect, HasTabIndex, IsFocus, IsGridLayoutComponent {
/**
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -51,32 +51,9 @@ import javax.faces.component.UIColumn;
"org.apache.myfaces.tobago.TreeNode",
"org.apache.myfaces.tobago.TreeData"
})
-public interface
- TreeNodeTagDeclaration
+public interface TreeNodeTagDeclaration
extends HasIdBindingAndRendered, HasMarkup, HasCurrentMarkup, HasTip, IsDisabled, IsGridLayoutContainer {
- /**
- * Flag indicating if the subnodes are to be displayed.
- * @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
- */
- @Deprecated
- @TagAttribute()
- @UIComponentTagAttribute(type = "boolean", generate = false, defaultValue = "false")
- void setExpanded(String expanded);
-
- /**
- * Flag indicating if the node is marked, and should be displayed in a special way.
- * @deprecated since 2.0.0. Please use the state attribute of the tree with a TreeState
- */
- @Deprecated
- @TagAttribute()
- @UIComponentTagAttribute(type = "boolean", generate = false, defaultValue = "false")
- void setMarked(String marked);
-
- /**
- * Flag indicating if the node is selected (only possible, when the tree component allows it).
- * @deprecated since 2.0.0. Please use <code><tc:treeSelect></code>
- */
@Deprecated
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", generate = false, defaultValue = "false")
@@ -92,16 +69,6 @@ public interface
methodSignature = "org.apache.myfaces.tobago.event.TreeExpansionEvent")
void setTreeExpansionListener(String treeExpansionListener);
- /**
- * Method binding representing a markedListener method that ....
- */
- @TagAttribute
- @UIComponentTagAttribute(type = {},
- generate = false,
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "org.apache.myfaces.tobago.event.TreeMarkedEvent")
- void setTreeMarkedListener(String treeMarkedListener);
-
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
void setWidth(String width);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/AbstractCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/AbstractCommandTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/AbstractCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/AbstractCommandTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -20,5 +20,5 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
public interface AbstractCommandTagDeclaration extends HasAction, HasActionListener, IsImmediateCommand,
- HasOnclick, HasLink, HasResource, IsTransition, HasTarget, HasRenderedPartially, IsDisabled, IsOmit {
+ HasLink, HasResource, IsTransition, HasTarget, HasRenderedPartially, IsDisabled, IsOmit {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java Mon Jun 8 07:22:36 2015
@@ -19,6 +19,6 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-public interface InputTagDeclaration extends HasValidator, HasOnchange, HasValue, HasValueChangeListener,
+public interface InputTagDeclaration extends HasValidator, HasValue, HasValueChangeListener,
HasValidatorMessage, HasConverterMessage, HasRequiredMessage, HasTabIndex, IsFocus, IsGridLayoutComponent {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Selectable.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Selectable.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Selectable.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/Selectable.java Mon Jun 8 07:22:36 2015
@@ -112,9 +112,9 @@ public enum Selectable {
}
/**
- * @param name Name of the TreeSelectable
+ * @param name Name of the Selectable
* @return The matching tree selection (can't be null).
- * @throws IllegalArgumentException When the name doesn't match any TreeSelectable.
+ * @throws IllegalArgumentException When the name doesn't match any Selectable.
*/
public static Selectable parse(final Object name) throws IllegalArgumentException {
if (name == null) {
@@ -127,7 +127,7 @@ public enum Selectable {
if (value != null) {
return value;
} else {
- throw new IllegalArgumentException("Unknown name for TreeSelectable: '" + name + "'");
+ throw new IllegalArgumentException("Unknown name for Selectable: '" + name + "'");
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreePath.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreePath.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreePath.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreePath.java Mon Jun 8 07:22:36 2015
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.model;
-import org.apache.myfaces.tobago.internal.util.StringUtils;
-
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
import java.io.Serializable;
import java.util.ArrayList;
@@ -69,24 +66,6 @@ public class TreePath implements Seriali
}
}
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public TreePath(final TreePath position, final int addendum) {
- this.path = new int[position.path.length + 1];
- System.arraycopy(position.path, 0, path, 0, position.path.length);
- path[position.path.length] = addendum;
- }
-
- /**
- * @deprecated since 2.0.0
- */
- @Deprecated
- public TreePath(final String string) throws NumberFormatException {
- this(StringUtils.parseIntegerList(string, "_"));
- }
-
public TreePath(TreeNode node) {
if (node == null) {
throw new IllegalArgumentException();
@@ -120,53 +99,6 @@ public class TreePath implements Seriali
return path.length;
}
- /**
- * @deprecated since 2.0.0
- */
- public String getPathString() {
- final StringBuilder builder = new StringBuilder();
- for (final int item : path) {
- builder.append("_");
- builder.append(item);
- }
- return builder.toString();
- }
-
- /**
- * @deprecated since 1.5.0
- */
- @Deprecated
- public String getParentPathString() {
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < path.length - 1; i++) {
- builder.append("_");
- builder.append(path[i]);
- }
- return builder.toString();
- }
-
- /**
- * Returns the node at the position of this NodePath applied to the parameter node.
- *
- * @param tree The start node.
- * @return The node applied to the given path.
- * @deprecated since 2.0.0
- */
- @Deprecated
- public DefaultMutableTreeNode getNode(DefaultMutableTreeNode tree) {
- if (tree == null) {
- return null;
- }
- for (int i = 1; i < path.length; i++) { // i = 1: first entry must be 0 and means the root
- final int pos = path[i];
- if (pos >= tree.getChildCount()) {
- return null;
- }
- tree = (DefaultMutableTreeNode) tree.getChildAt(pos);
- }
- return tree;
- }
-
@Override
public boolean equals(final Object o) {
if (this == o) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java Mon Jun 8 07:22:36 2015
@@ -40,8 +40,7 @@ public class MethodOverwritingOfGenerate
private static final List<String> IGNORED_METHODS = Arrays.asList("getFamily", "saveState", "restoreState");
private static final List<String> IGNORED_COMPONENTS = Arrays.asList(
UIExtensionPanel.class.getSimpleName(),
- UIMenuSelectOne.class.getSimpleName(),
- UITreeData.class.getSimpleName()); // deprecated
+ UIMenuSelectOne.class.getSimpleName());
private static final MethodOfComponentList IGNORED_METHODS_PER_COMPONENT = new MethodOfComponentList();
static {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/model/TreePathUnitTest.java Mon Jun 8 07:22:36 2015
@@ -105,55 +105,6 @@ public class TreePathUnitTest {
public void testGetPath() {
final TreePath treePath = new TreePath(0, 1, 2);
Assert.assertTrue(Arrays.equals(new int[]{0, 1, 2}, treePath.getPath()));
- final TreePath treePath2 = new TreePath(treePath, 3);
- Assert.assertTrue(Arrays.equals(new int[]{0, 1, 2, 3}, treePath2.getPath()));
}
- @Test
- public void testGetPathString() {
- final TreePath treePath = new TreePath(0, 1, 2);
- Assert.assertEquals("_0_1_2", treePath.getPathString());
- final TreePath treePath2 = new TreePath(treePath, 3);
- Assert.assertEquals("_0_1_2_3", treePath2.getPathString());
- }
-
- @Test
- public void testGetNode() {
-
- final DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
- final DefaultMutableTreeNode node1 = new DefaultMutableTreeNode("node1");
- root.add(node1);
- final DefaultMutableTreeNode node2 = new DefaultMutableTreeNode("node2");
- final DefaultMutableTreeNode node3 = new DefaultMutableTreeNode("node3");
- node2.add(node3);
- root.add(node2);
-
- Assert.assertEquals(root, new TreePath(0).getNode(root));
- Assert.assertEquals(node1, new TreePath(0, 0).getNode(root));
- Assert.assertEquals(node2, new TreePath(0, 1).getNode(root));
- Assert.assertEquals(node3, new TreePath(0, 1, 0).getNode(root));
- }
-
- @Test
- public void testGetNode2() {
-
- final DefaultMutableTreeNode tree = new DefaultMutableTreeNode("Category");
- tree.add(new DefaultMutableTreeNode("Sports"));
- tree.add(new DefaultMutableTreeNode("Movies"));
- final DefaultMutableTreeNode science = new DefaultMutableTreeNode("Science");
- tree.add(science);
- science.add(new DefaultMutableTreeNode("Geography"));
- science.add(new DefaultMutableTreeNode("Mathematics"));
- final DefaultMutableTreeNode astronomy = new DefaultMutableTreeNode("Astronomy");
- astronomy.add(new DefaultMutableTreeNode("Education"));
- astronomy.add(new DefaultMutableTreeNode("Pictures"));
- science.add(astronomy);
- tree.add(new DefaultMutableTreeNode("Music"));
- tree.add(new DefaultMutableTreeNode("Games"));
-
- Assert.assertEquals("Category", new TreePath(0).getNode(tree).getUserObject());
- Assert.assertEquals("Sports", new TreePath(0, 0).getNode(tree).getUserObject());
- Assert.assertEquals("Astronomy", new TreePath(0, 2, 2).getNode(tree).getUserObject());
- Assert.assertEquals("Games", new TreePath(0, 4).getNode(tree).getUserObject());
- }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/date/datetime.xhtml Mon Jun 8 07:22:36 2015
@@ -381,9 +381,9 @@
<tc:label value="?"/>
<tc:in readonly="true"/>
-<tc:time value="#{dateController.once}">
- <f:convertDateTime pattern="HH:mm:ss"/>
-</tc:time>
+<tc:date value="#{dateController.once}">
+ <f:convertDateTime pattern="HH:mm:ss" type="time"/>
+</tc:date>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
@@ -393,9 +393,9 @@
<tc:label value="timeStyle=short"/>
<tc:in readonly="true"/>
-<tc:time value="#{dateController.once}">
+<tc:date value="#{dateController.once}">
<f:convertDateTime timeStyle="short" type="time"/>
-</tc:time>
+</tc:date>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
@@ -403,9 +403,9 @@
<tc:label value="timeStyle=medium"/>
<tc:in readonly="true"/>
-<tc:time value="#{dateController.once}">
+<tc:date value="#{dateController.once}">
<f:convertDateTime timeStyle="medium" type="time"/>
-</tc:time>
+</tc:date>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
@@ -413,9 +413,9 @@
<tc:label value="timeStyle=long"/>
<tc:in readonly="true"/>
-<tc:time value="#{dateController.once}">
+<tc:date value="#{dateController.once}">
<f:convertDateTime timeStyle="long" type="time"/>
-</tc:time>
+</tc:date>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
@@ -423,9 +423,9 @@
<tc:label value="timeStyle=full"/>
<tc:in readonly="true"/>
-<tc:time value="#{dateController.once}">
+<tc:date value="#{dateController.once}">
<f:convertDateTime timeStyle="full" type="time"/>
-</tc:time>
+</tc:date>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
<tc:in readonly="true"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/time/time.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/time/time.xhtml?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/time/time.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/time/time.xhtml Mon Jun 8 07:22:36 2015
@@ -29,52 +29,68 @@
</f:facet>
<tc:gridLayoutConstraint width="900px" height="300px" marginLeft="10px" marginTop="10px" marginRight="10px"/>
- <tc:time/>
- <tc:time>
+ <tc:date>
+ <f:convertDateTime type="time"/>
+ </tc:date>
+ <tc:date>
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:time>
+ </tc:date>
<tc:in value="for comparison only"/>
- <tc:time readonly="true"/>
- <tc:time readonly="true">
+ <tc:date readonly="true">
+ <f:convertDateTime type="time"/>
+ </tc:date>
+ <tc:date readonly="true">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:time>
+ </tc:date>
<tc:in value="for comparison only" readonly="true"/>
- <tc:time disabled="true"/>
- <tc:time disabled="true">
+ <tc:date disabled="true">
+ <f:convertDateTime type="time"/>
+ </tc:date>
+ <tc:date disabled="true">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:time>
+ </tc:date>
<tc:in value="for comparison only" disabled="true"/>
- <tc:time markup="error"/>
- <tc:time markup="error">
+ <tc:date markup="error">
+ <f:convertDateTime type="time"/>
+ </tc:date>
+ <tc:date markup="error">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tc:time>
+ </tc:date>
<tc:in value="for comparison only" markup="error"/>
- <tx:time label="Label"/>
- <tx:time label="Label">
+ <tx:date label="Label">
+ <f:convertDateTime type="time"/>
+ </tx:date>
+ <tx:date label="Label">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
+ </tx:date>
<tx:in label="Label" value="for comparison only"/>
- <tx:time label="Label" readonly="true"/>
- <tx:time label="Label" readonly="true">
+ <tx:date label="Label" readonly="true">
+ <f:convertDateTime type="time"/>
+ </tx:date>
+ <tx:date label="Label" readonly="true">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
+ </tx:date>
<tx:in label="Label" value="for comparison only" readonly="true"/>
- <tx:time label="Label" disabled="true"/>
- <tx:time label="Label" disabled="true">
+ <tx:date label="Label" disabled="true">
+ <f:convertDateTime type="time"/>
+ </tx:date>
+ <tx:date label="Label" disabled="true">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
+ </tx:date>
<tx:in label="Label" value="for comparison only" disabled="true"/>
- <tx:time label="Label" markup="error"/>
- <tx:time label="Label" markup="error">
+ <tx:date label="Label" markup="error">
+ <f:convertDateTime type="time"/>
+ </tx:date>
+ <tx:date label="Label" markup="error">
<f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
+ </tx:date>
<tx:in label="Label" value="for comparison only" markup="error"/>
<tc:panel/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/time.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/time.xml?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/time.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/time.xml Mon Jun 8 07:22:36 2015
@@ -34,16 +34,16 @@
<tc:label value="${label}" for="@auto" tip="${tip}"/>
<c:choose>
<c:when test="${empty id}">
- <tc:time value="${value}" required="${required}"
+ <tc:date value="${value}" required="${required}"
readonly="${readonly}" disabled="${disabled}" >
<ui:insert/>
- </tc:time>
+ </tc:date>
</c:when>
<c:when test="${not empty id}">
- <tc:time id="${id}" value="${value}" required="${required}"
+ <tc:date id="${id}" value="${value}" required="${required}"
readonly="${readonly}" disabled="${disabled}" >
<ui:insert/>
- </tc:time>
+ </tc:date>
</c:when>
</c:choose>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml Mon Jun 8 07:22:36 2015
@@ -35,10 +35,6 @@
<source>date.xml</source>
</tag>
<tag>
- <tag-name>time</tag-name>
- <source>time.xml</source>
- </tag>
- <tag>
<tag-name>textarea</tag-name>
<source>textarea.xml</source>
</tag>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.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/PageRendererBase.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Mon Jun 8 07:22:36 2015
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Box;
import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.model.PageState;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,12 +84,6 @@ public class PageRendererBase extends La
final StringTokenizer tokenizer = new StringTokenizer(value, ";");
final Measure width = Measure.valueOf(tokenizer.nextToken());
final Measure height = Measure.valueOf(tokenizer.nextToken());
- // XXX remove me later
- final PageState pageState = page.getPageState(facesContext);
- if (pageState != null) {
- pageState.setClientWidth(width.getPixel());
- pageState.setClientHeight(height.getPixel());
- }
final ClientProperties clientProperties = ClientProperties.getInstance(facesContext);
clientProperties.setPageWidth(width);
clientProperties.setPageHeight(height);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.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/Command.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java Mon Jun 8 07:22:36 2015
@@ -25,7 +25,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UIForm;
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.util.Deprecation;
-import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -51,11 +50,6 @@ public class Command {
private Integer delay;
private Popup popup;
private Boolean omit;
- /**
- * @deprecated Script will not work when CSP is activated
- */
- @Deprecated
- private String script;
public Command() {
}
@@ -87,9 +81,6 @@ public class Command {
null,
Popup.createPopup(command),
command.isOmit());
- if (command.getOnclick() != null) {
- script = command.getOnclick();
- }
}
public Command(final FacesContext facesContext, UIComponent facetComponent, final String focusId) {
@@ -111,14 +102,6 @@ public class Command {
this.partially = ComponentUtils.evaluateClientIds(
facesContext, facetComponent, ((UICommand) facetComponent).getRenderedPartially());
} else {
- String facetAction = (String) facetComponent.getAttributes().get(Attributes.ONCLICK);
- if (facetAction != null) {
- // Replace @autoId
- facetAction = StringUtils.replace(facetAction, "@autoId", facetComponent.getClientId(facesContext));
- // XXX this case is deprecated.
- // not allowed with Content Security Policy (CSP)
- this.script = facetAction;
- }
if (focusId != null) {
this.focus = focusId;
}
@@ -218,20 +201,4 @@ public class Command {
public void setOmit(final Boolean omit) {
this.omit = omit;
}
-
- /**
- * @deprecated Script will not work when CSP is activated
- */
- public String getScript() {
- return script;
- }
-
- /**
- * @deprecated Script will not work when CSP is activated
- */
- @Deprecated
- public void setScript(final String script) {
- this.script = script;
- }
-
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.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/JsonUtils.java?rev=1684103&r1=1684102&r2=1684103&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/JsonUtils.java Mon Jun 8 07:22:36 2015
@@ -148,10 +148,6 @@ public class JsonUtils {
if (popup != null) {
encode(builder, "popup", popup);
}
- final String script = command.getScript();
- if (script != null) {
- encode(builder, "script", script);
- }
final Boolean omit = command.getOmit();
if (omit != null && omit) { // false is the default, so encoding is needed.
encode(builder, "omit", omit);
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/InRenderer.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/InRenderer.java?rev=1684103&r1=1684102&r2=1684103&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/InRenderer.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/InRenderer.java Mon Jun 8 07:22:36 2015
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.internal.component.AbstractUIIn;
import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.internal.util.StringUtils;
@@ -118,10 +117,6 @@ public class InRenderer extends InputRen
writer.writeAttribute(HtmlAttributes.PLACEHOLDER, placeholder, true);
}
- if (input instanceof AbstractUIIn && ((AbstractUIIn) input).getSuggest() != null) {
- writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
- }
-
writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL);
writer.writeAttribute(HtmlAttributes.REQUIRED, required);
HtmlRendererUtils.renderFocus(id, input.isFocus(), ComponentUtils.isError(input), facesContext, writer);
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/TextareaRenderer.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/TextareaRenderer.java?rev=1684103&r1=1684102&r2=1684103&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/TextareaRenderer.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/TextareaRenderer.java Mon Jun 8 07:22:36 2015
@@ -19,15 +19,12 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UITextarea;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.BootstrapClass;
-import org.apache.myfaces.tobago.renderkit.html.Command;
-import org.apache.myfaces.tobago.renderkit.html.CommandMap;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -82,13 +79,6 @@ public class TextareaRenderer extends In
writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL);
final Style style = new Style(facesContext, input);
writer.writeStyleAttribute(style);
- final String onchange = ComponentUtils.getStringAttribute(input, Attributes.ONCHANGE);
- if (onchange != null) {
- final CommandMap map = new CommandMap();
- final Command change = new Command();
- change.setScript(onchange);
- map.addCommand("change", change);
- }
int maxLength = -1;
final String pattern = null;
for (final Validator validator : input.getValidators()) {
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/ToolBarRendererBase.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/ToolBarRendererBase.java?rev=1684103&r1=1684102&r2=1684103&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/ToolBarRendererBase.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/ToolBarRendererBase.java Mon Jun 8 07:22:36 2015
@@ -366,11 +366,9 @@ public abstract class ToolBarRendererBas
}
private boolean hasNoCommand(final AbstractUICommand command) {
- return command.getAction() == null
- && command.getActionListener() == null
+ return command.getActionExpression() == null
&& command.getActionListeners().length == 0
- && command.getLink() == null
- && command.getAttributes().get(Attributes.ONCLICK) == null;
+ && command.getLink() == null;
}
private String getImage(
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/TreeListboxNodeRenderer.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/TreeListboxNodeRenderer.java?rev=1684103&r1=1684102&r2=1684103&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/TreeListboxNodeRenderer.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/TreeListboxNodeRenderer.java Mon Jun 8 07:22:36 2015
@@ -21,9 +21,6 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.component.UITreeSelect;
-import org.apache.myfaces.tobago.context.Markup;
-import org.apache.myfaces.tobago.event.TreeExpansionEvent;
-import org.apache.myfaces.tobago.event.TreeMarkedEvent;
import org.apache.myfaces.tobago.internal.component.AbstractUITree;
import org.apache.myfaces.tobago.model.Selectable;
import org.apache.myfaces.tobago.renderkit.CommandRendererBase;
@@ -68,9 +65,11 @@ public class TreeListboxNodeRenderer ext
// expand state
if (folder) {
final boolean expanded = Boolean.parseBoolean(requestParameterMap.get(id + "-expanded"));
+/* XXX check
if (node.isExpanded() != expanded) {
new TreeExpansionEvent(node, node.isExpanded(), expanded).queue();
}
+*/
}
// select
@@ -88,9 +87,11 @@ public class TreeListboxNodeRenderer ext
if (marked != null) {
final String searchString = treeId + UINamingContainer.getSeparatorChar(facesContext) + nodeStateId;
final boolean markedValue = marked.equals(searchString);
+/* XXX check
if (node.isMarked() != markedValue) {
new TreeMarkedEvent(node, node.isMarked(), markedValue).queue();
}
+*/
} else {
LOG.warn("This log message is help clarifying the occurrence of this else case.");
}
@@ -101,9 +102,11 @@ public class TreeListboxNodeRenderer ext
super.prepareRender(facesContext, component);
final UITreeNode node = (UITreeNode) component;
+/* XXX check
if (node.isMarked()) {
node.setMarkup(Markup.MARKED.add(node.getMarkup()));
}
+*/
}
@Override
@@ -111,7 +114,7 @@ public class TreeListboxNodeRenderer ext
final UITreeNode node = (UITreeNode) component;
final boolean folder = node.isFolder();
final String id = node.getClientId(facesContext);
- final boolean expanded = folder && node.isExpanded();
+ final boolean expanded = folder; // XXX check && node.isExpanded();
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
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/TreeListboxRenderer.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/TreeListboxRenderer.java?rev=1684103&r1=1684102&r2=1684103&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/TreeListboxRenderer.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/TreeListboxRenderer.java Mon Jun 8 07:22:36 2015
@@ -27,7 +27,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.css.Position;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -73,14 +72,14 @@ public class TreeListboxRenderer extends
final String clientId = tree.getClientId(facesContext);
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final Style style = new Style(facesContext, tree);
- final Style scrollDivStyle = new Style();
+// final Style scrollDivStyle = new Style();
writer.startElement(HtmlElements.DIV, tree);
- scrollDivStyle.setWidth(Measure.valueOf(6 * 160)); // todo: depth * width of a select
- scrollDivStyle.setHeight(style.getHeight() // todo: what, when there is no scrollbar?
- .subtract(15)); // todo: scrollbar height
- scrollDivStyle.setPosition(Position.ABSOLUTE);
- writer.writeStyleAttribute(scrollDivStyle);
+// scrollDivStyle.setWidth(Measure.valueOf(6 * 160)); // todo: depth * width of a select
+// scrollDivStyle.setHeight(style.getHeight() // todo: what, when there is no scrollbar?
+// .subtract(15)); // todo: scrollbar height
+// scrollDivStyle.setPosition(Position.ABSOLUTE);
+// writer.writeStyleAttribute(scrollDivStyle);
writer.startElement(HtmlElements.DIV, tree);
writer.writeClassAttribute(Classes.create(tree));
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/TreeNodeRendererBase.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/TreeNodeRendererBase.java?rev=1684103&r1=1684102&r2=1684103&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/TreeNodeRendererBase.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/TreeNodeRendererBase.java Mon Jun 8 07:22:36 2015
@@ -38,7 +38,7 @@ public class TreeNodeRendererBase extend
final AbstractUITreeNode node = (AbstractUITreeNode) component;
final AbstractUIData data = ComponentUtils.findAncestor(node, AbstractUIData.class);
- if (data instanceof AbstractUITree && ((AbstractUITree) data).getSelectedState().isSelected(node.getPath())) {
+ if (data instanceof AbstractUITree && data.getSelectedState().isSelected(node.getPath())) {
ComponentUtils.addCurrentMarkup(node, Markup.SELECTED);
}
if (node.isFolder()) {