You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/01/20 20:22:57 UTC
svn commit: r613661 -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
Author: hlship
Date: Sun Jan 20 11:22:56 2008
New Revision: 613661
URL: http://svn.apache.org/viewvc?rev=613661&view=rev
Log:
TAPESTRY-1526: Strip the folder name used to identify libraries from logical page names, just as the subfolder is stripped
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?rev=613661&r1=613660&r2=613661&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java Sun Jan 20 11:22:56 2008
@@ -314,30 +314,21 @@
addAll(terms, SPLIT_FOLDER_PATTERN, pathPrefix);
- int start = terms.size();
-
addAll(terms, SPLIT_PACKAGE_PATTERN, className.substring(startPos));
- StringBuilder builder = new StringBuilder(pathPrefix);
+ StringBuilder builder = new StringBuilder();
String sep = "";
- int count = terms.size();
-
- String logicalName = terms.get(count - 1);
+ String logicalName = terms.remove(terms.size() - 1);
String unstripped = logicalName;
- for (int i = 0; i < count - 1; i++)
+ for (String term : terms)
{
- String term = terms.get(i);
-
- if (i >= start)
- {
- builder.append(sep);
- builder.append(term);
+ builder.append(sep);
+ builder.append(term);
- sep = "/";
- }
+ sep = "/";
logicalName = stripTerm(term, logicalName);
}