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 2013/11/14 15:42:27 UTC
svn commit: r1541919 - in /myfaces/tobago/trunk: tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ tobag...
Author: lofwyr
Date: Thu Nov 14 14:42:26 2013
New Revision: 1541919
URL: http://svn.apache.org/r1541919
Log:
TOBAGO-1345: Remove dependencies to rarely used libraries
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/IoUtils.java
Modified:
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxNodeRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Thu Nov 14 14:42:26 2013
@@ -220,14 +220,6 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Thu Nov 14 14:42:26 2013
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.component;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.component.AbstractUISheet;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.model.SheetState;
import org.apache.myfaces.tobago.util.BeanComparator;
import org.apache.myfaces.tobago.util.ValueExpressionComparator;
@@ -185,7 +185,7 @@ public class Sorter {
boolean isSimpleProperty(final String expressionString) {
if (expressionString.startsWith("#{") && expressionString.endsWith("}")) {
final String inner = expressionString.substring(2, expressionString.length() - 1);
- final String[] parts = StringUtils.split(inner, ".");
+ final String[] parts = StringUtils.split(inner, '.');
for (final String part : parts) {
if (!StringUtils.isAlpha(part)) {
return false;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java Thu Nov 14 14:42:26 2013
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.contex
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.ObjectArrayIterator;
import org.apache.commons.collections.iterators.SingletonIterator;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.ArrayUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import java.io.Serializable;
import java.util.ArrayList;
@@ -109,7 +109,7 @@ public final class Markup implements Ser
} else if (values.length == 1) {
return valueOf(values[0]);
} else {
- final Markup markup = new Markup((String[]) ArrayUtils.clone(values));
+ final Markup markup = new Markup(values.clone());
for (int i = 0; i < markup.values.length; i++) {
markup.values[i] = markup.values[i].trim();
}
@@ -313,4 +313,5 @@ public final class Markup implements Ser
}
return Arrays.toString(values);
}
+
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.convert;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java Thu Nov 14 14:42:26 2013
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.event;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.internal.util.FindComponentUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Thu Nov 14 14:42:26 2013
@@ -20,12 +20,12 @@
package org.apache.myfaces.tobago.facelets;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.el.ConstantMethodBinding;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -284,8 +284,7 @@ public final class AttributeHandler exte
}
private boolean containsMethodOrValueExpression(String string) {
- return (StringUtils.contains(string, "${") || StringUtils.contains(string, "#{"))
- && StringUtils.contains(string, "}");
+ return (string.contains("${") || string.contains("#{")) && string.contains("}");
}
private boolean isSimpleExpression(String string) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java Thu Nov 14 14:42:26 2013
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.internal.config;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.context.Markup;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import java.io.Serializable;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/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?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Thu Nov 14 14:42:26 2013
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.internal.config;
-import org.apache.commons.io.IOUtils;
import org.apache.myfaces.tobago.context.ThemeImpl;
import org.apache.myfaces.tobago.context.ThemeScript;
import org.apache.myfaces.tobago.context.ThemeStyle;
+import org.apache.myfaces.tobago.internal.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
@@ -112,7 +112,7 @@ public class TobagoConfigParser extends
final SAXParser saxParser = factory.newSAXParser();
saxParser.parse(inputStream, this);
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
return tobagoConfig;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.config;
-import org.apache.commons.io.IOUtils;
+import org.apache.myfaces.tobago.internal.util.IoUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -47,7 +47,7 @@ public class TobagoConfigVersion extends
SAXParser saxParser = factory.newSAXParser();
saxParser.parse(inputStream, this);
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/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?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java Thu Nov 14 14:42:26 2013
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.internal.context;
-import org.apache.commons.io.IOUtils;
import org.apache.myfaces.tobago.context.ThemeImpl;
import org.apache.myfaces.tobago.internal.config.TobagoConfigFragment;
import org.apache.myfaces.tobago.internal.config.TobagoConfigParser;
+import org.apache.myfaces.tobago.internal.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,7 +119,7 @@ class ResourceLocator {
try {
addProperties(inputStream, resources, childPath, false, 0);
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
} else if (childPath.endsWith(".properties.xml")) {
InputStream inputStream = servletContext.getResourceAsStream(childPath);
@@ -129,7 +129,7 @@ class ResourceLocator {
LOG.error("childPath = \"" + childPath + "\" ", e);
throw e;
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
} else {
resources.add(childPath);
@@ -328,8 +328,8 @@ class ResourceLocator {
}
}
} finally {
- IOUtils.closeQuietly(stream);
- IOUtils.closeQuietly(zipStream);
+ IoUtils.closeQuietly(stream);
+ IoUtils.closeQuietly(zipStream);
}
}
@@ -346,7 +346,7 @@ class ResourceLocator {
try {
addProperties(inputStream, resources, name, false, skipPrefix);
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
} else if (name.endsWith(".properties.xml")) {
if (LOG.isInfoEnabled()) {
@@ -356,7 +356,7 @@ class ResourceLocator {
try {
addProperties(inputStream, resources, name, true, skipPrefix);
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
} else {
resources.add(name.substring(skipPrefix));
@@ -406,7 +406,7 @@ class ResourceLocator {
LOG.error(msg, e);
throw new ServletException(msg, e);
} finally {
- IOUtils.closeQuietly(stream);
+ IoUtils.closeQuietly(stream);
}
final Enumeration e = temp.propertyNames();
@@ -436,7 +436,7 @@ class ResourceLocator {
// may happen (e. g. in tests)
LOG.error("No Manifest-File found.");
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
if (version != null) {
theme.setVersion(version);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/LayoutContext.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.layout;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
import org.apache.myfaces.tobago.layout.LayoutBase;
import org.apache.myfaces.tobago.layout.LayoutContainer;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java Thu Nov 14 14:42:26 2013
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.internal.taglib;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.OnComponentCreated;
import org.apache.myfaces.tobago.component.OnComponentPopulated;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentELTag;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java Thu Nov 14 14:42:26 2013
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.internal.taglib;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.OnComponentCreated;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentELTag;
Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java?rev=1541919&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java (added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ArrayUtils.java Thu Nov 14 14:42:26 2013
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.internal.util;
+
+public class ArrayUtils {
+
+ public static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+ public static boolean contains(String[] array, String markup) {
+ for (final String anArray : array) {
+ if (markup.equals(anArray)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/IoUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/IoUtils.java?rev=1541919&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/IoUtils.java (added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/IoUtils.java Thu Nov 14 14:42:26 2013
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.internal.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public final class IoUtils {
+
+ private IoUtils() {
+ }
+
+ public static void closeQuietly(final Closeable closeable) {
+ try {
+ if (closeable != null) {
+ closeable.close();
+ }
+ } catch (IOException exception) {
+ // ignore
+ }
+ }
+}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/StringUtils.java Thu Nov 14 14:42:26 2013
@@ -30,16 +30,17 @@ public final class StringUtils {
// utils class
}
- public static List<Integer> parseIntegerList(String integerList) throws NumberFormatException {
+ public static List<Integer> parseIntegerList(final String integerList) throws NumberFormatException {
return parseIntegerList(integerList, ", ");
}
- public static List<Integer> parseIntegerList(String integerList, String delimiters) throws NumberFormatException {
- List<Integer> list = new ArrayList<Integer>();
+ public static List<Integer> parseIntegerList(final String integerList, final String delimiters)
+ throws NumberFormatException {
+ final List<Integer> list = new ArrayList<Integer>();
- StringTokenizer tokenizer = new StringTokenizer(integerList, delimiters);
+ final StringTokenizer tokenizer = new StringTokenizer(integerList, delimiters);
while (tokenizer.hasMoreElements()) {
- String token = tokenizer.nextToken().trim();
+ final String token = tokenizer.nextToken().trim();
if (token.length() > 0) {
list.add(new Integer(token));
}
@@ -48,26 +49,26 @@ public final class StringUtils {
return list;
}
- public static <T> String joinWithSurroundingSeparator(List<T> list) {
- StringBuilder buffer = new StringBuilder(",");
- for (T t : list) {
+ public static <T> String joinWithSurroundingSeparator(final List<T> list) {
+ final StringBuilder buffer = new StringBuilder(",");
+ for (final T t : list) {
buffer.append(t);
buffer.append(",");
}
return buffer.toString();
}
- public static int[] getIndices(String list) {
- List<String> indexList = new ArrayList<String>();
- StringTokenizer st = new StringTokenizer(list, ",");
+ public static int[] getIndices(final String list) {
+ final List<String> indexList = new ArrayList<String>();
+ final StringTokenizer st = new StringTokenizer(list, ",");
while (st.hasMoreTokens()) {
- String token = st.nextToken().trim();
- int idx = token.indexOf('-');
+ final String token = st.nextToken().trim();
+ final 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());
+ final int start = Integer.parseInt(token.substring(0, idx).trim());
+ final 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));
@@ -80,14 +81,14 @@ public final class StringUtils {
}
}
- int[] indices = new int[indexList.size()];
+ final int[] indices = new int[indexList.size()];
for (int i = 0; i < indices.length; i++) {
indices[i] = Integer.parseInt(indexList.get(i));
}
return indices;
}
- public static String constantToCamelCase(String constant) {
+ public static String constantToCamelCase(final String constant) {
final StringBuilder builder = new StringBuilder(constant.length());
final char[] chars = constant.toCharArray();
for (int i = 0; i < chars.length; i++) {
@@ -162,4 +163,279 @@ public final class StringUtils {
return true;
}
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean endsWith(final String string, final String suffix) {
+ if (string == null || suffix == null) {
+ return (string == null && suffix == null);
+ }
+ if (suffix.length() > string.length()) {
+ return false;
+ }
+ final int strOffset = string.length() - suffix.length();
+ return string.regionMatches(false, strOffset, suffix, 0, suffix.length());
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String[] split(final String string, final char separator) {
+ // Performance tuned for 2.0 (JDK1.4)
+
+ if (string == null) {
+ return null;
+ }
+ final int len = string.length();
+ if (len == 0) {
+ return ArrayUtils.EMPTY_STRING_ARRAY;
+ }
+ final List<String> list = new ArrayList<String>();
+ int i = 0;
+ int start = 0;
+ boolean match = false;
+ while (i < len) {
+ if (string.charAt(i) == separator) {
+ if (match) {
+ list.add(string.substring(start, i));
+ match = false;
+ }
+ start = ++i;
+ continue;
+ }
+ match = true;
+ i++;
+ }
+ if (match) {
+ list.add(string.substring(start, i));
+ }
+ return list.toArray(new String[list.size()]);
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String[] split(final String string, final String separator) {
+ final int max = -1;
+ // Performance tuned for 2.0 (JDK1.4)
+ // Direct code is quicker than StringTokenizer.
+ // Also, StringTokenizer uses isSpace() not isWhitespace()
+
+ if (string == null) {
+ return null;
+ }
+ final int len = string.length();
+ if (len == 0) {
+ return ArrayUtils.EMPTY_STRING_ARRAY;
+ }
+ final List<String> list = new ArrayList<String>();
+ int sizePlus1 = 1;
+ int i = 0;
+ int start = 0;
+ boolean match = false;
+ if (separator == null) {
+ // Null separator means use whitespace
+ while (i < len) {
+ if (Character.isWhitespace(string.charAt(i))) {
+ if (match) {
+ if (sizePlus1++ == max) {
+ i = len;
+ }
+ list.add(string.substring(start, i));
+ match = false;
+ }
+ start = ++i;
+ continue;
+ }
+ match = true;
+ i++;
+ }
+ } else if (separator.length() == 1) {
+ // Optimise 1 character case
+ final char sep = separator.charAt(0);
+ while (i < len) {
+ if (string.charAt(i) == sep) {
+ if (match) {
+ if (sizePlus1++ == max) {
+ i = len;
+ }
+ list.add(string.substring(start, i));
+ match = false;
+ }
+ start = ++i;
+ continue;
+ }
+ match = true;
+ i++;
+ }
+ } else {
+ // standard case
+ while (i < len) {
+ if (separator.indexOf(string.charAt(i)) >= 0) {
+ if (match) {
+ if (sizePlus1++ == max) {
+ i = len;
+ }
+ list.add(string.substring(start, i));
+ match = false;
+ }
+ start = ++i;
+ continue;
+ }
+ match = true;
+ i++;
+ }
+ }
+ if (match) {
+ list.add(string.substring(start, i));
+ }
+ return list.toArray(new String[list.size()]);
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isAlpha(final String string) {
+ if (string == null) {
+ return false;
+ }
+ final int sz = string.length();
+ for (int i = 0; i < sz; i++) {
+ if (!Character.isLetter(string.charAt(i))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isEmpty(final String value) {
+ return value == null || value.length() == 0;
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isNotEmpty(final String value) {
+ return !isEmpty(value);
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isBlank(final String string) {
+ final int strLen = string.length();
+ if (string == null || strLen == 0) {
+ return true;
+ }
+ for (int i = 0; i < strLen; i++) {
+ if ((!Character.isWhitespace(string.charAt(i)))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isNotBlank(String str) {
+ return !isBlank(str);
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String replace(final String text, final String searchString, final String replacement) {
+ int max = -1;
+ if (isEmpty(text) || isEmpty(searchString) || replacement == null) {
+ return text;
+ }
+ int start = 0;
+ int end = text.indexOf(searchString, start);
+ if (end == -1) {
+ return text;
+ }
+ final int replLength = searchString.length();
+ int increase = replacement.length() - replLength;
+ increase = (increase < 0 ? 0 : increase);
+ increase *= (max < 0 ? 16 : (max > 64 ? 64 : max));
+ final StringBuilder buf = new StringBuilder(text.length() + increase);
+ while (end != -1) {
+ buf.append(text.substring(start, end)).append(replacement);
+ start = end + replLength;
+ if (--max == 0) {
+ break;
+ }
+ end = text.indexOf(searchString, start);
+ }
+ buf.append(text.substring(start));
+ return buf.toString();
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String repeat(String str, int repeat) {
+ int outputLength = str.length() * repeat;
+ StringBuilder buf = new StringBuilder(outputLength);
+ for (int i = 0; i < repeat; i++) {
+ buf.append(str);
+ }
+ return buf.toString();
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String uncapitalize(String str) {
+ return String.valueOf(Character.toLowerCase(str.charAt(0))) + str.substring(1);
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static boolean isAlphanumeric(String str) {
+ int sz = str.length();
+ for (int i = 0; i < sz; i++) {
+ if (!Character.isLetterOrDigit(str.charAt(i))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String join(List<String> list, char separator) {
+ final int size = list.size();
+ if (size <= 0) {
+ return "";
+ }
+
+ int bufSize = size * list.get(0).length() + 1;
+ StringBuilder builder = new StringBuilder(bufSize);
+
+ for (int i = 0; i < size; i++) {
+ if (i > 0) {
+ builder.append(separator);
+ }
+ final String string = list.get(i);
+ if (string != null) {
+ builder.append(string);
+ }
+ }
+ return builder.toString();
+ }
+
+ /**
+ * Basically taken from commons-lang
+ */
+ public static String defaultString(String string) {
+ return string == null ? "" : string;
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java Thu Nov 14 14:42:26 2013
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.internal.webapp;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.util.Deprecation;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.layout;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java Thu Nov 14 14:42:26 2013
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.model;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.event.SortActionEvent;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Thu Nov 14 14:42:26 2013
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.renderkit;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.myfaces.tobago.internal.util.ArrayUtils;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java Thu Nov 14 14:42:26 2013
@@ -20,11 +20,11 @@
package org.apache.myfaces.tobago.renderkit.css;
import org.apache.commons.collections.map.MultiKeyMap;
-import org.apache.commons.lang.StringUtils;
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.internal.util.StringUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Thu Nov 14 14:42:26 2013
@@ -19,13 +19,13 @@
package org.apache.myfaces.tobago.servlet;
-import org.apache.commons.io.IOUtils;
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.Theme;
+import org.apache.myfaces.tobago.internal.util.IoUtils;
+import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -170,7 +170,7 @@ public class ResourceServlet extends Htt
response.sendError(HttpServletResponse.SC_NOT_FOUND, message);
}
} finally {
- IOUtils.closeQuietly(inputStream);
+ IoUtils.closeQuietly(inputStream);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java Thu Nov 14 14:42:26 2013
@@ -19,17 +19,17 @@
package org.apache.myfaces.tobago.util;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.HideLayoutToken;
import org.apache.myfaces.tobago.layout.LayoutToken;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.PercentLayoutToken;
import org.apache.myfaces.tobago.layout.PixelLayoutToken;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -377,13 +377,13 @@ public class LayoutInfo {
}
}
+ @Override
public String toString() {
- return new ToStringBuilder(this).
- append("cellLeft", cellsLeft).
- append("spaceLeft", spaceLeft).
- append("spaces", spaces).
- append("layoutTokens", layoutTokens).
- toString();
+ return "LayoutInfo{"
+ + "cellsLeft=" + cellsLeft
+ + ", spaceLeft=" + spaceLeft
+ + ", spaces=" + Arrays.toString(spaces)
+ + ", layoutTokens=" + layoutTokens
+ + '}';
}
}
-
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java Thu Nov 14 14:42:26 2013
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.component;
import junit.framework.Assert;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.junit.Before;
import org.junit.Test;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Thu Nov 14 14:42:26 2013
@@ -306,6 +306,10 @@
<artifactId>tobago-security</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<!--
<dependency>
<groupId>log4j</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Thu Nov 14 14:42:26 2013
@@ -199,6 +199,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<!-- compile or provided depends on the used server -->
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Thu Nov 14 14:42:26 2013
@@ -205,6 +205,10 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/pom.xml?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/pom.xml Thu Nov 14 14:42:26 2013
@@ -39,6 +39,10 @@
<artifactId>tobago-theme-standard</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.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/CalendarRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICalendar;
import org.apache.myfaces.tobago.context.Markup;
@@ -150,7 +149,9 @@ public class CalendarRenderer extends La
for (int dayIt = 0; dayIt < 7; ++dayIt) {
DateModel date = model.getDate(0, dayIt);
String dayName = dayInWeekFormat.format(date.getCalendar().getTime());
- dayName = StringUtils.substring(dayName, 0, 2);
+ if (dayName != null) {
+ dayName = dayName.substring(0, 2);
+ }
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(output, "dayOfWeek"));
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.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/InRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.component.AbstractUIIn;
import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -64,9 +64,11 @@ public class InRenderer extends InputRen
final String currentValue = getCurrentValue(facesContext, input);
final boolean password = ComponentUtils.getBooleanAttribute(input, Attributes.PASSWORD);
if (LOG.isDebugEnabled()) {
- LOG.debug("currentValue = '"
- + (password && currentValue != null ? StringUtils.leftPad("", currentValue.length(), '*') : currentValue)
- + "'");
+ if (password) {
+ LOG.debug("currentValue is a password");
+ } else {
+ LOG.debug("currentValue = '" + currentValue + "'");
+ }
}
final String type = password ? HtmlInputTypes.PASSWORD : HtmlInputTypes.TEXT;
final String id = input.getClientId(facesContext);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.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/PageRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.application.ProjectStage;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
@@ -39,6 +38,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.internal.util.MimeTypeUtils;
import org.apache.myfaces.tobago.internal.util.ResponseUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.portlet.PortletUtils;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
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=1541919&r1=1541918&r2=1541919&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 Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.SelectBooleanCommand;
@@ -34,6 +33,7 @@ import org.apache.myfaces.tobago.context
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.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.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/TreeLabelRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.UITreeLabel;
import org.apache.myfaces.tobago.internal.component.AbstractUIData;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeListbox;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxNodeRenderer.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/TreeListboxNodeRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxNodeRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.UITreeNode;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.context.Markup;
@@ -68,7 +67,7 @@ public class TreeListboxNodeRenderer ext
// expand state
if (folder) {
- boolean expanded = Boolean.parseBoolean((String) requestParameterMap.get(id + "-expanded"));
+ boolean expanded = Boolean.parseBoolean(requestParameterMap.get(id + "-expanded"));
if (node.isExpanded() != expanded) {
new TreeExpansionEvent(node, node.isExpanded(), expanded).queue();
}
@@ -76,17 +75,16 @@ public class TreeListboxNodeRenderer ext
// select
if (tree.getSelectableAsEnum() != Selectable.NONE) { // selection
- String selected = (String) requestParameterMap.get(treeId + AbstractUITree.SELECT_STATE);
+ String selected = requestParameterMap.get(treeId + AbstractUITree.SELECT_STATE);
String searchString = ";" + node.getClientId(facesContext) + ";";
UITreeSelect treeSelect = ComponentUtils.findDescendant(node, UITreeSelect.class);
if (treeSelect != null) {
- treeSelect.setSubmittedValue(StringUtils.contains(selected, searchString));
+ treeSelect.setSubmittedValue(selected.contains(searchString));
}
}
// marked
- String marked
- = (String) requestParameterMap.get(treeId + ComponentUtils.SUB_SEPARATOR + AbstractUITree.SUFFIX_MARKED);
+ String marked = requestParameterMap.get(treeId + ComponentUtils.SUB_SEPARATOR + AbstractUITree.SUFFIX_MARKED);
if (marked != null) {
String searchString = treeId + UINamingContainer.getSeparatorChar(facesContext) + nodeStateId;
boolean markedValue = marked.equals(searchString);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.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/TreeSelectRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,13 +19,13 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.internal.component.AbstractUIData;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeListbox;
import org.apache.myfaces.tobago.internal.component.AbstractUITreeNode;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.model.Selectable;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -85,7 +85,7 @@ public class TreeSelectRenderer extends
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (data instanceof AbstractUITreeListbox) {
- writer.write(StringUtils.defaultString((String) select.getLabel()));
+ writer.write(StringUtils.defaultString(select.getLabel()));
return;
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/Command.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UICommand;
@@ -27,6 +26,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.component.AbstractUICommandBase;
import org.apache.myfaces.tobago.internal.util.Deprecation;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Thu Nov 14 14:42:26 2013
@@ -19,12 +19,12 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UILabel;
import org.apache.myfaces.tobago.component.UISeparator;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.internal.util.Deprecation;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Thu Nov 14 14:42:26 2013
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.renderkit.html.util;
-import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
@@ -33,6 +32,7 @@ import org.apache.myfaces.tobago.context
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterWrapper;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.css.Classes;
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java Thu Nov 14 14:42:26 2013
@@ -475,9 +475,8 @@ public class RenderUtils {
}
public static void decodeScrollPosition(FacesContext facesContext, UIComponent component) {
- String key;
- key = component.getClientId(facesContext) + SCROLL_POSTFIX;
- String value = (String) facesContext.getExternalContext().getRequestParameterMap().get(key);
+ String key = component.getClientId(facesContext) + SCROLL_POSTFIX;
+ String value = facesContext.getExternalContext().getRequestParameterMap().get(key);
if (value != null) {
Integer[] scrollPosition = parseScrollPosition(value);
if (scrollPosition != null) {
@@ -489,7 +488,7 @@ public class RenderUtils {
public static Integer[] parseScrollPosition(String value) {
Integer[] position = null;
- if (!org.apache.commons.lang.StringUtils.isBlank(value)) {
+ if (!StringUtils.isBlank(value)) {
int sep = value.indexOf(";");
if (LOG.isInfoEnabled()) {
LOG.info("value = \"" + value + "\" sep = " + sep + "");
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java Thu Nov 14 14:42:26 2013
@@ -165,7 +165,7 @@ public class ClassesGenerator extends Ab
}
tagInfo.setSuperClass("org.apache.myfaces.tobago.internal.taglib.TobagoELTag");
tagInfo.setComponentClassName(componentTag.uiComponent());
- tagInfo.addImport("org.apache.commons.lang.StringUtils");
+ tagInfo.addImport("org.apache.myfaces.tobago.internal.util.StringUtils");
tagInfo.addImport("org.slf4j.Logger");
tagInfo.addImport("org.slf4j.LoggerFactory");
tagInfo.addImport("javax.faces.application.Application");
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg?rev=1541919&r1=1541918&r2=1541919&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg Thu Nov 14 14:42:26 2013
@@ -40,8 +40,8 @@ component(componentInfo) ::= <<
package <componentInfo.packageName>;
<componentInfo.imports:import(); separator="\n">
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.internal.util.ArrayUtils;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.internal.util.Deprecation;
import org.apache.myfaces.tobago.renderkit.MarginValues;
import org.apache.myfaces.tobago.renderkit.SpacingValues;
@@ -230,12 +230,12 @@ public String[] get<property.upperCamelC
}
return result.toArray(new String[result.size()]);
} else if (strArray == null) {
- return ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.tobago.internal.util.ArrayUtils.EMPTY_STRING_ARRAY;
} else {
return new String[]{strArray.toString()};
}
}
- return ArrayUtils.EMPTY_STRING_ARRAY;
+ return org.apache.myfaces.tobago.internal.util.ArrayUtils.EMPTY_STRING_ARRAY;
}
<checkDeprecated(property)>