You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/07/20 19:16:29 UTC
svn commit: r1148857 [1/4] - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/conf/META-INF/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
trinidad-impl/src/main...
Author: arobinson74
Date: Wed Jul 20 17:16:26 2011
New Revision: 1148857
URL: http://svn.apache.org/viewvc?rev=1148857&view=rev
Log:
TRINIDAD-2111 - Back out the earlier commit
Removed:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CasablancaTabletSkin.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleTabletSkin.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/tablet/
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/tablet/
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablanca-base.css
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablanca-tablet.css
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-tablet.css
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
myfaces/trinidad/trunk/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
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/xhtml/TrinidadRenderingConstants.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinUtils.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopConstants.java
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.css
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/casablancaSkin.css
myfaces/trinidad/trunk/trinidad-impl/src/main/resources/META-INF/adf/styles/simple-desktop.css
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Wed Jul 20 17:16:26 2011
@@ -66,12 +66,6 @@ public interface Agent
*/
public static final Object TYPE_WEBCRAWLER = "webcrawler";
-
- /**
- * Constant for tablet devices
- */
- public static final Object TYPE_TABLET = "tablet";
-
/**
* Constant for unknown platform
*/
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/conf/META-INF/faces-config-base.xml Wed Jul 20 17:16:26 2011
@@ -124,11 +124,6 @@
<render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.desktop.DesktopRenderKit</render-kit-class>
</render-kit>
- <render-kit>
- <render-kit-id>org.apache.myfaces.trinidad.core.tablet</render-kit-id>
- <render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.tablet.TabletRenderKit</render-kit-class>
- </render-kit>
-
<render-kit>
<render-kit-id>org.apache.myfaces.trinidad.core.pda</render-kit-id>
<render-kit-class>org.apache.myfaces.trinidadinternal.renderkit.core.pda.PdaRenderKit</render-kit-class>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Wed Jul 20 17:16:26 2011
@@ -707,7 +707,7 @@ public class AgentFactoryImpl implements
// We need the rv to support @agent versioning in CSS as the date makes no sense,
// so look for the rv:, not the Gecko build date
- _populateAgentType(agent, agentObj);
+ agentObj.setType(Agent.TYPE_DESKTOP);
agentObj.setAgent(Agent.AGENT_GECKO);
int start = agent.indexOf("rv:");
@@ -878,9 +878,7 @@ public class AgentFactoryImpl implements
}
String version = _getVersion(agent, start);
-
- _populateAgentType(agent, agentObj);
-
+ agentObj.setType(Agent.TYPE_DESKTOP);
if ((agent.indexOf("Symbian") > -1) || (agent.indexOf("Nokia") > -1))
{
agentObj.setAgent(Agent.AGENT_NOKIA_S60);
@@ -893,19 +891,6 @@ public class AgentFactoryImpl implements
agentObj.setAgentVersion(version);
}
- private void _populateAgentType(String agent, AgentImpl agentObj) {
- if (agent.contains("WebKit") &&
- (agent.contains("Android") || agent.contains("iPad")
- || agent.contains("iPhone") || agent.contains("iPod")))
- {
- agentObj.setType(Agent.TYPE_TABLET);
- }
- else
- {
- agentObj.setType(Agent.TYPE_DESKTOP);
- }
- }
-
/**
* Returns an AgentEntry for the "Mozilla" family of browsers - which
* most at least pretend to be.
@@ -913,7 +898,7 @@ public class AgentFactoryImpl implements
private void _populateMozillaAgentImpl(String agent,AgentImpl agentObj)
{
int paren = agent.indexOf('(');
- _populateAgentType(agent, agentObj);
+ agentObj.setType(Agent.TYPE_DESKTOP); //Is this default realli okay??? These days Mobile agents also use Mozilla/xx.xx
// No section to qualify the agent; assume Mozilla/Netscape
if (paren == -1)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java Wed Jul 20 17:16:26 2011
@@ -117,11 +117,6 @@ public class AgentNameUtil
return TrinidadAgent.TYPE_WEBCRAWLER;
}
- if (otype == Agent.TYPE_TABLET)
- {
- return TrinidadAgent.TYPE_TABLET;
- }
-
//Default to desktop (This is UIX 2.2 logic)
return TrinidadAgent.TYPE_DESKTOP;
}
@@ -178,8 +173,6 @@ public class AgentNameUtil
return Agent.TYPE_PDA;
case TrinidadAgent.TYPE_PHONE:
return Agent.TYPE_PHONE;
- case TrinidadAgent.TYPE_TABLET:
- return Agent.TYPE_TABLET;
case TrinidadAgent.TYPE_VOICE:
default:
return Agent.TYPE_UNKNOWN;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Wed Jul 20 17:16:26 2011
@@ -291,11 +291,6 @@ public abstract class TrinidadAgent impl
static public final int TYPE_WEBCRAWLER = 4;
/**
- * Application constant for tablet devices
- */
- static public final int TYPE_TABLET = 5;
-
- /**
* Enumeration representing an Application
*/
public static enum Application
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Wed Jul 20 17:16:26 2011
@@ -139,8 +139,6 @@ public class CoreRenderKit extends Rende
Agent agent = afc.getAgent();
if (Agent.TYPE_PDA.equals(agent.getType()))
return "org.apache.myfaces.trinidad.core.pda";
- if (Agent.TYPE_TABLET.equals(agent.getType()))
- return "org.apache.myfaces.trinidad.core.tablet";
}
return "org.apache.myfaces.trinidad.core.desktop";
}
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=1148857&r1=1148856&r2=1148857&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 Wed Jul 20 17:16:26 2011
@@ -626,10 +626,6 @@ public class CoreRenderingContext extend
// get rid of this bit of code. Should we use getViewRoot().getRenderKitId() instead?
renderKitId = TrinidadRenderingConstants.APACHE_TRINIDAD_PDA;
}
- else if (TrinidadAgent.TYPE_TABLET == _agent.getAgentType())
- {
- renderKitId = TrinidadRenderingConstants.APACHE_TRINIDAD_TABLET;
- }
SkinFactory factory = SkinFactory.getFactory();
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=1148857&r1=1148856&r2=1148857&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 Wed Jul 20 17:16:26 2011
@@ -187,8 +187,6 @@ public final class TrinidadRenderingCons
"org.apache.myfaces.trinidad.desktop";
public static final String APACHE_TRINIDAD_PDA =
"org.apache.myfaces.trinidad.pda";
- public static final String APACHE_TRINIDAD_TABLET =
- "org.apache.myfaces.trinidad.tablet";
public static final String APACHE_TRINIDAD_PORTLET =
CoreRenderKit.OUTPUT_MODE_PORTLET;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java Wed Jul 20 17:16:26 2011
@@ -252,8 +252,6 @@ public final class XhtmlConstants
"org.apache.myfaces.trinidad.desktop";
public static final String APACHE_TRINIDAD_PDA =
"org.apache.myfaces.trinidad.pda";
- public static final String APACHE_TRINIDAD_TABLET =
- "org.apache.myfaces.trinidad.tablet";
public static final String APACHE_TRINIDAD_PORTLET =
CoreRenderKit.OUTPUT_MODE_PORTLET;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinFactoryImpl.java Wed Jul 20 17:16:26 2011
@@ -201,8 +201,6 @@ public class SkinFactoryImpl extends Ski
matchingSkin = getSkin(context, _SIMPLE_PORTLET);
else if (renderKitId.equals(XhtmlConstants.APACHE_TRINIDAD_PDA))
matchingSkin = getSkin(context, _SIMPLE_PDA);
- else if (renderKitId.equals(XhtmlConstants.APACHE_TRINIDAD_TABLET))
- matchingSkin = getSkin(context, _SIMPLE_TABLET);
else
matchingSkin = getSkin(context, _SIMPLE_DESKTOP);
}
@@ -317,7 +315,6 @@ public class SkinFactoryImpl extends Ski
static private final String _SIMPLE_PDA = "simple.pda";
static private final String _SIMPLE_DESKTOP = "simple.desktop";
- static private final String _SIMPLE_TABLET = "simple.tablet";
static private final String _SIMPLE_PORTLET = "simple.portlet";
static private final String _DEFAULT = "default";
static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(SkinFactoryImpl.class);
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=1148857&r1=1148856&r2=1148857&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 Wed Jul 20 17:16:26 2011
@@ -53,14 +53,12 @@ import org.apache.myfaces.trinidadintern
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.apache.myfaces.trinidadinternal.renderkit.core.skin.CasablancaTabletSkin;
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.SimpleTabletSkin;
import org.apache.myfaces.trinidadinternal.share.xml.ClassParserFactory;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContextImpl;
import org.apache.myfaces.trinidadinternal.share.xml.ParserFactory;
@@ -336,10 +334,6 @@ public class SkinUtils
SimplePdaSkin simplePdaSkin = new SimplePdaSkin();
skinFactory.addSkin(simplePdaSkin.getId(), simplePdaSkin);
-
- SimpleTabletSkin simpleTabletSkin = new SimpleTabletSkin();
- skinFactory.addSkin(simpleTabletSkin.getId(), simpleTabletSkin);
-
//portlet skin maps most of our style classes to portlet style classes,
// so we output portlet style classes.
// It also clears out the portlet style class definitions.
@@ -361,9 +355,6 @@ public class SkinUtils
CasablancaDesktopSkin casablancaDesktopSkin = new CasablancaDesktopSkin(simpleDesktopSkin);
skinFactory.addSkin(casablancaDesktopSkin.getId(), casablancaDesktopSkin);
- CasablancaTabletSkin casablancaTabletSkin = new CasablancaTabletSkin(simpleTabletSkin);
- skinFactory.addSkin(casablancaTabletSkin.getId(), casablancaTabletSkin);
-
CasablancaPdaSkin casablancaPdaSkin = new CasablancaPdaSkin(simplePdaSkin);
skinFactory.addSkin(casablancaPdaSkin.getId(), casablancaPdaSkin);
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java Wed Jul 20 17:16:26 2011
@@ -26,7 +26,6 @@ import org.apache.myfaces.trinidadintern
import org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop.SimpleDesktopUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.simple.pda.SimplePdaUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.ui.laf.simple.tablet.SimpleTabletUtils;
/**
* Manages the set of LookAndFeel instances. LookAndFeel instances can
@@ -74,7 +73,6 @@ public class LookAndFeelManager
SimpleDesktopUtils.registerLookAndFeel(manager);
SimplePdaUtils.registerLookAndFeel(manager);
- SimpleTabletUtils.registerLookAndFeel(manager);
return manager;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopConstants.java?rev=1148857&r1=1148856&r2=1148857&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopConstants.java Wed Jul 20 17:16:26 2011
@@ -35,7 +35,6 @@ public interface SimpleDesktopConstants
* Simple Skin.
*/
public static final String SIMPLE_DESKTOP_ID = "simple.desktop";
- public static final String SIMPLE_TABLET_ID = "simple.tablet";
// menuTabs Icons