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 2010/02/08 16:45:02 UTC
svn commit: r907699 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
core/src/main/java/org/apache/myfaces/tobago/u...
Author: lofwyr
Date: Mon Feb 8 15:45:00 2010
New Revision: 907699
URL: http://svn.apache.org/viewvc?rev=907699&view=rev
Log:
clean up
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java Mon Feb 8 15:45:00 2010
@@ -24,11 +24,14 @@
* @see org.apache.myfaces.tobago.component.UICommandBase
* @see org.apache.myfaces.tobago.component.OnComponentCreated
* @see org.apache.myfaces.tobago.renderkit.HtmlUtils
+ * @see org.apache.myfaces.tobago.util.ComponentUtils
* @deprecated
*/
@Deprecated
public final class TobagoConstants {
+ /** @deprecated Please use ComponentUtils.SUB_SEPARATOR instead. Will be removed after Tobago 1.5 */
+ @Deprecated
public static final String SUBCOMPONENT_SEP = "::";
/** @deprecated Please use AbstractUICommand instead. Will be removed after Tobago 1.5 */
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIPage.java Mon Feb 8 15:45:00 2010
@@ -47,8 +47,6 @@
import java.util.List;
import java.util.StringTokenizer;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public abstract class AbstractUIPage extends AbstractUIForm
implements OnComponentPopulated, InvokeOnComponent, LayoutContainer, DeprecatedDimension {
@@ -75,7 +73,7 @@
public String getFormId(FacesContext facesContext) {
if (formId == null) {
- formId = getClientId(facesContext) + SUBCOMPONENT_SEP + "form";
+ formId = getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form";
}
return formId;
}
@@ -222,8 +220,7 @@
String name;
String value = null;
try {
- name = getClientId(facesContext)
- + SUBCOMPONENT_SEP + "form-clientDimension";
+ name = getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form-clientDimension";
value = (String) facesContext.getExternalContext()
.getRequestParameterMap().get(name);
if (value != null) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Mon Feb 8 15:45:00 2010
@@ -22,12 +22,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.AbstractUIPage;
import org.apache.myfaces.tobago.layout.Box;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public class PageRendererBase extends LayoutComponentRendererBase {
private static final Log LOG = LogFactory.getLog(PageRendererBase.class);
@@ -36,7 +35,7 @@
if (component instanceof AbstractUIPage) {
AbstractUIPage page = (AbstractUIPage) component;
- String actionIdName = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "form-action";
+ String actionIdName = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form-action";
String newActionId = (String) facesContext.getExternalContext().getRequestParameterMap().get(actionIdName);
if (LOG.isDebugEnabled()) {
LOG.debug("action = " + newActionId);
@@ -44,7 +43,7 @@
page.setActionId(newActionId);
try {
- String actionPositionName = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "action-position";
+ String actionPositionName = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "action-position";
String actionPositionString = (String)
facesContext.getExternalContext().getRequestParameterMap().get(actionPositionName);
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SheetUtils.java Mon Feb 8 15:45:00 2010
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
import org.apache.myfaces.tobago.event.PageAction;
import org.apache.myfaces.tobago.event.PageActionEvent;
import org.apache.myfaces.tobago.event.PageActionUtil;
@@ -64,7 +63,7 @@
case TO_PAGE:
case TO_ROW:
Map map = facesContext.getExternalContext().getRequestParameterMap();
- Object value = map.get(clientId + SUBCOMPONENT_SEP + "value");
+ Object value = map.get(clientId + ComponentUtils.SUB_SEPARATOR + "value");
try {
event.setValue(Integer.parseInt((String) value));
} catch (Exception e) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Mon Feb 8 15:45:00 2010
@@ -74,6 +74,8 @@
private static final Log LOG = LogFactory.getLog(ComponentUtils.class);
+ public static final String SUB_SEPARATOR = "::";
+
private static final String RENDER_KEY_PREFIX
= "org.apache.myfaces.tobago.util.ComponentUtils.RendererKeyPrefix_";
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Mon Feb 8 15:45:00 2010
@@ -17,7 +17,6 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.component.AbstractUINumberSlider;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -193,19 +192,19 @@
private String getIdForInputField(FacesContext context,
UIComponent component) {
String id = component.getClientId(context);
- return id + TobagoConstants.SUBCOMPONENT_SEP + "input";
+ return id + ComponentUtils.SUB_SEPARATOR + "input";
}
private String getIdForSliderTrack(FacesContext context,
UIComponent component) {
String id = component.getClientId(context);
- return id + TobagoConstants.SUBCOMPONENT_SEP + "track";
+ return id + ComponentUtils.SUB_SEPARATOR + "track";
}
private String getIdForSliderHandle(FacesContext context,
UIComponent component) {
String id = component.getClientId(context);
- return id + TobagoConstants.SUBCOMPONENT_SEP + "handle";
+ return id + ComponentUtils.SUB_SEPARATOR + "handle";
}
private void writeSliderJavaScript(FacesContext context, UIComponent component,
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Mon Feb 8 15:45:00 2010
@@ -24,19 +24,18 @@
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import java.io.IOException;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public class MenuBarRenderer extends LayoutComponentRendererBase {
private static final Log LOG = LogFactory.getLog(MenuBarRenderer.class);
- public static final String SEARCH_ID_POSTFIX = SUBCOMPONENT_SEP + "popup";
+ public static final String SEARCH_ID_POSTFIX = ComponentUtils.SUB_SEPARATOR + "popup";
private static final String MENU_ACCELERATOR_KEYS = "menuAcceleratorKeys";
// XXX check the ajax case
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Mon Feb 8 15:45:00 2010
@@ -64,8 +64,6 @@
import java.util.Map;
import java.util.Set;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public class PageRenderer extends PageRendererBase {
private static final Log LOG = LogFactory.getLog(PageRenderer.class);
@@ -87,13 +85,13 @@
super.decode(facesContext, component);
String clientId = component.getClientId(facesContext);
ExternalContext externalContext = facesContext.getExternalContext();
- String severity =
- (String) externalContext.getRequestParameterMap().get(clientId + SUBCOMPONENT_SEP + "clientSeverity");
+ String severity = (String)
+ externalContext.getRequestParameterMap().get(clientId + ComponentUtils.SUB_SEPARATOR + "clientSeverity");
if (severity != null) {
externalContext.getRequestMap().put(CLIENT_DEBUG_SEVERITY, severity);
}
- String lastFocusId =
- (String) externalContext.getRequestParameterMap().get(clientId + SUBCOMPONENT_SEP + LAST_FOCUS_ID);
+ String lastFocusId = (String)
+ externalContext.getRequestParameterMap().get(clientId + ComponentUtils.SUB_SEPARATOR + LAST_FOCUS_ID);
if (lastFocusId != null) {
component.getAttributes().put(LAST_FOCUS_ID, lastFocusId);
}
@@ -376,29 +374,29 @@
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
- writer.writeNameAttribute(clientId + SUBCOMPONENT_SEP + "form-action");
- writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + "form-action");
+ writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-action");
+ writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "form-action");
writer.writeAttribute(HtmlAttributes.VALUE, defaultActionId, true);
writer.endElement(HtmlConstants.INPUT);
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
- writer.writeNameAttribute(clientId + SUBCOMPONENT_SEP + "context-path");
- writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + "context-path");
+ writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "context-path");
+ writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "context-path");
writer.writeAttribute(HtmlAttributes.VALUE, facesContext.getExternalContext().getRequestContextPath(), true);
writer.endElement(HtmlConstants.INPUT);
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
- writer.writeNameAttribute(clientId + SUBCOMPONENT_SEP + "action-position");
- writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + "action-position");
+ writer.writeNameAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "action-position");
+ writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "action-position");
writer.endElement(HtmlConstants.INPUT);
if (debugMode) {
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.VALUE, clientLogSeverity);
- writer.writeAttribute(HtmlAttributes.ID, clientId + SUBCOMPONENT_SEP + "clientSeverity", false);
- writer.writeAttribute(HtmlAttributes.NAME, clientId + SUBCOMPONENT_SEP + "clientSeverity", false);
+ writer.writeAttribute(HtmlAttributes.ID, clientId + ComponentUtils.SUB_SEPARATOR + "clientSeverity", false);
+ writer.writeAttribute(HtmlAttributes.NAME, clientId + ComponentUtils.SUB_SEPARATOR + "clientSeverity", false);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.endElement(HtmlConstants.INPUT);
}
@@ -488,7 +486,7 @@
ViewHandler viewHandler = application.getViewHandler();
writer.startElement(HtmlConstants.SPAN, null);
- writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + "jsf-state-container");
+ writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "jsf-state-container");
writer.flush();
viewHandler.writeState(facesContext);
writer.endElement(HtmlConstants.SPAN);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Mon Feb 8 15:45:00 2010
@@ -45,15 +45,11 @@
import javax.faces.context.FacesContext;
import java.io.IOException;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public class PopupRenderer extends LayoutComponentRendererBase implements AjaxRenderer {
@SuppressWarnings({"UnusedDeclaration"})
private static final Log LOG = LogFactory.getLog(PopupRenderer.class);
- public static final String CONTENT_ID_POSTFIX = SUBCOMPONENT_SEP + "content";
-
public boolean getRendersChildren() {
return true;
}
@@ -75,7 +71,7 @@
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UIPopup component = (UIPopup) uiComponent;
final String clientId = component.getClientId(facesContext);
- final String contentDivId = clientId + CONTENT_ID_POSTFIX;
+ final String contentDivId = clientId + ComponentUtils.SUB_SEPARATOR + "content";
//final String left = component.getLeft();
//final String top = component.getTop();
Integer zIndex = (Integer) component.getAttributes().get(Attributes.Z_INDEX);
@@ -119,7 +115,7 @@
}
if (VariableResolverUtil.resolveClientProperties(facesContext).getUserAgent().isMsie()) {
writer.startElement(HtmlConstants.IFRAME, component);
- writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + HtmlConstants.IFRAME);
+ writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + HtmlConstants.IFRAME);
writer.writeClassAttribute("tobago-popup-iframe tobago-popup-none");
writer.writeStyleAttribute("z-index: " + (zIndex + 2) + ";");
UIPage page = (UIPage) ComponentUtils.findPage(facesContext);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Mon Feb 8 15:45:00 2010
@@ -62,7 +62,6 @@
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.text.MessageFormat;
@@ -72,7 +71,6 @@
import java.util.Locale;
import java.util.Map;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
import static org.apache.myfaces.tobago.component.UISheet.NONE;
public class SheetRenderer extends LayoutComponentRendererBase implements AjaxRenderer {
@@ -81,9 +79,9 @@
private static final String[] SCRIPTS = new String[]{"script/tobago-sheet.js"};
- public static final String WIDTHS_POSTFIX = SUBCOMPONENT_SEP + "widths";
- public static final String SCROLL_POSTFIX = SUBCOMPONENT_SEP + "scrollPosition";
- public static final String SELECTED_POSTFIX = SUBCOMPONENT_SEP + "selected";
+ public static final String WIDTHS_POSTFIX = ComponentUtils.SUB_SEPARATOR + "widths";
+ public static final String SCROLL_POSTFIX = ComponentUtils.SUB_SEPARATOR + "scrollPosition";
+ public static final String SELECTED_POSTFIX = ComponentUtils.SUB_SEPARATOR + "selected";
private static final Integer HEIGHT_0 = 0;
@@ -141,11 +139,10 @@
writer.endElement(HtmlConstants.DIV);
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
- UIViewRoot viewRoot = facesContext.getViewRoot();
String contextPath = facesContext.getExternalContext().getRequestContextPath();
- String unchecked = contextPath + resourceManager.getImage(viewRoot, "image/sheetUnchecked.gif");
- String checked = contextPath + resourceManager.getImage(viewRoot, "image/sheetChecked.gif");
+ String unchecked = contextPath + resourceManager.getImage(facesContext, "image/sheetUnchecked.gif");
+ String checked = contextPath + resourceManager.getImage(facesContext, "image/sheetChecked.gif");
boolean ajaxEnabled = TobagoConfig.getInstance(facesContext).isAjaxEnabled();
Integer frequency = null;
@@ -172,13 +169,12 @@
throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
- UIViewRoot viewRoot = facesContext.getViewRoot();
String contextPath = facesContext.getExternalContext().getRequestContextPath();
String sheetId = sheet.getClientId(facesContext);
- String image1x1 = contextPath + resourceManager.getImage(viewRoot, "image/1x1.gif");
- String selectorDisabled = contextPath + resourceManager.getImage(viewRoot, "image/sheetUncheckedDisabled.gif");
- String unchecked = contextPath + resourceManager.getImage(viewRoot, "image/sheetUnchecked.gif");
+ String image1x1 = contextPath + resourceManager.getImage(facesContext, "image/1x1.gif");
+ String selectorDisabled = contextPath + resourceManager.getImage(facesContext, "image/sheetUncheckedDisabled.gif");
+ String unchecked = contextPath + resourceManager.getImage(facesContext, "image/sheetUnchecked.gif");
//Style headerStyle = (Style) attributes.get(STYLE_HEADER);
// String sheetWidthString = LayoutUtils.getStyleAttributeValue(style,
@@ -243,9 +239,9 @@
int columnCount = 0;
Measure sortMarkerWidth = getAscendingMarkerWidth(facesContext, sheet);
- String imageAscending = contextPath + resourceManager.getImage(viewRoot, "image/ascending.gif");
- String imageDescending = contextPath + resourceManager.getImage(viewRoot, "image/descending.gif");
- String img = resourceManager.getImage(viewRoot, "image/unsorted.gif", true);
+ String imageAscending = contextPath + resourceManager.getImage(facesContext, "image/ascending.gif");
+ String imageDescending = contextPath + resourceManager.getImage(facesContext, "image/descending.gif");
+ String img = resourceManager.getImage(facesContext, "image/unsorted.gif", true);
String imageUnsorted = image1x1;
if (img != null) {
imageUnsorted = contextPath + img;
@@ -500,7 +496,7 @@
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute(className);
- writer.writeIdAttribute(sheetId + SUBCOMPONENT_SEP + "pagingLinks");
+ writer.writeIdAttribute(sheetId + ComponentUtils.SUB_SEPARATOR + "pagingLinks");
writeDirectPagingLinks(writer, facesContext, application, sheet);
writer.endElement(HtmlConstants.SPAN);
}
@@ -522,7 +518,7 @@
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute(className);
- writer.writeIdAttribute(sheetId + SUBCOMPONENT_SEP + "pagingPages");
+ writer.writeIdAttribute(sheetId + ComponentUtils.SUB_SEPARATOR + "pagingPages");
writer.writeText("");
boolean atBeginning = sheet.isAtBeginning();
@@ -574,7 +570,7 @@
first,
last,
sheet.getRowCount(),
- pagerCommandId + SUBCOMPONENT_SEP + "text"
+ pagerCommandId + ComponentUtils.SUB_SEPARATOR + "text"
};
sheetPagingInfo = detail.format(args);
} else {
@@ -740,7 +736,7 @@
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(data.getClientId(facesContext)
- + SUBCOMPONENT_SEP + "pagingPages" + SUBCOMPONENT_SEP + command.getToken());
+ + ComponentUtils.SUB_SEPARATOR + "pagingPages" + ComponentUtils.SUB_SEPARATOR + command.getToken());
writer.writeClassAttribute("tobago-sheet-footer-pager-button"
+ (disabled ? " tobago-sheet-footer-pager-button-disabled" : ""));
writer.writeAttribute(HtmlAttributes.SRC, image, false);
@@ -1007,7 +1003,7 @@
}
String name;
- int skip = prevs.size() > 0 ? ((Integer) prevs.get(0)) : 1;
+ int skip = prevs.size() > 0 ? prevs.get(0) : 1;
if (skip > 1) {
skip -= (linkCount - (linkCount / 2));
skip--;
@@ -1033,8 +1029,7 @@
writeLinkElement(writer, name, name, pagerCommandId, hrefPostfix, true);
}
- skip = nexts.size() > 0
- ? ((Integer) nexts.get(nexts.size() - 1)) : data.getPages();
+ skip = nexts.size() > 0 ? nexts.get(nexts.size() - 1) : data.getPages();
if (skip < data.getPages()) {
skip += linkCount / 2;
skip++;
@@ -1069,9 +1064,9 @@
writer.startElement(type, null);
writer.writeClassAttribute("tobago-sheet-paging-links-link");
if (makeLink) {
- writer.writeIdAttribute(id + SUBCOMPONENT_SEP + "link_" + skip);
- writer.writeAttribute(HtmlAttributes.HREF, "javascript: tobagoSheetSetPagerPage('"
- + id + "', '" + skip + hrefPostfix, null);
+ writer.writeIdAttribute(id + ComponentUtils.SUB_SEPARATOR + "link_" + skip);
+ writer.writeAttribute(
+ HtmlAttributes.HREF, "javascript: tobagoSheetSetPagerPage('" + id + "', '" + skip + hrefPostfix, true);
}
writer.flush();
writer.write(str);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Mon Feb 8 15:45:00 2010
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UITime;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -109,7 +108,7 @@
String second = new SimpleDateFormat("ss").format(date);
String id = input.getClientId(facesContext);
- final String idPrefix = id + SUBCOMPONENT_SEP;
+ final String idPrefix = id + ComponentUtils.SUB_SEPARATOR;
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, input);
writer.writeClassAttribute();
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Mon Feb 8 15:45:00 2010
@@ -51,8 +51,6 @@
import java.util.Iterator;
import java.util.List;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public abstract class ToolBarRendererBase extends LayoutComponentRendererBase {
private static final Log LOG = LogFactory.getLog(ToolBarRendererBase.class);
@@ -218,7 +216,7 @@
String iconName = (String) command.getAttributes().get(Attributes.IMAGE);
String image = getImage(facesContext, iconName, iconSize, disabled, selected);
- String graphicId = clientId + SUBCOMPONENT_SEP + "icon";
+ String graphicId = clientId + ComponentUtils.SUB_SEPARATOR + "icon";
final String hover = getHoverClasses(first, last);
final String mouseOverScript = "Tobago.toolbarMousesover(this, '" + hover + "', '" + graphicId + "');";
@@ -414,7 +412,7 @@
if (!disabled) {
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
writer.writeAttribute(HtmlAttributes.ONFOCUS, "Tobago.toolbarFocus(this, event)", false);
- String id = command.getClientId(facesContext) + SUBCOMPONENT_SEP + "link";
+ String id = command.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "link";
writer.writeIdAttribute(id);
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
@@ -445,7 +443,7 @@
"image/1x1.gif");
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(
- command.getClientId(facesContext) + SUBCOMPONENT_SEP + "popup");
+ command.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "popup");
writer.writeClassAttribute("tobago-toolBar-button-menu");
writer.startElement(HtmlConstants.IMG, null);
writer.writeAttribute(HtmlAttributes.SRC, backgroundImage, false);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Mon Feb 8 15:45:00 2010
@@ -20,7 +20,6 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.TobagoConstants;
import org.apache.myfaces.tobago.component.AbstractUITree;
import org.apache.myfaces.tobago.component.AbstractUITreeNode;
import org.apache.myfaces.tobago.component.Attributes;
@@ -166,7 +165,7 @@
}
writer.startElement(HtmlConstants.SELECT, node);
- writer.writeIdAttribute(id + TobagoConstants.SUBCOMPONENT_SEP + "select");
+ writer.writeIdAttribute(id + ComponentUtils.SUB_SEPARATOR + "select");
StyleClasses selectClass = new StyleClasses();
selectClass.addClass("treeListbox", "select");
writer.writeClassAttribute(selectClass);
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=907699&r1=907698&r2=907699&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Mon Feb 8 15:45:00 2010
@@ -17,8 +17,6 @@
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.component.Attributes;
@@ -40,14 +38,8 @@
import java.io.IOException;
import java.util.Map;
-import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-
public class BoxRenderer extends BoxRendererBase implements AjaxRenderer {
- private static final Log LOG = LogFactory.getLog(BoxRenderer.class);
- public static final String CONTENT_INNER = SUBCOMPONENT_SEP + "content-inner";
- public static final String HEADER = SUBCOMPONENT_SEP + "header";
-
@Override
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);