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 2012/11/27 13:33:16 UTC
svn commit: r1414152 - in /myfaces/tobago/trunk: src/site/apt/
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-core/src/main/java/org/apache/myfaces/to...
Author: lofwyr
Date: Tue Nov 27 12:33:14 2012
New Revision: 1414152
URL: http://svn.apache.org/viewvc?rev=1414152&view=rev
Log:
removing deprecated stuff
Modified:
myfaces/tobago/trunk/src/site/apt/migration-1.6.apt
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacetUtils.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/FacetUtilsUnitTest.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
Modified: myfaces/tobago/trunk/src/site/apt/migration-1.6.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-1.6.apt?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-1.6.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-1.6.apt Tue Nov 27 12:33:14 2012
@@ -47,7 +47,9 @@ Tag Library
The main changes in the tag library are
- TODO: What has changed with the tree.
+ TODO: What has changed with the tree?
+
+ Deprecated facets "resizeAction" and "menupopup" was removed.
Configuration
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Facets.java Tue Nov 27 12:33:14 2012
@@ -48,22 +48,9 @@ public final class Facets {
}
/**
- * @deprecated since 1.5.0. Please use {@link #DROP_DOWN_MENU}
- */
- @Deprecated
- public static final String MENUPOPUP = DROP_DOWN_MENU;
-
- /**
* @deprecated since 1.6.0. Please use {@link #POPUP}
* Using compatible names for backward compatibility.
*/
@Deprecated
public static final String PICKER_POPUP = POPUP;
-
- /**
- * @deprecated since 1.5.0. Please use {@link #RESIZE}
- * Using compatible names for backward compatibility.
- */
- @Deprecated
- public static final String RESIZE_ACTION = RESIZE;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java Tue Nov 27 12:33:14 2012
@@ -43,8 +43,6 @@ import org.apache.myfaces.tobago.interna
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumn",
rendererType = RendererTypes.COLUMN,
facets = {
- @Facet(name = Facets.MENUPOPUP, description = "Deprecated. Please use dropDownMenu facet.",
- allowedChildComponenents = "org.apache.myfaces.tobago.Menu"),
@Facet(name = Facets.DROP_DOWN_MENU, description = "Contains a UIMenu instance to render a drop down menu."
+ " (not implemented yet, work in progress)", // XXX
allowedChildComponenents = "org.apache.myfaces.tobago.Menu")
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java Tue Nov 27 12:33:14 2012
@@ -51,9 +51,6 @@ import org.apache.myfaces.tobago.interna
description ="Contains an instance of UICommand which will be executed when the"
+ "size of the user agent was changed. Typically a <tc:command immediate='true' />",
allowedChildComponenents = {"org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.Form"}),
- @Facet(name = Facets.RESIZE_ACTION,
- description ="Deprecated name for 'resize'",
- allowedChildComponenents = {"org.apache.myfaces.tobago.Command", "org.apache.myfaces.tobago.Form"}),
@Facet(name = Facets.MENUBAR, description = "Menubar",
allowedChildComponenents = "javax.faces.component.UIPanel"), //fake
@Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java Tue Nov 27 12:33:14 2012
@@ -51,8 +51,6 @@ import org.apache.myfaces.tobago.interna
allowedChildComponenents = ComponentTypes.OUT),
@Facet(name = Facets.POPUP, description = "Contains a UIPopup instance.",
allowedChildComponenents = "org.apache.myfaces.tobago.Popup"),
- @Facet(name = Facets.MENUPOPUP, description = "Deprecated. Please use dropDownMenu facet.",
- allowedChildComponenents = "org.apache.myfaces.tobago.Menu"),
@Facet(name = Facets.DROP_DOWN_MENU, description = "Contains a UIMenu instance to render a drop down menu.",
allowedChildComponenents = "org.apache.myfaces.tobago.Menu")
})
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarTagDeclaration.java Tue Nov 27 12:33:14 2012
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.interna
* <code>'button'</code> and <code>'link'</code> tags.
* These are rendered by ToolbarRenderer, so the result has
* no difference.<p />
- * To add an dropdown menu to a button add a facet <code>'menupopup'</code>
+ * To add an drop down menu to a button add a facet <code>'dropDownMenu'</code>
* containing a
* <a href="menu.html"><code><tc:menu></code></a>
* tag to the button. Label's and Image's on those menu tag's are ignored
@@ -47,7 +47,7 @@ import org.apache.myfaces.tobago.interna
* <pre>
* <tc:button onclick="alert('test 0')"
* label="Alert 0" >
- * <f:facet name="menupopup">
+ * <f:facet name="dropDownMenu">
* <tc:menu>
* <tc:menuCommand onclick="alert('test 1')" label="Alert 1"/>
* <tc:menuCommand onclick="alert('test 2')" label="Alert 2"/>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacetUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacetUtils.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacetUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacetUtils.java Tue Nov 27 12:33:14 2012
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIMenu;
-import org.apache.myfaces.tobago.internal.util.Deprecation;
import javax.faces.component.UIComponent;
@@ -46,19 +45,9 @@ public class FacetUtils {
/**
* A type save utility to get the facet <code>dropDownMenu</code> from a component.
- * It also returns the deprecated facet <code>menupopup</code>
*/
public static AbstractUIMenu getDropDownMenu(UIComponent component) {
- UIComponent result = component.getFacet(Facets.DROP_DOWN_MENU);
- if (result == null) {
- result = component.getFacet(Facets.MENUPOPUP);
- if (result != null) {
- if (Deprecation.LOG.isWarnEnabled()) {
- Deprecation.LOG.warn("Facet 'menupopup' was deprecated, please rename it to 'dropDownMenu'");
- }
- }
- }
- return (AbstractUIMenu) result;
+ return (AbstractUIMenu) component.getFacet(Facets.DROP_DOWN_MENU);
}
public static void setDropDownMenu(UIComponent component, AbstractUIMenu menu) {
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/FacetUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/FacetUtilsUnitTest.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/FacetUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/FacetUtilsUnitTest.java Tue Nov 27 12:33:14 2012
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.util;
-import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UIMenu;
import org.apache.myfaces.tobago.component.UIPanel;
import org.junit.Assert;
@@ -44,17 +43,4 @@ public class FacetUtilsUnitTest {
FacetUtils.setDropDownMenu(panel, menu);
Assert.assertEquals(menu, FacetUtils.getDropDownMenu(panel));
}
-
- /**
- * @deprecated since 1.5.0
- */
- @Test
- @Deprecated
- public void testMenupopup() {
- UIPanel panel = new UIPanel();
- Assert.assertNull(FacetUtils.getContextMenu(panel));
- UIMenu menu = new UIMenu();
- panel.getFacets().put(Facets.MENUPOPUP, menu);
- Assert.assertEquals(menu, FacetUtils.getDropDownMenu(panel));
- }
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=1414152&r1=1414151&r2=1414152&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Tue Nov 27 12:33:14 2012
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.render
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
import org.apache.myfaces.tobago.component.UIColumnEvent;
@@ -648,9 +647,6 @@ public final class HtmlRendererUtils {
commandMap = new CommandMap();
}
String key = entry.getKey();
- if (Facets.RESIZE_ACTION.equals(key)) {
- key = Facets.RESIZE;
- }
commandMap.addCommand(key, new Command(facesContext, entry.getValue(), id));
}
}