Author: jwaldman
Date: Thu Dec 14 18:22:16 2006
New Revision: 487430
URL: http://svn.apache.org/viewvc?view=rev&rev=487430
Log:
small changes: delete some commented out code. fix a comment. Move
getStyleClassMap that delegates to the base skin code that was in
MinimalPortletSkinExtension up to SkinExtension since this will be needed by
other subclasses of SkinExtension.
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java?view=diff&rev=487430&r1=487429&r2=487430
==============================================================================
---
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
(original)
+++
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
Thu Dec 14 18:22:16 2006
@@ -29,11 +29,4 @@
XhtmlConstants.OUTPUT_MODE_PORTLET);
}
- public Map<String, String> getStyleClassMap(
- RenderingContext arc
- )
- {
- // get base skin and call that map.
- return getBaseSkin().getStyleClassMap(arc);
- }
}
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java?view=diff&rev=487430&r1=487429&r2=487430
==============================================================================
---
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
(original)
+++
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePortletSkin.java
Thu Dec 14 18:22:16 2006
@@ -56,34 +56,6 @@
{
return CoreRenderKit.OUTPUT_MODE_PORTLET;
}
-
-
-/*** =-=jmwSKIN. This split the styleclass, then mapped each one. We are only
returning a map, so will it work? I should...
- * I think. It might not work if they set a styleClass. Test, test, test.
- public String getStyleClass(
- String styleClass)
- {
- String[] stylesArray = styleClass.split("\\s");
- StringBuffer buffer = new StringBuffer(styleClass.length()*3);
- boolean isNullStyle = false;
-
- for (int i=0; i < stylesArray.length; i++)
- {
- String portletStyleClass = (String)_STYLES_MAP.get(stylesArray[i]);
- if (_NULL_STYLE.equals(portletStyleClass))
- isNullStyle = true;
- else if (portletStyleClass != null)
- buffer.append(portletStyleClass);
-
- }
- String bufferString = buffer.toString();
- if (isNullStyle && "".equals(bufferString))
- return "";
- else
- // if nothing was mapped, return the style class
- return ("".equals(bufferString)) ? styleClass : bufferString;
- }
- ***/
/**
Modified:
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java?view=diff&rev=487430&r1=487429&r2=487430
==============================================================================
---
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
(original)
+++
incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
Thu Dec 14 18:22:16 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2006 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.
@@ -59,9 +59,7 @@
* Skin "extends". If it is a Skin designed for
"org.apache.myfaces.trinidad.desktop"
* render-kit-id, then its base skin should be SimpleDesktopSkin.
* If it is a Skin designed for "org.apache.myfaces.trinidad.pda"
render-kit-id,
- * then its base skin should be SimplePdaSkin. Currently, we
- * do not allow one SkinExtension to extend another, but we may
- * someday.
+ * then its base skin should be SimplePdaSkin.
* Must be non-null.
* @param id A string which can be used to uniquely identify the
* Skin .
@@ -188,6 +186,19 @@
super.registerIcon(iconName, icon);
}
+
+ /**
+ * Returns the styleClassMap for this extension
+ */
+ @Override
+ public Map<String, String> getStyleClassMap(
+ RenderingContext arc
+ )
+ {
+ if (_styleClassMap != null)
+ return _styleClassMap;
+ return _baseSkin.getStyleClassMap(arc);
+ }
/**
* Override of Skin.getTranslatedValue() which
@@ -477,7 +488,7 @@
)
{
// We store the translation keys map in the translation cache
- Map<String, Boolean> keys =
+ Map<String, Boolean> keys =
(Map<String, Boolean>)_getCachedTranslatedValue(lContext,
_TRANSLATION_KEYS_KEY);
@@ -547,10 +558,10 @@
_LOG.warning(_CIRCULAR_INCLUDE_ERROR + refName);
return null;
}
-
+
if (referencedIconStack == null)
{
- // -= Simon Lessard =-
+ // -= Simon Lessard =-
// TODO: Check if something better than Stack can be used
referencedIconStack = new Stack<String>();
}
@@ -595,7 +606,7 @@
// Tests whether the value is present in the (possibly null) stack.
private static boolean _stackContains(
- Stack<String> stack,
+ Stack<String> stack,
Object value)
{
if (stack == null)
@@ -627,6 +638,7 @@
private SkinImpl _baseSkin;
private String _styleSheetName;
private String _bundleName;
+ private Map<String, String> _styleClassMap;
// Now that we look into possibly multiple ResourceBundles
// to find a translation (eg. the local bundle, a component
@@ -641,7 +653,7 @@
//
// This HashMap hashes Locales -> HashMaps.
// The HashMaps map translation key to message.
- private OptimisticHashMap<Locale, Map<String, Object>> _translations =
+ private OptimisticHashMap<Locale, Map<String, Object>> _translations =
new OptimisticHashMap<Locale, Map<String, Object>>(13);
// The StyleSheetDocument for the base LookAndFeel's style sheet
