Author: apetrelli
Date: Tue Dec 22 19:22:06 2009
New Revision: 893278
URL: http://svn.apache.org/viewvc?rev=893278&view=rev
Log:
TILESSB-19
Removed other empty directories.
Removed some useless code.
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/freemarker/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/
tiles/sandbox/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/jsp/
tiles/sandbox/trunk/tiles-request/tiles-request-portlet-wildcard/src/main/java/org/apache/tiles/portlet/
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/main/java/org/apache/tiles/portlet/
tiles/sandbox/trunk/tiles-request/tiles-request-portlet/src/test/java/org/apache/tiles/portlet/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/servlet/
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/velocity/
tiles/sandbox/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/velocity/
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/LocaleUtil.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java?rev=893278&r1=893277&r2=893278&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
Tue Dec 22 19:22:06 2009
@@ -111,7 +111,8 @@
* @return The container key.
* @since 2.2.0
*/
- protected String getContainerKey(ApplicationContext applicationContext) {
+ protected String getContainerKey(
+ @SuppressWarnings("unused") ApplicationContext applicationContext)
{
return null;
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/LocaleUtil.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/LocaleUtil.java?rev=893278&r1=893277&r2=893278&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/LocaleUtil.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/LocaleUtil.java
Tue Dec 22 19:22:06 2009
@@ -97,12 +97,11 @@
if (variantLength == 0) {
return result;
- } else {
- temp.append('_');
- temp.append(variant);
- result.add(temp.toString());
- return result;
}
+ temp.append('_');
+ temp.append(variant);
+ result.add(temp.toString());
+ return result;
}
/**
