You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/07/23 15:37:08 UTC
svn commit: r967093 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/
tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
Author: bommel
Date: Fri Jul 23 13:37:07 2010
New Revision: 967093
URL: http://svn.apache.org/viewvc?rev=967093&view=rev
Log:
moved decode back to core for jdk 1.4 retrotranslated PageAction enum
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java (with props)
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java
Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java?rev=967093&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java (added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java Fri Jul 23 13:37:07 2010
@@ -0,0 +1,70 @@
+package org.apache.myfaces.tobago.internal.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.event.PageAction;
+import org.apache.myfaces.tobago.event.PageActionEvent;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+// Only for retrotranslation don't move me to other artifacts
+public class PagingUtils {
+
+ private static final Logger LOG = LoggerFactory.getLogger(PagingUtils.class);
+
+ public static void decode(FacesContext facesContext, UIComponent component) {
+ String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
+ String clientId = component.getClientId(facesContext);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("actionId = '" + actionId + "'");
+ LOG.debug("clientId = '" + clientId + "'");
+ }
+ if (actionId != null && actionId.equals(clientId)) {
+
+ PageAction action;
+ try {
+ action = PageAction.parse(component.getId());
+ } catch (Exception e) {
+ LOG.error("Illegal value for PageAction :" + component.getId());
+ return;
+ }
+ PageActionEvent event = new PageActionEvent(component.getParent(), action);
+
+ switch (action) {
+ case TO_PAGE:
+ case TO_ROW:
+ Map map = facesContext.getExternalContext().getRequestParameterMap();
+ Object value = map.get(clientId + ComponentUtils.SUB_SEPARATOR + "value");
+ try {
+ event.setValue(Integer.parseInt((String) value));
+ } catch (NumberFormatException e) {
+ LOG.error("Can't parse integer value for action " + action.name() + ": " + value);
+ }
+ break;
+ default:
+ // nothing more to do
+ }
+ component.queueEvent(event);
+ }
+ }
+}
\ No newline at end of file
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PagingUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java?rev=967093&r1=967092&r2=967093&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java Fri Jul 23 13:37:07 2010
@@ -17,6 +17,7 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
+import org.apache.myfaces.tobago.internal.util.PagingUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.event.PageAction;
@@ -33,38 +34,6 @@ public class SheetPageCommandRenderer ex
@Override
public void decode(FacesContext facesContext, UIComponent component) {
- String actionId = ComponentUtils.findPage(facesContext, component).getActionId();
- String clientId = component.getClientId(facesContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("actionId = '" + actionId + "'");
- LOG.debug("clientId = '" + clientId + "'");
- }
- if (actionId != null && actionId.equals(clientId)) {
-
- PageAction action;
- try {
- action = PageAction.parse(component.getId());
- } catch (Exception e) {
- LOG.error("Illegal value for PageAction :" + component.getId());
- return;
- }
- PageActionEvent event = new PageActionEvent(component.getParent(), action);
-
- switch (action) {
- case TO_PAGE:
- case TO_ROW:
- Map map = facesContext.getExternalContext().getRequestParameterMap();
- Object value = map.get(clientId + ComponentUtils.SUB_SEPARATOR + "value");
- try {
- event.setValue(Integer.parseInt((String) value));
- } catch (NumberFormatException e) {
- LOG.error("Can't parse integer value for action " + action.name() + ": " + value);
- }
- break;
- default:
- // nothing more to do
- }
- component.queueEvent(event);
- }
+ PagingUtils.decode(facesContext, component);
}
}