Author: sshyrkov
Date: Mon Jan 21 17:53:42 2008
New Revision: 19556
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19556&repname=
=3Djahia
Log:
Typo corrected
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Te=
mplatePathResolverBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplateManagerService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/inclu=
de/ExecuteSuperTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/be=
ans/TemplatePathResolverBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/data/beans/TemplatePathResolverBean.ja=
va&rev=3D19556&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Te=
mplatePathResolverBean.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Te=
mplatePathResolverBean.java Mon Jan 21 17:53:42 2008
@@ -101,19 +101,19 @@
}
=
/**
- * Looks up the overriden JSP (from the parent template package) by the
+ * Looks up the overridden JSP (from the parent template package) by t=
he
* specified servlet path name (current JSP path) or <code>null</code>=
if
* not found.
* =
* @param jspPath
* current JSP path
- * @return the overriden JSP (from the parent template package) by the
+ * @return the overridden JSP (from the parent template package) by the
* specified servlet path name (current JSP path) or
* <code>null</code> if not found
*/
- public String lookupOverriden(String jspPath) {
+ public String lookupOverridden(String jspPath) {
return ServicesRegistry.getInstance().getJahiaTemplateManagerServi=
ce()
- .resolveOverridenResourcePathByServletPath(jspPath,
+ .resolveOverriddenResourcePathByServletPath(jspPath,
templatePackageName);
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/templates/JahiaTemplateManagerService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/templates/JahiaTemplateManage=
rService.java&rev=3D19556&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplateManagerService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/JahiaTemplateManagerService.java Mon Jan 21 17:53:42 2008
@@ -393,10 +393,10 @@
}
=
/**
- * Returns the overriden resource path (related to the Web context),
+ * Returns the overridden resource path (related to the Web context),
* resolved using template package inheritance or <code>null</code>, in
* case the specifiied resource can not found. I.e. it returns the res=
ource
- * that is overriden by the specified resource in any of the parent te=
mpalte
+ * that is overridden by the specified resource in any of the parent t=
empalte
* sets.
* =
* @see org.jahia.taglibs.include.ExecuteSuperTag
@@ -405,11 +405,11 @@
* folder
* @param templatePackageName
* template set name of the current site
- * @return the overriden resource path (related to the Web context),
+ * @return the overridden resource path (related to the Web context),
* resolved using template package inheritance or <code>null</=
code>,
* in case the specifiied resource can not found
*/
- public String resolveOverridenResourcePathByServletPath(String jspServ=
letPath,
+ public String resolveOverriddenResourcePathByServletPath(String jspSer=
vletPath,
String templatePackageName) {
=
if (null =3D=3D jspServletPath || null =3D=3D templatePackageName)=
{
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/include/ExecuteSuperTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/include/ExecuteSuperTag.java&r=
ev=3D19556&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/inclu=
de/ExecuteSuperTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/inclu=
de/ExecuteSuperTag.java Mon Jan 21 17:53:42 2008
@@ -19,7 +19,6 @@
=
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
=
/**
* Tag handler for executing a JSP with the same name as the current one f=
rom
@@ -61,7 +60,7 @@
: request.getServletPath());
=
if (jspPath !=3D null) {
- String path =3D getTemplatePathResolver().lookupOverriden(jspP=
ath);
+ String path =3D getTemplatePathResolver().lookupOverridden(jsp=
Path);
if (path !=3D null) {
this.url =3D path;
found =3D true;
@@ -71,17 +70,4 @@
return found ? super.doStartTag() : SKIP_BODY;
}
=
- protected String getResolvedPath(String page) throws JspTagException {
- String lookupPath =3D page;
- int questionMarkPosition =3D page.indexOf('?');
- // path includes parameters?
- if (questionMarkPosition !=3D -1) {
- // get path to '?'
- lookupPath =3D page.substring(0, questionMarkPosition);
- }
- String resolvedPath =3D getTemplatePathResolver().lookup(lookupPat=
h);
- return questionMarkPosition !=3D -1 ? resolvedPath
- + page.substring(questionMarkPosition) : resolvedPath;
- }
-
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
