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 2006/02/21 16:10:06 UTC
svn commit: r379482 - in /incubator/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/
tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobag...
Author: lofwyr
Date: Tue Feb 21 07:10:04 2006
New Revision: 379482
URL: http://svn.apache.org/viewcvs?rev=379482&view=rev
Log:
bugfix: rename back: getAccessKey1 -> getAccessKey
Modified:
incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Tue Feb 21 07:10:04 2006
@@ -89,7 +89,7 @@
return text;
}
- public Character getAccessKey1() {
+ public Character getAccessKey() {
return accessKey;
}
Modified: incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java (original)
+++ incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java Tue Feb 21 07:10:04 2006
@@ -32,7 +32,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(-1, label.getPos());
- assertEquals(null, label.getAccessKey1());
+ assertEquals(null, label.getAccessKey());
}
// code-sniplet-start id="test1"
@@ -43,7 +43,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(0, label.getPos());
- assertEquals(new Character('s'), label.getAccessKey1());
+ assertEquals(new Character('s'), label.getAccessKey());
}
// code-sniplet-end id="test1"
@@ -54,7 +54,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(3, label.getPos());
- assertEquals(new Character('E'), label.getAccessKey1());
+ assertEquals(new Character('E'), label.getAccessKey());
}
public void testAmpersand() {
@@ -63,7 +63,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(0, label.getPos());
- assertEquals(new Character('S'), label.getAccessKey1());
+ assertEquals(new Character('S'), label.getAccessKey());
}
public void testAmpersandAtEnd() {
@@ -72,7 +72,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(-1, label.getPos());
- assertEquals(null, label.getAccessKey1());
+ assertEquals(null, label.getAccessKey());
}
public void testAmpersandNo() {
@@ -81,7 +81,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(-1, label.getPos());
- assertEquals(null, label.getAccessKey1());
+ assertEquals(null, label.getAccessKey());
}
public void testMixed() {
@@ -92,7 +92,7 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
assertEquals(2, label.getPos());
- assertEquals(new Character('v'), label.getAccessKey1());
+ assertEquals(new Character('v'), label.getAccessKey());
}
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java Tue Feb 21 07:10:04 2006
@@ -83,12 +83,12 @@
}
writer.writeAttribute("style", null, ATTR_STYLE);
writer.writeComponentClass();
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
writer.writeText("", null); // force closing the start tag
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Tue Feb 21 07:10:04 2006
@@ -100,12 +100,12 @@
writer.writeAttribute("for", forValue, null);
}
writer.writeComponentClass();
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
if (width != null) {
writer.writeAttribute("style", "width: " + width + "px;", null);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java Tue Feb 21 07:10:04 2006
@@ -99,12 +99,12 @@
}
writer.writeAttribute("title", null, ATTR_TIP);
writer.writeAttribute("target", null, ATTR_TARGET);
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
writer.writeText("", null); // force closing the start tag
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Tue Feb 21 07:10:04 2006
@@ -230,12 +230,12 @@
writer.writeAttribute("onkeydown", "tobagoMenuKeyDown(event)", null);
writer.writeAttribute("onkeypress", "tobagoMenuKeyPress(event)", null);
if (label.getText() != null) {
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
}
@@ -447,12 +447,12 @@
writer.startElement("a", null);
writer.writeClassAttribute(spanClass);
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
writer.writeAttribute("href", "#", null);
writer.writeAttribute("onfocus", "tobagoMenuFocus(event)", null);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Tue Feb 21 07:10:04 2006
@@ -248,12 +248,12 @@
writer.writeClassAttribute("tobago-tab-link");
writer.writeIdAttribute(clientId + "." + virtualTab + SUBCOMPONENT_SEP + i);
writer.writeAttribute("href", url, null);
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isWarnEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.warn("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.warn("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
// writer.writeAttribute("onfocus", "this.click();", null);
}
if (label.getText() != null) {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java?rev=379482&r1=379481&r2=379482&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Tue Feb 21 07:10:04 2006
@@ -496,12 +496,12 @@
if (!disabled) {
writer.writeAttribute("href", "#", null);
writer.writeAttribute("onfocus", "tobagoToolbarFocus(this, event)", null);
- if (label.getAccessKey1() != null) {
+ if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
- && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey1());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- writer.writeAttribute("accesskey", label.getAccessKey1(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey(), null);
}
}
}