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 2010/03/17 12:16:42 UTC
svn commit: r924226 [1/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/config/
core/src/main/java/org/apache/myfaces/tobago/context/
core/src/main/java/org/apache/myfac...
Author: lofwyr
Date: Wed Mar 17 11:16:40 2010
New Revision: 924226
URL: http://svn.apache.org/viewvc?rev=924226&view=rev
Log:
TOBAGO-848: Move classes that shouldn't be used from applications into "internal" package.
- processing: utils
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ContentType.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DateFormatUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/Deprecation.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/FastStringWriter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/JndiUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MimeTypeUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseWriterBuffer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java (contents, props changed)
- copied, changed from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/util/
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java (with props)
Removed:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ContentType.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DateFormatUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/Deprecation.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/FastStringWriter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/JndiUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MimeTypeUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/RangeParser.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseWriterBuffer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LocaleUtilsUnitTest.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/RangeParserUnitTest.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java
myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DebugModePhaseListener.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/PageItem.java
myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Wed Mar 17 11:16:40 2010
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.util.Co
import org.apache.myfaces.tobago.util.ProcessValidationsCallback;
import org.apache.myfaces.tobago.util.TobagoCallback;
import org.apache.myfaces.tobago.util.UpdateModelValuesCallback;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.FacesException;
import javax.faces.component.ContextCallback;
@@ -65,7 +65,7 @@ public class UIViewRoot extends javax.fa
@Override
public void setLocale(Locale locale) {
super.setLocale(locale);
- ClientProperties clientProperties = VariableResolverUtil.resolveClientProperties(getFacesContext());
+ ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(getFacesContext());
clientProperties.setLocale(locale);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Wed Mar 17 11:16:40 2010
@@ -18,7 +18,7 @@ package org.apache.myfaces.tobago.config
*/
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
-import org.apache.myfaces.tobago.util.Deprecation;
+import org.apache.myfaces.tobago.internal.util.Deprecation;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Wed Mar 17 11:16:40 2010
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.context.RenderersConfig;
import org.apache.myfaces.tobago.context.Theme;
-import org.apache.myfaces.tobago.util.JndiUtils;
+import org.apache.myfaces.tobago.internal.util.JndiUtils;
import javax.faces.context.FacesContext;
import javax.naming.Context;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Wed Mar 17 11:16:40 2010
@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.internal.context.ClientPropertiesKey;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
@@ -37,7 +37,7 @@ import java.util.Locale;
* <p/>
* The managed bean name which is Tobago using for the instance is {@link #MANAGED_BEAN_NAME}.
* <p/>
- * Please use {@link VariableResolverUtil#resolveClientProperties(FacesContext)}
+ * Please use {@link org.apache.myfaces.tobago.util.VariableResolverUtils#resolveClientProperties(FacesContext)}
* to access to the users client properties.
*/
@@ -127,7 +127,7 @@ public class ClientProperties implements
/**
* @deprecated since 1.5. Please use
- * {@link VariableResolverUtil#resolveClientProperties(javax.faces.context.FacesContext)}
+ * {@link org.apache.myfaces.tobago.util.VariableResolverUtils#resolveClientProperties(javax.faces.context.FacesContext)}
*/
@Deprecated
public static ClientProperties getInstance(UIViewRoot viewRoot) {
@@ -136,16 +136,16 @@ public class ClientProperties implements
/**
* @deprecated since 1.5. Please use
- * {@link VariableResolverUtil#resolveClientProperties(javax.faces.context.FacesContext)}
+ * {@link org.apache.myfaces.tobago.util.VariableResolverUtils#resolveClientProperties(javax.faces.context.FacesContext)}
*/
@Deprecated
public static ClientProperties getInstance(FacesContext facesContext) {
- return (ClientProperties) VariableResolverUtil.resolveClientProperties(facesContext);
+ return (ClientProperties) VariableResolverUtils.resolveClientProperties(facesContext);
}
/**
* @deprecated since 1.5. Please use
- * {@link org.apache.myfaces.tobago.util.LocaleUtil#getLocaleSuffixList(java.util.Locale)}
+ * {@link org.apache.myfaces.tobago.util.LocaleUtils#getLocaleSuffixList(java.util.Locale)}
*/
@Deprecated
public static List<String> getLocaleList(Locale locale, boolean propertyPathMode) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java Wed Mar 17 11:16:40 2010
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.interna
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.LocaleUtil;
+import org.apache.myfaces.tobago.util.LocaleUtils;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -302,7 +302,7 @@ public class ResourceManagerImpl impleme
String contentType = clientkey.getContentType();
Theme theme = clientkey.getTheme();
UserAgent browser = clientkey.getUserAgent();
- List<String> locales = LocaleUtil.getLocaleSuffixList(clientkey.getLocale());
+ List<String> locales = LocaleUtils.getLocaleSuffixList(clientkey.getLocale());
String path;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java Wed Mar 17 11:16:40 2010
@@ -17,7 +17,7 @@ package org.apache.myfaces.tobago.conver
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.LocaleUtil;
+import org.apache.myfaces.tobago.util.LocaleUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -31,7 +31,7 @@ public class LocaleConverter implements
public Object getAsObject(
FacesContext facesContext, UIComponent component, String value) {
- Locale locale = LocaleUtil.createLocale(value);
+ Locale locale = LocaleUtils.createLocale(value);
if (locale == null) {
throw new ConverterException("Can't parse " + value + " to a locale.");
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java Wed Mar 17 11:16:40 2010
@@ -23,10 +23,10 @@ import org.apache.myfaces.tobago.compat.
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.lifecycle.TobagoLifecycle;
+import org.apache.myfaces.tobago.internal.util.ResponseUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.EncodeAjaxCallback;
import org.apache.myfaces.tobago.util.RequestUtils;
-import org.apache.myfaces.tobago.util.ResponseUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseJsonWriterImpl;
import javax.faces.FactoryFinder;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java Wed Mar 17 11:16:40 2010
@@ -120,7 +120,7 @@ public abstract class AbstractUITree ext
/*
if (isRequired() && getState().getSelection().size() == 0) {
setValid(false);
- FacesMessage facesMessage = MessageFactory.createFacesMessage(context,
+ FacesMessage facesMessage = MessageUtils.createFacesMessage(context,
UISelectOne.MESSAGE_VALUE_REQUIRED, FacesMessage.SEVERITY_ERROR);
context.addMessage(getClientId(context), facesMessage);
}
@@ -132,7 +132,7 @@ public abstract class AbstractUITree ext
for (DefaultMutableTreeNode node : selection) {
if (!node.isLeaf()) {
- FacesMessage facesMessage = MessageFactory.createFacesMessage(
+ FacesMessage facesMessage = MessageUtils.createFacesMessage(
context, MESSAGE_NOT_LEAF, FacesMessage.SEVERITY_ERROR);
context.addMessage(getClientId(context), facesMessage);
break; // don't continue iteration, no dublicate messages needed
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java Wed Mar 17 11:16:40 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.context.UserAgent;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.context.FacesContext;
import java.io.Serializable;
@@ -43,7 +43,7 @@ public final class ClientPropertiesKey i
Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
ClientPropertiesKey key = (ClientPropertiesKey) requestMap.get(KEY_IN_REQUEST);
if (key == null) {
- ClientProperties clientProperties = VariableResolverUtil.resolveClientProperties(facesContext);
+ ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(facesContext);
key = new ClientPropertiesKey(clientProperties);
requestMap.put(KEY_IN_REQUEST, key);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/context/ResponseWriterDivider.java Wed Mar 17 11:16:40 2010
@@ -19,7 +19,7 @@ package org.apache.myfaces.tobago.intern
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.FastStringWriter;
+import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.util;
import javax.faces.context.FacesContext;
import java.util.HashSet;
-import java.util.Map;
import java.util.Locale;
+import java.util.Map;
public class AccessKeyMap {
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ContentType.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ContentType.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ContentType.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ContentType.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DateFormatUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DateFormatUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/DateFormatUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/DateFormatUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/Deprecation.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/Deprecation.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/Deprecation.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/Deprecation.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/FastStringWriter.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/FastStringWriter.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/FastStringWriter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-import java.io.Writer;
import java.io.IOException;
+import java.io.Writer;
public class FastStringWriter extends Writer {
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/FastStringWriter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/JndiUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/JndiUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/JndiUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,10 +20,10 @@ package org.apache.myfaces.tobago.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.Binding;
+import javax.naming.Context;
import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
public class JndiUtils {
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/JndiUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MimeTypeUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MimeTypeUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MimeTypeUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,14 +24,14 @@ import javax.faces.context.ExternalConte
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
-/*
- * Date: Oct 21, 2006
- * Time: 10:39:25 AM
- */
public class ResponseUtils {
private static final Log LOG = LogFactory.getLog(ResponseUtils.class);
+ private ResponseUtils() {
+ // utils class
+ }
+
public static void ensureNoCacheHeader(FacesContext facesContext) {
// TODO PortletRequest
ExternalContext externalContext = facesContext.getExternalContext();
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseWriterBuffer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseWriterBuffer.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ResponseWriterBuffer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseWriterBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java Wed Mar 17 11:16:40 2010
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.util;
+package org.apache.myfaces.tobago.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,9 +21,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-public class StringUtils {
+public final class StringUtils {
private StringUtils() {
+ // utils class
}
public static List<Integer> parseIntegerList(String integerList)
@@ -49,4 +50,34 @@ public class StringUtils {
}
return buffer.toString();
}
+
+ public static int[] getIndices(String list) {
+ List<String> indexList = new ArrayList<String>();
+ StringTokenizer st = new StringTokenizer(list, ",");
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken().trim();
+ int idx = token.indexOf('-');
+ if (idx == -1) {
+ indexList.add(token);
+ } else {
+ int start = Integer.parseInt(token.substring(0, idx).trim());
+ int end = Integer.parseInt(token.substring(idx + 1).trim());
+ if (start < end) {
+ for (int i = start; i < end + 1; i++) {
+ indexList.add(Integer.toString(i));
+ }
+ } else {
+ for (int i = start; i > end - 1; i--) {
+ indexList.add(Integer.toString(i));
+ }
+ }
+ }
+ }
+
+ int[] indices = new int[indexList.size()];
+ for (int i = 0; i < indices.length; i++) {
+ indices[i] = Integer.parseInt(indexList.get(i));
+ }
+ return indices;
+ }
}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Wed Mar 17 11:16:40 2010
@@ -24,9 +24,9 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.Theme;
+import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.apache.myfaces.tobago.util.Deprecation;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -139,7 +139,7 @@ public class StyleClasses implements Ser
Markup m = supportsMarkup.getMarkup();
if (m != null) {
for (String markup : m) {
- Theme theme = VariableResolverUtil.resolveClientProperties(FacesContext.getCurrentInstance()).getTheme();
+ Theme theme = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance()).getTheme();
if (theme.getRenderersConfig().isMarkupSupported(rendererName, markup)) {
addMarkupClass(rendererName, sub, markup);
} else if ("none".equals(markup)) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Wed Mar 17 11:16:40 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.servle
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.MimeTypeUtils;
+import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Wed Mar 17 11:16:40 2010
@@ -17,11 +17,6 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-/*
- * Created 01.07.2003 10:07:23.
- * $Id$
- */
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -201,8 +196,8 @@ public class ComponentUtils {
}
/**
- * Find all subforms of a component, and collects it.
- * It does not find subforms of subforms.
+ * Find all sub forms of a component, and collects it.
+ * It does not find sub forms of sub forms.
*/
public static List<AbstractUIForm> findSubForms(UIComponent component) {
List<AbstractUIForm> collect = new ArrayList<AbstractUIForm>();
@@ -256,20 +251,14 @@ public class ComponentUtils {
public static boolean isInActiveForm(UIComponent component) {
while (component != null) {
- //log.debug("compoent= " + component.getClientId(FacesContext.getCurrentInstance())
- // + " " + component.getRendererType());
if (component instanceof AbstractUIForm) {
AbstractUIForm form = (AbstractUIForm) component;
if (form.isSubmitted()) {
- //log.debug("in active form = " + form.getClientId(FacesContext.getCurrentInstance()));
return true;
- } /*else {
- log.debug("form found but not active = " + form.getClientId(FacesContext.getCurrentInstance()));
- } */
+ }
}
component = component.getParent();
}
- //log.debug("not in an active form");
return false;
}
@@ -401,16 +390,6 @@ public class ComponentUtils {
}
}
- /**
- * @param component
- * @param name
- * @deprecated please use the method {@link #getCharacterAttribute(javax.faces.component.UIComponent, String)}
- */
- @Deprecated
- public static Character getCharakterAttribute(UIComponent component, String name) {
- return getCharacterAttribute(component, name);
- }
-
public static Character getCharacterAttribute(UIComponent component, String name) {
Object character = component.getAttributes().get(name);
if (character == null) {
@@ -437,38 +416,6 @@ public class ComponentUtils {
return false;
}
- // TODO This should not be neseccary, but UIComponentBase.getRenderer() is protected
-/*
- public static LayoutComponentRendererBase getRenderer(FacesContext facesContext, UIComponent component) {
- return getRenderer(facesContext, component.getFamily(), component.getRendererType());
-
- }
-
- public static LayoutComponentRendererBase getRenderer(FacesContext facesContext, String family, String rendererType) {
- if (rendererType == null) {
- return null;
- }
-
- Map requestMap = facesContext.getExternalContext().getRequestMap();
- StringBuilder key = new StringBuilder(RENDER_KEY_PREFIX);
- key.append(rendererType);
- RendererBase renderer = (RendererBase) requestMap.get(key.toString());
-
- if (renderer == null) {
- Renderer myRenderer = getRendererInternal(facesContext, family, rendererType);
- if (myRenderer instanceof RendererBase) {
- requestMap.put(key.toString(), myRenderer);
- renderer = (RendererBase) myRenderer;
- } else {
- return null;
- }
- }
- if (renderer instanceof LayoutComponentRendererBase) {
- return (LayoutComponentRendererBase) renderer;
- }
- return null;
- }
-*/
public static RendererBase getRenderer(FacesContext facesContext, UIComponent component) {
return getRenderer(facesContext, component.getFamily(), component.getRendererType());
}
@@ -478,7 +425,7 @@ public class ComponentUtils {
return null;
}
- Map requestMap = facesContext.getExternalContext().getRequestMap();
+ Map<String, Object> requestMap = (Map<String, Object>)facesContext.getExternalContext().getRequestMap();
StringBuilder key = new StringBuilder(RENDER_KEY_PREFIX);
key.append(rendererType);
RendererBase renderer = (RendererBase) requestMap.get(key.toString());
@@ -554,16 +501,12 @@ public class ComponentUtils {
}
public static UIOutput getFirstNonGraphicChild(UIComponent component) {
- UIOutput output = null;
- for (Object o : component.getChildren()) {
- UIComponent uiComponent = (UIComponent) o;
- if ((uiComponent instanceof UIOutput)
- && !(uiComponent instanceof UIGraphic)) {
- output = (UIOutput) uiComponent;
- break;
+ for (UIComponent child : (List<UIComponent>)component.getChildren()) {
+ if (child instanceof UIOutput) {
+ return (UIOutput) child;
}
}
- return output;
+ return null;
}
public static void setIntegerSizeProperty(UIComponent component,
@@ -669,21 +612,6 @@ public class ComponentUtils {
return label;
}
- /*public static void debug(UIComponent component) {
- LOG.error("###############################");
- LOG.error("ID " + component.getId());
- LOG.error("ClassName " + component.getClass().getName());
- if (component instanceof EditableValueHolder) {
- EditableValueHolder editableValueHolder = (EditableValueHolder) component;
- LOG.error("Valid " + editableValueHolder.isValid());
- LOG.error("SubmittedValue " + editableValueHolder.getSubmittedValue());
- }
- for (Iterator it = component.getFacetsAndChildren(); it.hasNext(); ) {
- debug((UIComponent)it.next());
- }
- } */
-
-
public static void setValidator(EditableValueHolder editableValueHolder, String validator) {
if (validator != null && editableValueHolder.getValidator() == null) {
if (UIComponentTag.isValueReference(validator)) {
@@ -694,18 +622,6 @@ public class ComponentUtils {
}
}
- /**
- * @param component
- * @param converterId
- * @deprecated please use the typesave method {@link #setConverter(javax.faces.component.ValueHolder, String)}
- */
- @Deprecated
- public static void setConverter(UIComponent component, String converterId) {
- if (component instanceof ValueHolder) {
- setConverter((ValueHolder) component, converterId);
- }
- }
-
public static void setConverter(ValueHolder valueHolder, String converterId) {
if (converterId != null && valueHolder.getConverter() == null) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -778,7 +694,9 @@ public class ComponentUtils {
}
}
-
+ /**
+ * @deprecated since 1.5
+ */
@Deprecated
public static String[] getMarkupBinding(FacesContext facesContext, SupportsMarkup component) {
ValueBinding vb = ((UIComponent) component).getValueBinding(Attributes.MARKUP);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java Wed Mar 17 11:16:40 2010
@@ -30,6 +30,9 @@ import org.apache.myfaces.tobago.layout.
import java.util.ArrayList;
import java.util.List;
+/**
+ * @deprecated
+ */
@Deprecated
public class LayoutInfo {
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java Wed Mar 17 11:16:40 2010
@@ -24,9 +24,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-public class LocaleUtil {
+public class LocaleUtils {
- private LocaleUtil() {
+ private LocaleUtils() {
}
public static Locale createLocale(String value) {
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java Wed Mar 17 11:16:40 2010
@@ -17,8 +17,6 @@ package org.apache.myfaces.tobago.util;
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import javax.faces.application.FacesMessage;
@@ -30,30 +28,22 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-/*
- * User: weber
- * Date: Jun 14, 2005
- * Time: 5:40:04 PM
- */
public class MessageFactory {
- private static final Log LOG = LogFactory.getLog(MessageFactory.class);
-
- private static Map<Locale, ResourceBundle> facesMessagesMap
- = new HashMap<Locale, ResourceBundle>();
+ public static Map<Locale, ResourceBundle> facesMessagesMap = new HashMap<Locale, ResourceBundle>();
- public static FacesMessage createFacesMessage(FacesContext facesContext,
- String key, FacesMessage.Severity severity, Object[] args) {
+ public static FacesMessage createFacesMessage(
+ FacesContext facesContext, String key, FacesMessage.Severity severity, Object[] args) {
return createFacesMessage(facesContext, "tobago", key, severity, args);
}
- public static FacesMessage createFacesMessage(FacesContext facesContext,
- String key, FacesMessage.Severity severity) {
+ public static FacesMessage createFacesMessage(
+ FacesContext facesContext, String key, FacesMessage.Severity severity) {
return createFacesMessage(facesContext, key, severity, new Object[0]);
}
- public static FacesMessage createFacesMessage(FacesContext facesContext,
- String bundle, String key, FacesMessage.Severity severity, Object[] args) {
+ public static FacesMessage createFacesMessage(
+ FacesContext facesContext, String bundle, String key, FacesMessage.Severity severity, Object[] args) {
String summary = getMessageText(facesContext, bundle, key);
String detail = getMessageText(facesContext, bundle, key + "_detail");
if (args != null && args.length > 0) {
@@ -71,7 +61,7 @@ public class MessageFactory {
return new FacesMessage(severity, summary != null ? summary : key, detail);
}
- private static Locale getLocale(FacesContext facesContext) {
+ public static Locale getLocale(FacesContext facesContext) {
UIViewRoot root = facesContext.getViewRoot();
Locale locale;
if (root != null) {
@@ -82,12 +72,12 @@ public class MessageFactory {
return locale;
}
- public static FacesMessage createFacesMessage(FacesContext facesContext,
- String bundle, String key, FacesMessage.Severity severity) {
+ public static FacesMessage createFacesMessage(
+ FacesContext facesContext, String bundle, String key, FacesMessage.Severity severity) {
return createFacesMessage(facesContext, bundle, key, severity, new Object[0]);
}
- private static String getMessageText(
+ public static String getMessageText(
FacesContext facesContext, String bundle, String key) {
String message = ResourceManagerUtil.getProperty(facesContext, bundle, key);
if (message == null || message.length() < 1) {
@@ -101,7 +91,7 @@ public class MessageFactory {
return message;
}
- private static ResourceBundle getFacesMessages(Locale locale) {
+ public static ResourceBundle getFacesMessages(Locale locale) {
ResourceBundle facesMessages = facesMessagesMap.get(locale);
if (facesMessages == null) {
facesMessages
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/UpdateModelValuesCallback.java Wed Mar 17 11:16:40 2010
@@ -30,7 +30,7 @@ public class UpdateModelValuesCallback i
|| ((Boolean) facesContext.getExternalContext().getRequestMap().get(AbstractUIForm.SUBMITTED_MARKER))) {
component.processUpdates(facesContext);
} else {
- // if we're not the submitted form, only process subforms.
+ // if we're not the submitted form, only process sub forms.
for (AbstractUIForm subForm : ComponentUtils.findSubForms(component)) {
subForm.processUpdates(facesContext);
}
Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java (from r924184, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java&r1=924184&r2=924226&rev=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java Wed Mar 17 11:16:40 2010
@@ -24,9 +24,10 @@ import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.el.VariableResolver;
-public class VariableResolverUtil {
+public final class VariableResolverUtils {
- private VariableResolverUtil() {
+ private VariableResolverUtils() {
+ // utils class
}
/**
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java Wed Mar 17 11:16:40 2010
@@ -19,7 +19,7 @@ package org.apache.myfaces.tobago.valida
import org.apache.commons.fileupload.FileItem;
import org.apache.myfaces.tobago.internal.component.AbstractUIFileInput;
-import org.apache.myfaces.tobago.util.ContentType;
+import org.apache.myfaces.tobago.internal.util.ContentType;
import org.apache.myfaces.tobago.util.MessageFactory;
import javax.faces.application.FacesMessage;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java Wed Mar 17 11:16:40 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.valida
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.MessageFactory;
import org.apache.myfaces.tobago.apt.annotation.Validator;
+import org.apache.myfaces.tobago.util.MessageFactory;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import javax.faces.validator.LengthValidator;
import javax.faces.validator.ValidatorException;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.application.FacesMessage;
/*
* Date: Oct 16, 2006
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseJsonWriterImpl.java Wed Mar 17 11:16:40 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.tobago.webapp
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils;
-import org.apache.myfaces.tobago.util.FastStringWriter;
+import org.apache.myfaces.tobago.internal.util.FastStringWriter;
import org.apache.myfaces.tobago.util.XmlUtils;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java Wed Mar 17 11:16:40 2010
@@ -21,11 +21,11 @@ import org.apache.commons.lang.StringUti
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.util.HtmlWriterUtils;
import org.apache.myfaces.tobago.util.XmlUtils;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java Wed Mar 17 11:16:40 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.util;
*/
import junit.framework.TestCase;
+import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
import java.io.CharArrayWriter;
import java.io.IOException;
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LocaleUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LocaleUtilsUnitTest.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LocaleUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/LocaleUtilsUnitTest.java Wed Mar 17 11:16:40 2010
@@ -19,22 +19,22 @@ public class LocaleUtilsUnitTest {
@Test
public void testCreateLocale() {
- Assert.assertEquals(D1, LocaleUtil.createLocale(S1));
- Assert.assertEquals(D2, LocaleUtil.createLocale(S2));
- Assert.assertEquals(D3, LocaleUtil.createLocale(S3));
+ Assert.assertEquals(D1, LocaleUtils.createLocale(S1));
+ Assert.assertEquals(D2, LocaleUtils.createLocale(S2));
+ Assert.assertEquals(D3, LocaleUtils.createLocale(S3));
}
@Test
public void testLocaleList() {
- Assert.assertArrayEquals(new Locale[]{D1}, LocaleUtil.getLocaleList(D1).toArray());
- Assert.assertArrayEquals(new Locale[]{D2, D1}, LocaleUtil.getLocaleList(D2).toArray());
- Assert.assertArrayEquals(new Locale[]{D3, D2, D1}, LocaleUtil.getLocaleList(D3).toArray());
+ Assert.assertArrayEquals(new Locale[]{D1}, LocaleUtils.getLocaleList(D1).toArray());
+ Assert.assertArrayEquals(new Locale[]{D2, D1}, LocaleUtils.getLocaleList(D2).toArray());
+ Assert.assertArrayEquals(new Locale[]{D3, D2, D1}, LocaleUtils.getLocaleList(D3).toArray());
}
@Test
public void testLocaleSuffixList() {
- Assert.assertArrayEquals(new String[]{'_' + S1, ""}, LocaleUtil.getLocaleSuffixList(D1).toArray());
- Assert.assertArrayEquals(new String[]{'_' + S2, '_' + S1, ""}, LocaleUtil.getLocaleSuffixList(D2).toArray());
- Assert.assertArrayEquals(new String[]{'_' + S3, '_' + S2, '_' + S1, ""}, LocaleUtil.getLocaleSuffixList(D3).toArray());
+ Assert.assertArrayEquals(new String[]{'_' + S1, ""}, LocaleUtils.getLocaleSuffixList(D1).toArray());
+ Assert.assertArrayEquals(new String[]{'_' + S2, '_' + S1, ""}, LocaleUtils.getLocaleSuffixList(D2).toArray());
+ Assert.assertArrayEquals(new String[]{'_' + S3, '_' + S2, '_' + S1, ""}, LocaleUtils.getLocaleSuffixList(D3).toArray());
}
}
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/RangeParserUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/RangeParserUnitTest.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/RangeParserUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/RangeParserUnitTest.java Wed Mar 17 11:16:40 2010
@@ -18,6 +18,7 @@ package org.apache.myfaces.tobago.util;
*/
import junit.framework.TestCase;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
public class RangeParserUnitTest extends TestCase {
@@ -25,25 +26,25 @@ public class RangeParserUnitTest extends
int[] ints = {0,5,10};
String s = "0,5,10";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
s = "0, 5, 10";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
s = " 0 , 5 , 10 ";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
ints = new int[] {3,4,5,6,7,15,16,17};
s = "3-7,15-17";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
s = "3-5,6,7,15,16-17";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
s = "3-5, 6, 7, 15, 16 - 17 ";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
ints = new int[] {3,4,5,6,7,15,14,13};
s = "3-7,15-13";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
s = "3 - 7, 15 - 13";
- checkEquals(ints, RangeParser.getIndices(s));
+ checkEquals(ints, StringUtils.getIndices(s));
}
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Wed Mar 17 11:16:40 2010
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.example
import org.apache.myfaces.tobago.example.addressbook.AddressDao;
import org.apache.myfaces.tobago.example.addressbook.Picture;
import org.apache.myfaces.tobago.model.SheetState;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -111,7 +111,7 @@ public class Controller {
themeItems.add(new SelectItem(theme, theme.getDisplayName()));
}
- ClientProperties client = VariableResolverUtil.resolveClientProperties(facesContext);
+ ClientProperties client = VariableResolverUtils.resolveClientProperties(facesContext);
theme = client.getTheme();
currentAddressList = addressDao.findAddresses(searchCriterion);
}
@@ -205,7 +205,7 @@ public class Controller {
public String themeChanged() {
FacesContext facesContext = FacesContext.getCurrentInstance();
- ClientProperties client = VariableResolverUtil.resolveClientProperties(facesContext);
+ ClientProperties client = VariableResolverUtils.resolveClientProperties(facesContext);
client.setTheme(theme);
return null;
}
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java Wed Mar 17 11:16:40 2010
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.tobago.example.addressbook.Address;
import org.apache.myfaces.tobago.example.addressbook.Picture;
import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +35,7 @@ public class PictureServlet extends NonF
private static final Log LOG = LogFactory.getLog(PictureServlet.class);
public String invokeApplication(FacesContext facesContext) {
- Controller controller = (Controller) VariableResolverUtil.resolveVariable(facesContext, "controller");
+ Controller controller = (Controller) VariableResolverUtils.resolveVariable(facesContext, "controller");
Address address = controller.getCurrentAddress();
if (address.hasPicture()) {
Picture picture = address.getPicture();
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java Wed Mar 17 11:16:40 2010
@@ -17,10 +17,10 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
-import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.context.ResourceManagerUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
@@ -41,7 +41,7 @@ public class MultiplePageDeclarationLang
if (outcome != null) {
PageDeclarationLanguageBean bean
- = (PageDeclarationLanguageBean) VariableResolverUtil.resolveVariable(facesContext, "pageDeclarationLanguage");
+ = (PageDeclarationLanguageBean) VariableResolverUtils.resolveVariable(facesContext, "pageDeclarationLanguage");
for (PageDeclarationLanguage renderTechnologie : PageDeclarationLanguage.values()) {
if (outcome.endsWith(renderTechnologie.getExtension())) {
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java Wed Mar 17 11:16:40 2010
@@ -17,7 +17,7 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -36,7 +36,7 @@ public class SynchronizeNavigationPhaseL
UIViewRoot viewRoot = facesContext.getViewRoot();
if (viewRoot.getChildCount() == 0) { // in case of direct links the ViewRoot is empty after "restore view".
String viewId = viewRoot.getViewId();
- Navigation navigation = (Navigation) VariableResolverUtil.resolveVariable(facesContext, "navigation");
+ Navigation navigation = (Navigation) VariableResolverUtils.resolveVariable(facesContext, "navigation");
navigation.updateMarker(viewId);
}
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java Wed Mar 17 11:16:40 2010
@@ -19,7 +19,7 @@ package org.apache.myfaces.tobago.exampl
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.context.FacesContext;
@@ -42,7 +42,7 @@ public class Bird {
public String select() {
LOG.info("Select Bird: name=" + name + " size=" + size);
BirdController controller = (BirdController)
- VariableResolverUtil.resolveVariable(FacesContext.getCurrentInstance(), "birdController");
+ VariableResolverUtils.resolveVariable(FacesContext.getCurrentInstance(), "birdController");
controller.setStatus("Selected bird is " + name);
return null;
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java Wed Mar 17 11:16:40 2010
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Theme;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
@@ -107,7 +107,7 @@ public class ClientConfigController {
public void storeInClientProperties() {
ClientProperties client
- = VariableResolverUtil.resolveClientProperties(FacesContext.getCurrentInstance());
+ = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
client.setDebugMode(debugMode);
client.setTheme(theme);
@@ -116,7 +116,7 @@ public class ClientConfigController {
public void loadFromClientProperties() {
ClientProperties client
- = VariableResolverUtil.resolveClientProperties(FacesContext.getCurrentInstance());
+ = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
debugMode = client.isDebugMode();
theme = client.getTheme();
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java Wed Mar 17 11:16:40 2010
@@ -17,11 +17,11 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspException;
import javax.faces.context.FacesContext;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
public class DynamicTag extends TagSupport {
@@ -31,7 +31,7 @@ public class DynamicTag extends TagSuppo
public int doStartTag() throws JspException {
// fixme: session?
DynamicController controller =
- (DynamicController) VariableResolverUtil.resolveVariable(FacesContext.getCurrentInstance(), controllerName);
+ (DynamicController) VariableResolverUtils.resolveVariable(FacesContext.getCurrentInstance(), controllerName);
//DynamicController controller = (DynamicController) pageContext.getSession().getAttribute(controllerName);
if (controller != null) {
tag = controller.createTag();
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java?rev=924226&r1=924225&r2=924226&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java Wed Mar 17 11:16:40 2010
@@ -17,10 +17,10 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
+import org.apache.myfaces.tobago.util.VariableResolverUtils;
import javax.faces.context.FacesContext;
@@ -33,7 +33,7 @@ public class SolarServlet extends NonFac
String id = (String) facesContext.getExternalContext().getRequestParameterMap().get("id");
LOG.info("id='" + id + "'");
- TestBean testBean = (TestBean) VariableResolverUtil.resolveVariable(facesContext, "test");
+ TestBean testBean = (TestBean) VariableResolverUtils.resolveVariable(facesContext, "test");
return testBean.select(id);