Diff of /incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java

Parent Directory | Revision Log | Patch

--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java	2006/02/04 21:44:01	374935
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java	2006/02/04 21:47:46	374936
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
 /*
  * Copyright 2002-2005 The Apache Software Foundation.
- * 
- *    Licensed 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.
+ *
+ * Licensed 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.
  */
+
 /*
  * Created 07.02.2003 16:00:00.
  * $Id$
  */
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -49,10 +51,6 @@ public class ButtonRenderer extends Comm
 
   private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);
 
-// ----------------------------------------------------------------- interfaces
-
-
-// ---------------------------- interface TobagoRenderer
 
   public void encodeBeginTobago(FacesContext facesContext,
       UIComponent component) throws IOException {
@@ -85,12 +83,12 @@ public class ButtonRenderer extends Comm
     }
     writer.writeAttribute("style", null, ATTR_STYLE);
     writer.writeComponentClass();
-    if (label.getAccessKey() != null) {
+    if (label.getAccessKey1() != null) {
       if (LOG.isInfoEnabled()
-          && ! AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
-        LOG.info("dublicated accessKey : " + label.getAccessKey());
+          && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
+        LOG.info("dublicated accessKey : " + label.getAccessKey1());
       }
-      writer.writeAttribute("accesskey", label.getAccessKey(), null);
+      writer.writeAttribute("accesskey", label.getAccessKey1(), null);
     }
     writer.writeText("", null); // force closing the start tag
 
@@ -165,13 +163,12 @@ public class ButtonRenderer extends Comm
     } else if (COMMAND_TYPE_SCRIPT.equals(type)) {
       onclick = command;
     } else if (defaultCommand) {
-      onclick = "setAction('" +
-          ComponentUtil.findPage(component).getFormId(facesContext) +
-          "','" + clientId + "')";
+      onclick = "setAction('" + ComponentUtil.findPage(component).getFormId(facesContext)
+          + "','" + clientId + "')";
     } else {
-      onclick = "submitAction('" +
-          ComponentUtil.findPage(component).getFormId(facesContext) +
-          "','" + clientId + "')";
+      onclick = "submitAction('"
+          + ComponentUtil.findPage(component).getFormId(facesContext)
+          + "','" + clientId + "')";
     }
     return onclick;
   }