You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ck...@apache.org on 2010/01/26 18:49:46 UTC
svn commit: r903341 [1/3] - in
/myfaces/trinidad/trunk/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/renderkit/core/
java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/
java/org/apache/myfaces/trinidadinternal/renderkit/cor...
Author: ckormos
Date: Tue Jan 26 17:49:44 2010
New Revision: 903341
URL: http://svn.apache.org/viewvc?rev=903341&view=rev
Log:
Patch applied for [TRINIDAD-1689] - New Trinidad Default Skin - Casablanca (Thanks to Adonis Raduca for providing the skin and to Marius Petoi for providing the integration patches).
Added:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/button.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonHover.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHead.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadHover.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelected.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelectedHover.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyAccented.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossed.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossedSelected.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/tableHead.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosed.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosedSelected.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeHover.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikePressed.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeRised.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled_8bit.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover_8bit.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal_8bit.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected_8bit.png (with props)
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css (with props)
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Tue Jan 26 17:49:44 2010
@@ -425,12 +425,12 @@
}
/**
- * Return the default skin family, which is "minimal" for the
+ * Return the default skin family, which is "casablanca" for the
* core renderkit.
*/
protected String getDefaultSkinFamily()
{
- return "minimal";
+ return TrinidadRenderingConstants.CASABLANCA_SKIN_FAMILY;
}
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java?rev=903341&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java Tue Jan 26 17:49:44 2010
@@ -0,0 +1,35 @@
+package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
+
+import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TrinidadRenderingConstants;
+import org.apache.myfaces.trinidad.skin.Skin;
+
+/** Class for the Casablanca desktop skin
+ *
+ * @author Marius Petoi
+ */
+public class CasablancaDesktopSkin extends SkinExtension {
+
+ /**
+ * Constructs a CasablancaDesktopSkin instance
+ */
+ public CasablancaDesktopSkin(Skin baseSkin)
+ {
+ // Create a SkinExtension for Casablanca
+ super(baseSkin,
+ _CASABLANCA_DESKTOP_ID,
+ TrinidadRenderingConstants.CASABLANCA_SKIN_FAMILY,
+ TrinidadRenderingConstants.APACHE_TRINIDAD_DESKTOP);
+
+ // Register our style sheet
+ setStyleSheetName(_CASABLANCA_STYLE_SHEET_NAME);
+ }
+
+ // Casablanca skin id
+ private static final String _CASABLANCA_DESKTOP_ID = "casablanca.desktop";
+
+
+ // Casablanca skin style sheet name
+ private static final String _CASABLANCA_STYLE_SHEET_NAME =
+ "META-INF/adf/styles/casablancaSkin.css";
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaDesktopSkin.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java?rev=903341&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java Tue Jan 26 17:49:44 2010
@@ -0,0 +1,35 @@
+package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
+
+import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TrinidadRenderingConstants;
+import org.apache.myfaces.trinidad.skin.Skin;
+
+/** Class for the Casablanca PDA skin
+ *
+ * @author Marius Petoi
+ */
+public class CasablancaPdaSkin extends SkinExtension {
+
+ /**
+ * Constructs a CasablancaPdaSkin instance
+ */
+ public CasablancaPdaSkin(Skin baseSkin)
+ {
+ // Create a SkinExtension for Casablanca
+ super(baseSkin,
+ _CASABLANCA_PDA_ID,
+ TrinidadRenderingConstants.CASABLANCA_SKIN_FAMILY,
+ TrinidadRenderingConstants.APACHE_TRINIDAD_PDA);
+
+ // Register our style sheet
+ setStyleSheetName(_CASABLANCA_STYLE_SHEET_NAME);
+ }
+
+ // Casablanca skin id
+ private static final String _CASABLANCA_PDA_ID = "casablanca.pda";
+
+
+ // Casablanca skin style sheet name
+ private static final String _CASABLANCA_STYLE_SHEET_NAME =
+ "META-INF/adf/styles/casablancaSkin.css";
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPdaSkin.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java?rev=903341&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java Tue Jan 26 17:49:44 2010
@@ -0,0 +1,34 @@
+package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
+
+import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TrinidadRenderingConstants;
+import org.apache.myfaces.trinidad.skin.Skin;
+
+/** Class for the Casablanca portlet skin
+ *
+ * @author Marius Petoi
+ */
+public class CasablancaPortletSkin extends SkinExtension {
+
+ /**
+ * Constructs a CasablancaPortletSkin instance
+ */
+ public CasablancaPortletSkin(Skin baseSkin)
+ {
+ // Create a SkinExtension for Casablanca
+ super(baseSkin,
+ _CASABLANCA_PDA_ID,
+ TrinidadRenderingConstants.CASABLANCA_SKIN_FAMILY,
+ TrinidadRenderingConstants.APACHE_TRINIDAD_PORTLET);
+
+ // Register our style sheet
+ setStyleSheetName(_CASABLANCA_STYLE_SHEET_NAME);
+ }
+
+ // Casablanca skin id
+ private static final String _CASABLANCA_PDA_ID = "casablanca.portlet";
+
+ // Casablanca skin style sheet name
+ private static final String _CASABLANCA_STYLE_SHEET_NAME =
+ "META-INF/adf/styles/casablancaSkin.css";
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaPortletSkin.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java Tue Jan 26 17:49:44 2010
@@ -37,17 +37,13 @@
// Create a SkinExtension for Minimal
super(baseSkin,
_MINIMAL_DESKTOP_ID,
- _MINIMAL_FAMILY,
+ TrinidadRenderingConstants.MINIMAL_SKIN_FAMILY,
TrinidadRenderingConstants.APACHE_TRINIDAD_DESKTOP);
// Register our style sheet
setStyleSheetName(_MINIMAL_STYLE_SHEET_NAME);
}
-
-
- // Minimal skin family name
- private static final String _MINIMAL_FAMILY = "minimal";
// Minimal skin id
private static final String _MINIMAL_DESKTOP_ID = "minimal.desktop";
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java Tue Jan 26 17:49:44 2010
@@ -37,7 +37,7 @@
// Create a SkinExtension for Minimal
super(baseSkin,
_MINIMAL_PDA_ID,
- _MINIMAL_FAMILY,
+ TrinidadRenderingConstants.MINIMAL_SKIN_FAMILY,
TrinidadRenderingConstants.APACHE_TRINIDAD_PDA);
// Register our style sheet
@@ -45,8 +45,6 @@
}
- // Minimal skin family name
- private static final String _MINIMAL_FAMILY = "minimal";
private static final String _MINIMAL_PDA_ID = "minimal.pda";
// Minimal skin style sheet name
private static final String _MINIMAL_STYLE_SHEET_NAME =
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPortletSkinExtension.java Tue Jan 26 17:49:44 2010
@@ -38,7 +38,7 @@
{
super(baseSkin,
"minimal.portlet",
- "minimal",
+ TrinidadRenderingConstants.MINIMAL_SKIN_FAMILY,
TrinidadRenderingConstants.OUTPUT_MODE_PORTLET,
"META-INF/adf/styles/simple-portlet.xss");
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java Tue Jan 26 17:49:44 2010
@@ -190,6 +190,10 @@
public static final String APACHE_TRINIDAD_PORTLET =
CoreRenderKit.OUTPUT_MODE_PORTLET;
+ // skin family names constants
+ public static final String CASABLANCA_SKIN_FAMILY = "casablanca";
+ public static final String MINIMAL_SKIN_FAMILY = "minimal";
+
public static final String COLOR_PALETTE_TRANSPARENT_ICON_NAME = "cpt.gif";
// 'xc' stands for uiX Composite
@@ -224,4 +228,4 @@
// for windows mobile.
public static final String WINDOWS_MOBILE_UAPIXELS = "uapixels";
-}
\ No newline at end of file
+}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java?rev=903341&r1=903340&r2=903341&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java Tue Jan 26 17:49:44 2010
@@ -48,12 +48,15 @@
import org.apache.myfaces.trinidad.skin.Skin;
import org.apache.myfaces.trinidad.skin.SkinAddition;
import org.apache.myfaces.trinidadinternal.config.LazyValueExpression;
-import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalDesktopSkinExtension;
-import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalPdaSkinExtension;
-import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalPortletSkinExtension;
import org.apache.myfaces.trinidadinternal.renderkit.core.skin.SimpleDesktopSkin;
import org.apache.myfaces.trinidadinternal.renderkit.core.skin.SimplePdaSkin;
import org.apache.myfaces.trinidadinternal.renderkit.core.skin.SimplePortletSkin;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalDesktopSkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalPdaSkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.MinimalPortletSkinExtension;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.CasablancaDesktopSkin;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.CasablancaPdaSkin;
+import org.apache.myfaces.trinidadinternal.renderkit.core.skin.CasablancaPortletSkin;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -315,7 +318,7 @@
/**
* register the Trinidad skins: simpleDesktopSkin, simplePdaSkin,
- * and minimalDesktopSkin, minimalPdaSkin, and portlet skins.
+ * and minimalDesktopSkin, minimalPdaSkin, casablancaSkin and portlet skins.
* @param skinFactory
*/
private static void _registerTrinidadSkins(
@@ -347,6 +350,15 @@
MinimalPortletSkinExtension minimalPortletSkin =
new MinimalPortletSkinExtension(simplePortletSkin);
skinFactory.addSkin(minimalPortletSkin.getId(), minimalPortletSkin);
+
+ CasablancaDesktopSkin casablancaDesktopSkin = new CasablancaDesktopSkin(simpleDesktopSkin);
+ skinFactory.addSkin(casablancaDesktopSkin.getId(), casablancaDesktopSkin);
+
+ CasablancaPdaSkin casablancaPdaSkin = new CasablancaPdaSkin(simplePdaSkin);
+ skinFactory.addSkin(casablancaPdaSkin.getId(), casablancaPdaSkin);
+
+ CasablancaPortletSkin casablancaPortletSkin = new CasablancaPortletSkin(simplePortletSkin);
+ skinFactory.addSkin(casablancaPortletSkin.getId(), casablancaPortletSkin);
}
/**
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/button.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/button.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/button.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonHover.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonHover.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonHover.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHead.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHead.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHead.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadHover.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadHover.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadHover.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelected.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelected.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelected.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelectedHover.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelectedHover.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/buttonLikeHeadSelectedHover.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyAccented.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyAccented.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyAccented.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossed.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossed.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossedSelected.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossedSelected.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/panelBodyEmbossedSelected.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/tableHead.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/tableHead.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/tableHead.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosed.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosed.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosedSelected.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosedSelected.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeControlEmbosedSelected.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeHover.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeHover.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeHover.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikePressed.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikePressed.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikePressed.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeRised.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeRised.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/backgrounds/textCellLikeRised.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled_8bit.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled_8bit.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsDisabled_8bit.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover_8bit.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover_8bit.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormalHover_8bit.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal_8bit.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal_8bit.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsNormal_8bit.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected_8bit.png
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected_8bit.png?rev=903341&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/images/casablanca/icons/iconsSelected_8bit.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream