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 2011/11/24 17:20:37 UTC
svn commit: r1205910 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
tobago-example/tobago-example-demo/src/main/webapp/header.xhtml
Author: lofwyr
Date: Thu Nov 24 16:20:36 2011
New Revision: 1205910
URL: http://svn.apache.org/viewvc?rev=1205910&view=rev
Log:
code style
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/header.xhtml
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=1205910&r1=1205909&r2=1205910&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Thu Nov 24 16:20:36 2011
@@ -315,7 +315,7 @@ public abstract class AbstractUISheet ex
|| facesEvent instanceof PageActionEvent)) {
facesEvent.setPhaseId(PhaseId.INVOKE_APPLICATION);
if (LOG.isInfoEnabled()) {
- LOG.info("queueEvent = \"" + facesEvent + "\"");
+ LOG.info("queueEvent = '" + facesEvent + "'");
}
parent.queueEvent(facesEvent);
} else {
@@ -408,39 +408,37 @@ public abstract class AbstractUISheet ex
}
// todo: after removing jsf 1.1: @Override
- public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback callback)
+ public boolean invokeOnComponent(FacesContext facesContext, String clientId, ContextCallback callback)
throws FacesException {
// we may need setRowIndex on UISheet
int oldRowIndex = getRowIndex();
try {
- String sheetId = getClientId(context);
+ String sheetId = getClientId(facesContext);
if (clientId.startsWith(sheetId)) {
String idRemainder = clientId.substring(sheetId.length());
- if (LOG.isInfoEnabled()) {
- LOG.info("idRemainder = \"" + idRemainder + "\"");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("idRemainder = '" + idRemainder + "'");
}
if (idRemainder.matches("^:\\d+:.*")) {
idRemainder = idRemainder.substring(1);
int idx = idRemainder.indexOf(":");
try {
int rowIndex = Integer.parseInt(idRemainder.substring(0, idx));
- if (LOG.isInfoEnabled()) {
- LOG.info("set rowIndex = \"" + rowIndex + "\"");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("set rowIndex = '" + rowIndex + "'");
}
setRowIndex(rowIndex);
} catch (NumberFormatException e) {
- if (LOG.isInfoEnabled()) {
- LOG.error("idRemainder = \"" + idRemainder + "\"", e);
- }
+ LOG.warn("idRemainder = '" + idRemainder + "'", e);
}
} else {
- if (LOG.isInfoEnabled()) {
- LOG.info("no match for \"^:\\d+:.*\"");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("no match for '^:\\d+:.*'");
}
}
}
- return FacesUtils.invokeOnComponent(context, this, clientId, callback);
+ return FacesUtils.invokeOnComponent(facesContext, this, clientId, callback);
} finally {
// we should reset rowIndex on UISheet
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/header.xhtml?rev=1205910&r1=1205909&r2=1205910&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/header.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/header.xhtml Thu Nov 24 16:20:36 2011
@@ -28,6 +28,7 @@
</f:facet>
<tc:link action="#{navigation.gotoFirst}" immediate="true" image="image/tobago_head.gif"/>
+
<tc:panel>
<f:facet name="layout">
<tc:flowLayout textAlign="center"/>