You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2007/05/11 03:10:56 UTC
svn commit: r537064 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinid...
Author: jwaldman
Date: Thu May 10 18:10:55 2007
New Revision: 537064
URL: http://svn.apache.org/viewvc?view=rev&rev=537064
Log:
ADFFACES-481 Warning and Info icons don't display on PDAs
(committed for Piyush Hari)
PdaHtmlSkin.java
icon-minimalPPC-golden.xml
ADFFACES-486 show/hide icons for a Tree component do not display on PDAs
TreeRenderer.java
(fixed up the patch a bit. committed for Piyush Hari)
SimplePortletSkin.java - changed new String() to "".
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java?view=diff&rev=537064&r1=537063&r2=537064
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/PdaHtmlSkin.java Thu May 10 18:10:55 2007
@@ -21,7 +21,6 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinProperties;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
-import org.apache.myfaces.trinidadinternal.skin.icon.NullIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.ReferenceIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
@@ -54,12 +53,6 @@
// and subclasses of PdaHtmlSkin.
private static final Object[] _CUSTOMIZABLE_ICONS = new Object[]
{
- // null out icons that have an undesirable default in base skin
- SkinSelectors.WARNING_ICON_ALIAS_NAME,
- NullIcon.sharedInstance(),
- SkinSelectors.INFO_ICON_ALIAS_NAME,
- NullIcon.sharedInstance(),
-
// Path separator: >
SkinSelectors.PATH_SEPARATOR_ICON_ALIAS_NAME,
new TextIcon("\u00a0>\u00a0"),
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java?view=diff&rev=537064&r1=537063&r2=537064
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java Thu May 10 18:10:55 2007
@@ -91,7 +91,7 @@
private static final Map<String, String> _STYLES_MAP = new HashMap<String, String>(350);
- private static final String _NULL_STYLE = new String();
+ private static final String _NULL_STYLE = "";
private static final String _PORTLET_FONT = "portlet-font";
private static final String _PORTLET_FONT_DIM = "portlet-font-dim";
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java?view=diff&rev=537064&r1=537063&r2=537064
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java Thu May 10 18:10:55 2007
@@ -287,24 +287,40 @@
// single arrow left
text =
rc.isRightToLeft()? "\u2190": "\u2192"; // single arrow right
+ else if(isPDA(rc))
+ //for PDAs use a simple "+" or "-" since miscellaneous unicode characters
+ //are not supported
+ text = "[+]"; //plus sign
else // triangle left
text =
rc.isRightToLeft()? "\u25C4": "\u25BA"; // triangle right
- altText = rc.getTranslatedString(_EXPAND_TIP_KEY);
+
+ altText = rc.getTranslatedString(_EXPAND_TIP_KEY);
break;
case EXPAND_OPEN:
//"\u21D3"; // double arrow down
if (isMacOS)
text = "\u2193"; // single arrow down
+ else if(isPDA(rc))
+ //for PDAs use a simple "+" or "-" since miscellaneous unicode characters
+ //are not supported
+ text = "[-]"; //plus sign
else
text = "\u25BC"; // triangle down
+
+
altText = rc.getTranslatedString(_COLLAPSE_TIP_KEY);
break;
case EXPAND_ALWAYS:
if (isMacOS)
text = "\u2193"; // single arrow down
+ else if(isPDA(rc))
+ text = "[-]"; //plus sign
else
text = "\u25BC"; // triangle down
+ //for PDAs use a simple "+" or "-" since miscellaneous unicode character
+ //s are not supported
+
altText = rc.getTranslatedString(_DISABLED_COLLAPSE_TIP_KEY);
break;
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml?view=diff&rev=537064&r1=537063&r2=537064
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml Thu May 10 18:10:55 2007
@@ -7,8 +7,20 @@
</span>
<!--AttributeTest[name,info]-->
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
<!--AttributeTest[name,warning]-->
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
<!--AttributeTest[name,error]-->
<span