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 2011/05/23 09:39:51 UTC
svn commit: r1126357 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/config/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/
tobago-core/s...
Author: lofwyr
Date: Mon May 23 07:39:50 2011
New Revision: 1126357
URL: http://svn.apache.org/viewvc?rev=1126357&view=rev
Log:
TOBAGO-990 Refactor Tobago configuration
- moving non public API classes to "internal" packages
- using ResourceManagerUtils
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (contents, props changed)
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java (contents, props changed)
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java (contents, props changed)
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java (contents, props changed)
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ThemeParserTest.java
- copied, changed from r1124660, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeParserTest.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeParserTest.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/log4j.xml
myfaces/tobago/trunk/tobago-example11/tobago-example11-demo/src/main/resources/log4j.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Mon May 23 07:39:50 2011
@@ -17,7 +17,7 @@ package org.apache.myfaces.tobago.config
* limitations under the License.
*/
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.internal.util.Deprecation;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java Mon May 23 07:39:50 2011
@@ -23,46 +23,51 @@ import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+/**
+ * @deprecated since 1.5.0. Has been moved to internal package
+ */
+@Deprecated
public class ResourceManagerFactory {
+ /**
+ * @deprecated has been moved to internal package
+ */
+ @Deprecated
public static final String RESOURCE_MANAGER
- = "org.apache.myfaces.tobago.context.ResourceManager";
+ = org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.RESOURCE_MANAGER;
private ResourceManagerFactory() {
}
- private static boolean initialized;
-
+ /**
+ * @deprecated has been moved to internal package
+ */
+ @Deprecated
public static ResourceManager getResourceManager(FacesContext facesContext) {
- assert initialized;
- return (ResourceManager) facesContext.getExternalContext()
- .getApplicationMap().get(RESOURCE_MANAGER);
+ return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.getResourceManager(facesContext);
}
+ /**
+ * @deprecated has been moved to internal package
+ */
+ @Deprecated
public static ResourceManager getResourceManager(ServletContext servletContext) {
- assert initialized;
- return (ResourceManager) servletContext.getAttribute(RESOURCE_MANAGER);
+ return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.getResourceManager(servletContext);
}
- public static void init(
- ServletContext servletContext, TobagoConfigImpl tobagoConfig)
- throws ServletException {
- assert !initialized;
- ResourceManagerImpl resourceManager= new ResourceManagerImpl(tobagoConfig);
-
- ThemeBuilder themeBuilder = new ThemeBuilder(tobagoConfig);
- ResourceLocator resourceLocator = new ResourceLocator(servletContext, resourceManager, themeBuilder);
- resourceLocator.locate();
- themeBuilder.resolveThemes();
-
- servletContext.setAttribute(RESOURCE_MANAGER, resourceManager);
-
- initialized = true;
+ /**
+ * @deprecated has been moved to internal package
+ */
+ @Deprecated
+ public static void init(ServletContext servletContext, TobagoConfigImpl tobagoConfig) throws ServletException {
+ org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.init(servletContext, tobagoConfig);
}
+ /**
+ * @deprecated has been moved to internal package
+ */
+ @Deprecated
public static void release(ServletContext servletContext) {
- assert initialized;
- initialized = false;
- servletContext.removeAttribute(RESOURCE_MANAGER);
+ org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.release(servletContext);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtils.java Mon May 23 07:39:50 2011
@@ -32,11 +32,13 @@ public class ResourceManagerUtils {
}
public static String getProperty(FacesContext facesContext, String bundle, String key) {
- return ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
+ return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getProperty(facesContext, bundle, key);
}
public static String getPropertyNotNull(FacesContext facesContext, String bundle, String key) {
- String result = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
+ String result = org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getProperty(facesContext, bundle, key);
if (result == null) {
return "???" + key + "???";
} else {
@@ -49,14 +51,16 @@ public class ResourceManagerUtils {
*/
public static String getImageWithPath(FacesContext facesContext, String name) {
return facesContext.getExternalContext().getRequestContextPath()
- + ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name);
+ + org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getImage(facesContext, name);
}
/**
* Searches for an image and return it with the context path
*/
public static String getImageWithPath(FacesContext facesContext, String name, boolean ignoreMissing) {
- String image = ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name, ignoreMissing);
+ String image = org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getImage(facesContext, name, ignoreMissing);
if (image == null) {
return null;
} else {
@@ -66,7 +70,8 @@ public class ResourceManagerUtils {
public static List<String> getStyles(FacesContext facesContext, String name) {
String contextPath = facesContext.getExternalContext().getRequestContextPath();
- String[] styles = ResourceManagerFactory.getResourceManager(facesContext).getStyles(facesContext, name);
+ String[] styles = org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getStyles(facesContext, name);
return addContextPath(styles, contextPath);
}
@@ -80,7 +85,8 @@ public class ResourceManagerUtils {
public static List<String> getScripts(FacesContext facesContext, String name) {
String contextPath = facesContext.getExternalContext().getRequestContextPath();
- String[] scripts = ResourceManagerFactory.getResourceManager(facesContext).getScripts(facesContext, name);
+ String[] scripts = org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getScripts(facesContext, name);
return addContextPath(scripts, contextPath);
}
@@ -127,11 +133,13 @@ public class ResourceManagerUtils {
}
public static String getPageWithoutContextPath(FacesContext facesContext, String name) {
- return ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name);
+ return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getImage(facesContext, name);
}
public static Measure getThemeMeasure(FacesContext facesContext, Configurable configurable, String name) {
- return ResourceManagerFactory.getResourceManager(facesContext).getThemeMeasure(
+ return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory
+ .getResourceManager(facesContext).getThemeMeasure(
facesContext, configurable.getRendererType(), configurable.getCurrentMarkup(), name);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java Mon May 23 07:39:50 2011
@@ -47,8 +47,7 @@ public class TobagoBundle extends Resour
LOG.debug("Searching for '{}' in bundle '{}'", key, bundleName);
}
FacesContext facesContext = FacesContext.getCurrentInstance();
- ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
- return resourceManager.getProperty(facesContext, bundleName, key);
+ return ResourceManagerUtils.getProperty(facesContext, bundleName, key);
}
public Enumeration<String> getKeys() {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java Mon May 23 07:39:50 2011
@@ -19,10 +19,9 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.collections.CollectionUtils;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.config.TobagoConfigParser;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.context.ThemeImpl;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
@@ -82,19 +81,6 @@ public class TobagoConfigBuilder {
list.add(new TobagoConfigParser().parse(url));
}
- private void resolve(ServletContext servletContext) throws ServletException {
- final TobagoConfigImpl tobagoConfig = mergeList();
-
- // todo: cleanup, use one central TobagoConfig, no singleton ResourceManager
- // resources
- tobagoConfig.initProjectState(servletContext);
- ResourceManagerFactory.init(servletContext, tobagoConfig);
- // prepare themes
- tobagoConfig.resolveThemes();
-
- servletContext.setAttribute(TobagoConfig.TOBAGO_CONFIG, tobagoConfig);
- }
-
private TobagoConfigImpl mergeList() {
// todo
LOG.warn("Merge implementation in progress...)");
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Mon May 23 07:39:50 2011
@@ -252,4 +252,20 @@ public class TobagoConfigImpl extends To
public void setCheckSessionSecret(boolean checkSessionSecret) {
this.checkSessionSecret = checkSessionSecret;
}
+
+ @Override
+ public String toString() {
+ return "TobagoConfigImpl{"
+ + "\nsupportedThemes=" + supportedThemes
+ + ", \ndefaultTheme=" + defaultTheme
+ + ", \nresourceDirs=" + resourceDirs
+ + ", \navailableThemes=" + availableThemes
+ + ", \nrenderersConfig=" + renderersConfig
+ + ", \nprojectStage=" + projectStage
+ + ", \ncreateSessionSecret=" + createSessionSecret
+ + ", \ncheckSessionSecret=" + checkSessionSecret
+ + ", \nthemeDefinitions=" + themeDefinitions
+ + ", \nurl=" + url
+ + '}';
+ }
}
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.config;
+package org.apache.myfaces.tobago.internal.config;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,6 @@ import org.apache.myfaces.tobago.context
import org.apache.myfaces.tobago.context.ThemeResources;
import org.apache.myfaces.tobago.context.ThemeScript;
import org.apache.myfaces.tobago.context.ThemeStyle;
-import org.apache.myfaces.tobago.internal.config.TobagoConfigFragment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.context;
+package org.apache.myfaces.tobago.internal.context;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,9 +19,10 @@ package org.apache.myfaces.tobago.contex
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.myfaces.tobago.config.TobagoConfigParser;
+import org.apache.myfaces.tobago.context.ThemeImpl;
import org.apache.myfaces.tobago.internal.config.ThemeParser;
import org.apache.myfaces.tobago.internal.config.TobagoConfigFragment;
+import org.apache.myfaces.tobago.internal.config.TobagoConfigParser;
import org.apache.myfaces.tobago.util.XmlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.context;
+package org.apache.myfaces.tobago.internal.context;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,6 +17,7 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
+import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
import javax.faces.context.FacesContext;
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.context;
+package org.apache.myfaces.tobago.internal.context;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,16 +20,11 @@ package org.apache.myfaces.tobago.contex
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.config.Configurable;
+import org.apache.myfaces.tobago.context.Markup;
+import org.apache.myfaces.tobago.context.ResourceManager;
+import org.apache.myfaces.tobago.context.Theme;
+import org.apache.myfaces.tobago.context.UserAgent;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
-import org.apache.myfaces.tobago.internal.context.ClientPropertiesKey;
-import org.apache.myfaces.tobago.internal.context.ImageCacheKey;
-import org.apache.myfaces.tobago.internal.context.JspCacheKey;
-import org.apache.myfaces.tobago.internal.context.MeasureValue;
-import org.apache.myfaces.tobago.internal.context.MiscCacheKey;
-import org.apache.myfaces.tobago.internal.context.PropertyCacheKey;
-import org.apache.myfaces.tobago.internal.context.RendererCacheKey;
-import org.apache.myfaces.tobago.internal.context.StringValue;
-import org.apache.myfaces.tobago.internal.context.ThemeConfigCacheKey;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.util.LocaleUtils;
import org.slf4j.Logger;
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.context;
+package org.apache.myfaces.tobago.internal.context;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,6 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
+import org.apache.myfaces.tobago.context.Theme;
+import org.apache.myfaces.tobago.context.ThemeImpl;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,9 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-/*
- * Date: 25.03.2006 08:21:06
- */
class ThemeBuilder {
private static final Logger LOG = LoggerFactory.getLogger(ThemeBuilder.class);
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Mon May 23 07:39:50 2011
@@ -17,7 +17,7 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Mon May 23 07:39:50 2011
@@ -21,7 +21,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManager;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java Mon May 23 07:39:50 2011
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.webapp
*/
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.internal.config.TobagoConfigBuilder;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,6 +45,9 @@ public class TobagoServletContextListene
}
TobagoConfigBuilder.init(servletContext);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("tobago config: " + TobagoConfig.getInstance(servletContext));
+ }
}
public void contextDestroyed(ServletContextEvent event) {
Copied: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ThemeParserTest.java (from r1124660, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeParserTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ThemeParserTest.java?p2=myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ThemeParserTest.java&p1=myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeParserTest.java&r1=1124660&r2=1126357&rev=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/context/ThemeParserTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/context/ThemeParserTest.java Mon May 23 07:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.context;
+package org.apache.myfaces.tobago.internal.context;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,6 +17,8 @@ package org.apache.myfaces.tobago.contex
* limitations under the License.
*/
+import org.apache.myfaces.tobago.context.ThemeImpl;
+import org.apache.myfaces.tobago.context.ThemeResources;
import org.apache.myfaces.tobago.internal.config.ThemeParser;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
import org.junit.Assert;
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/faces/AbstractTobagoTestBase.java Mon May 23 07:39:50 2011
@@ -26,9 +26,9 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ClientProperties;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.junit.After;
import org.junit.Before;
import org.slf4j.Logger;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Mon May 23 07:39:50 2011
@@ -20,8 +20,7 @@ package org.apache.myfaces.tobago.exampl
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.component.UIToolBar;
-import org.apache.myfaces.tobago.context.ResourceManager;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
import org.apache.myfaces.tobago.example.data.LocaleList;
import org.apache.myfaces.tobago.example.data.Salutation;
@@ -121,12 +120,12 @@ public class OverviewController {
toolbarTextPosition = UIToolBar.LABEL_BOTTOM;
}
- private static SelectItem[] getSalutationSelectItems(ResourceManager resourceManager, String resource) {
+ private static SelectItem[] getSalutationSelectItems(String bundle) {
Salutation[] salutations = Salutation.values();
SelectItem[] items = new SelectItem[salutations.length];
for (int i = 0; i < items.length; i++) {
- String label = resourceManager.getProperty(
- FacesContext.getCurrentInstance().getViewRoot(), resource, salutations[i].getKey());
+ String label = ResourceManagerUtils.getProperty(
+ FacesContext.getCurrentInstance(), bundle, salutations[i].getKey());
if (LOG.isTraceEnabled()) {
LOG.trace("label = " + label + "");
}
@@ -138,12 +137,11 @@ public class OverviewController {
return items;
}
- private static SelectItem[] getSelectItems(
- String[] keys, ResourceManager resourceManager, String resource) {
+ private static SelectItem[] getSelectItems(String[] keys, String bundle) {
SelectItem[] items = new SelectItem[keys.length];
for (int i = 0; i < items.length; i++) {
- String label = resourceManager.getProperty(
- FacesContext.getCurrentInstance().getViewRoot(), resource, keys[i]);
+ String label = ResourceManagerUtils.getProperty(
+ FacesContext.getCurrentInstance(), bundle, keys[i]);
if (LOG.isTraceEnabled()) {
LOG.trace("label = " + label + "");
}
@@ -253,30 +251,22 @@ public class OverviewController {
}
public SelectItem[] getItems() {
- ResourceManager resourceManager = ResourceManagerFactory
- .getResourceManager(FacesContext.getCurrentInstance());
- return getSalutationSelectItems(resourceManager, "overview");
+ return getSalutationSelectItems("overview");
}
public SelectItem[] getItems2() {
- ResourceManager resourceManager = ResourceManagerFactory
- .getResourceManager(FacesContext.getCurrentInstance());
- return getSelectItems(TREE_SELECT_MODE_KEYS, resourceManager, "overview");
+ return getSelectItems(TREE_SELECT_MODE_KEYS, "overview");
}
public SelectItem[] getTreeSelectModeItems() {
- ResourceManager resourceManager = ResourceManagerFactory
- .getResourceManager(FacesContext.getCurrentInstance());
- return getSelectItems(TREE_SELECT_MODE_KEYS, resourceManager, "overview");
+ return getSelectItems(TREE_SELECT_MODE_KEYS, "overview");
}
public SelectItem[] getTreeListboxSelectModeItems() {
- ResourceManager resourceManager = ResourceManagerFactory
- .getResourceManager(FacesContext.getCurrentInstance());
- return getSelectItems(TREELISTBOX_SELECT_MODE_KEYS, resourceManager, "overview");
+ return getSelectItems(TREELISTBOX_SELECT_MODE_KEYS, "overview");
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/log4j.xml?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/log4j.xml Mon May 23 07:39:50 2011
@@ -71,7 +71,7 @@
<!--</category>-->
<!--
- <category name="org.apache.myfaces.tobago.context.ResourceManagerImpl">
+ <category name="org.apache.myfaces.tobago.internal.context.ResourceManagerImpl">
<priority value="debug" />
</category>
-->
Modified: myfaces/tobago/trunk/tobago-example11/tobago-example11-demo/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example11/tobago-example11-demo/src/main/resources/log4j.xml?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example11/tobago-example11-demo/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/tobago-example11/tobago-example11-demo/src/main/resources/log4j.xml Mon May 23 07:39:50 2011
@@ -68,7 +68,7 @@
<!--<priority value="debug" />-->
<!--</category>-->
- <category name="org.apache.myfaces.tobago.context.ResourceManagerImpl">
+ <category name="org.apache.myfaces.tobago.internal.context.ResourceManagerImpl">
<priority value="debug" />
</category>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Mon May 23 07:39:50 2011
@@ -18,8 +18,7 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.myfaces.tobago.component.AbstractUINumberSlider;
-import org.apache.myfaces.tobago.context.ResourceManager;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -33,7 +32,6 @@ import org.apache.myfaces.tobago.webapp.
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.Map;
@@ -178,32 +176,27 @@ public class NumberSliderRenderer extend
}
private String getAbsoluteImagePath(FacesContext facesContext, String relativeImagePath) {
- ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
- UIViewRoot viewRoot = facesContext.getViewRoot();
- String contextPath = facesContext.getExternalContext().getRequestContextPath();
- return contextPath + resourceManager.getImage(viewRoot, relativeImagePath);
+ return facesContext.getExternalContext().getRequestContextPath()
+ + ResourceManagerUtils.getImageWithPath(facesContext, relativeImagePath);
}
- private String getIdForInputField(FacesContext context,
- UIComponent component) {
+ private String getIdForInputField(FacesContext context, UIComponent component) {
String id = component.getClientId(context);
return id + ComponentUtils.SUB_SEPARATOR + "input";
}
- private String getIdForSliderTrack(FacesContext context,
- UIComponent component) {
+ private String getIdForSliderTrack(FacesContext context, UIComponent component) {
String id = component.getClientId(context);
return id + ComponentUtils.SUB_SEPARATOR + "track";
}
- private String getIdForSliderHandle(FacesContext context,
- UIComponent component) {
+ private String getIdForSliderHandle(FacesContext context, UIComponent component) {
String id = component.getClientId(context);
return id + ComponentUtils.SUB_SEPARATOR + "handle";
}
- private void writeSliderJavaScript(FacesContext context, UIComponent component,
- TobagoResponseWriter writer) throws IOException {
+ private void writeSliderJavaScript(FacesContext context, UIComponent component, TobagoResponseWriter writer)
+ throws IOException {
String trackId = getIdForSliderTrack(context, component);
String handleId = getIdForSliderHandle(context, component);
String inputId = getIdForInputField(context, component);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Mon May 23 07:39:50 2011
@@ -32,10 +32,10 @@ import org.apache.myfaces.tobago.config.
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManager;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.event.PageAction;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.LayoutBase;
import org.apache.myfaces.tobago.layout.Measure;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=1126357&r1=1126356&r2=1126357&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Mon May 23 07:39:50 2011
@@ -19,7 +19,6 @@ package org.apache.myfaces.tobago.render
import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.util.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UIMenuSelectOne;
import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
@@ -29,10 +28,10 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManager;
-import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.internal.component.AbstractUICommandBase;
import org.apache.myfaces.tobago.internal.component.AbstractUIMenu;
+import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
@@ -45,6 +44,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.apache.myfaces.tobago.util.CreateComponentUtils;
import org.apache.myfaces.tobago.util.FacetUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;