Author: tdraier
Date: Fri Nov 16 15:13:35 2007
New Revision: 19189
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19189&repname=
=3Djahia
Log:
restored lost characters in jsp refactoring
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/createdir.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/filedelete.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/fileunlock.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_versions.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/fckeditor/utils.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/xinha/utils.jsp
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/createdir.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/created=
ir.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/createdir.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/createdir.jsp Fri Nov 16 15:13:35 2007
@@ -31,10 +31,9 @@
final boolean showEditMenu =3D true;
request.setAttribute("showEditMenu", Boolean.valueOf(showEditMenu));
=
- final JCRFileNodeWrapper objectJahiaWebdavBaseService.getInstance().ge=
tDAVFileAccess(jParams,
- jParams.getSite(), jParams.getUser(), TableEntry.javascriptDec=
ode(pathes[0]));
+ final JCRFileNodeWrapper object =3D JahiaWebdavBaseService.getInstance=
().getDAVFileAccess(jParams, TableEntry.javascriptDecode(pathes[0]));
=
- final boolean canCreate =3D objectsPermission(FileNodeWrapper.WRITE) &=
& objectWriteable();
+ final boolean canCreate =3D object.hasPermission(JCRFileNodeWrapper.WR=
ITE) && object.isWriteable();
%>
=
<script type=3D"text/javascript">
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/filedelete.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/filedel=
ete.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/filedelete.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/filedelete.jsp Fri Nov 16 15:13:35 2007
@@ -37,10 +37,9 @@
request.setAttribute("showEditMenu", Boolean.valueOf(showEditMenu));
final boolean isDir =3D Boolean.TRUE.equals(engineMap.get("isDir"));
=
- final JCRFileNodeWrapper objectJahiaWebdavBaseService.getInstance().ge=
tDAVFileAccess(jParams,
- jParams.getSite(), jParams.getUser(), TableEntry.javascriptDec=
ode(pathes[0]));
+ final JCRFileNodeWrapper object =3D JahiaWebdavBaseService.getInstance=
().getDAVFileAccess(jParams, TableEntry.javascriptDecode(pathes[0]));
=
- final boolean canWrite =3D objectsPermission(FileNodeWrapper.WRITE) &&=
objectWriteable();
+ final boolean canWrite =3D object.hasPermission(JCRFileNodeWrapper.WRI=
TE) && object.isWriteable();
%>
=
<script type=3D"text/javascript">
@@ -78,7 +77,7 @@
<% } %>
=
<div id=3D"buttons">
- <% if (canWrite && !objectLocked()) { %>
+ <% if (canWrite && !object.isLocked()) { %>
<div class=3D"button">
<a href=3D"javascript:submitForm();"
title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
ok.button"/>">
@@ -152,7 +151,7 @@
</ul>
<% }
=
- if (locked || objectLocked()) { %>
+ if (locked || object.isLocked()) { %>
=
<p class=3D"errorbold">
<jahia:engineResourceBundle
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/fileunlock.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/fileunl=
ock.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/fileunlock.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/fileunlock.jsp Fri Nov 16 15:13:35 2007
@@ -29,8 +29,8 @@
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
final boolean showEditMenu =3D true;
request.setAttribute("showEditMenu", Boolean.valueOf(showEditMenu));
- final JCRFileNodeWrapper object(JCRFileNodeWrapper) engineMap.get("obj=
ect");
- final String lockOwner =3D objecttLock().getLockOwner();
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
+ final String lockOwner =3D object.getLock().getLockOwner();
%>
=
<script type=3D"text/javascript">
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info.js=
p&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info.jsp Fri Nov 16 15:13:35 2007
@@ -29,7 +29,7 @@
request.setAttribute("showEditMenu", Boolean.valueOf(showEditMenu));
final String tab =3D (String) engineMap.get("tab");
session.setAttribute("tab", tab);
- final JCRFileNodeWrapper object(JCRFileNodeWrapper) engineMap.get("obj=
ect");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
final String decodedPath =3D TableEntry.javascriptDecode(pathes[0]);
%>
=
@@ -64,7 +64,7 @@
<li><a href=3D"javascript:handleTabChange('edit')"><jahia:engineResour=
ceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.editFile.label"/></a></li>
<% } %>
- <% if (!objectCollection()) { %>
+ <% if (!object.isCollection()) { %>
<% if ("usages".equals(tab)) { %>
<li class=3D"selected"><div><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.title.FileMangaer.fileUsage"=
/></div></li>
@@ -73,7 +73,7 @@
resourceName=3D"org.jahia.engines.title.FileMangaer.fileUsage"=
/></a></li>
<% } %>
<% } %>
- <% if (objectsPermission(JCRFileNodeWrapper.MANAGE)) { %>
+ <% if (object.hasPermission(JCRFileNodeWrapper.MANAGE)) { %>
<% if ("rightsMgmt".equals(tab)) { %>
<li class=3D"selected"><div><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.include.actionSelector.Right=
sMgmt.label"/></div></li>
@@ -82,7 +82,7 @@
resourceName=3D"org.jahia.engines.include.actionSelector.Right=
sMgmt.label"/></a></li>
<% } %>
<% } %>
- <% if (objectsPermission(JCRFileNodeWrapper.WRITE)) { %>
+ <% if (object.hasPermission(JCRFileNodeWrapper.WRITE)) { %>
<% if ("version".equals(tab)) { %>
<li class=3D"selected"><div>Versions</div></li>
<% } else { %>
@@ -92,7 +92,7 @@
</ul>
=
<div id=3D"main">
-<% if (objectCollection()) {
+<% if (object.isCollection()) {
%>
<img alt=3D"folder" src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/i=
mages/types/large/folder.gif"/>
<% } else {
@@ -101,7 +101,7 @@
<img alt=3D"<%=3Dext%>" src=3D"<jahia:serverHttpPath/>/jsp/jahia/engin=
es/images/types/large/<%=3Dext%>.gif"/>
<% } %>
<% final String fileName =3D decodedPath.substring(decodedPath.lastIndexOf=
("/") + 1); %>
-<strong><%=3DfileName%> <%if (! fileName.equals(objecttName())) {%><=
i>(<%=3DobjecttName()%>)</i><%}%>
+<strong><%=3DfileName%> <%if (! fileName.equals(object.getName())) {=
%><i>(<%=3Dobject.getName()%>)</i><%}%>
</strong>
<hr/>
<% if (tab.equals("general")) { %>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_ed=
it.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_edit.jsp Fri Nov 16 15:13:35 2007
@@ -27,11 +27,11 @@
final String[] pathes =3D (String[]) engineMap.get("pathes");
final String tab =3D (String) engineMap.get("tab");
session.setAttribute("tab", tab);
- final JCRFileNodeWrapper object(JCRFileNodeWrapper) engineMap.get("obj=
ect");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
final String decodedPath =3D TableEntry.javascriptDecode(pathes[0]);
String selectCategoriesURL =3D CategoriesSelect_Engine.getInstance().r=
enderLink (jData.params(), "");
String type;
- if (objectCollection()) {
+ if (object.isCollection()) {
type =3D JahiaResourceBundle.getEngineResource("org.jahia.engines.=
filemanager.Filemanager_Engine.fileFolder.label",
jParams, jParams.getLocale());
} else {
@@ -131,7 +131,7 @@
</tr>
<tr>
<td>Title:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:ti=
tle"))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:title"))%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.path.label"/>
@@ -145,20 +145,20 @@
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.fileSize.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFileSize(object</td>
+ <td><%=3DDAVAbstractAction.getFileSize(object)%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.Type.label"/>:</td>
- <td><%=3Dtype%><%=3D(objectImage() ? " (Image)" : "")%></td>
+ <td><%=3Dtype%><%=3D(object.isImage() ? " (Image)" : "")%></td>
</tr>
<tr>
<td>Description:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:de=
scription"))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:description"))%></td>
</tr>
<tr>
<td>Keyword:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:ke=
ywords"))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j=
:keywords"))%></td>
</tr>
<tr>
<td colspan=3D"2"><hr>Lifecycle<hr/></td>
@@ -169,20 +169,20 @@
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.created.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFormatedDate(objecttCreationDateAsDa=
te())%>,
+ <td><%=3DDAVAbstractAction.getFormatedDate(object.getCreationDateA=
sDate())%>,
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.by.label"/>
- <%=3DDAVAbstractAction.getFormatedString(objecttCreationUser()=
)%></td>
+ <%=3DDAVAbstractAction.getFormatedString(object.getCreationUse=
r())%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.modified.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFormatedDate(objecttLastModifiedAsDa=
te())%>,
+ <td><%=3DDAVAbstractAction.getFormatedDate(object.getLastModifiedA=
sDate())%>,
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
filemanager.Filemanager_Engine.by.label"/>
- <%=3DDAVAbstractAction.getFormatedString(objecttModificationUs=
er())%></td>
+ <%=3DDAVAbstractAction.getFormatedString(object.getModificatio=
nUser())%></td>
</tr>
=
<%
- List types =3D objecttExtensionMixinTypes();
+ List types =3D object.getExtensionMixinTypes();
for (Iterator iterator =3D types.iterator(); iterator.hasNext();) {
NodeType nodeType =3D (NodeType) iterator.next();
String name =3D nodeType.getName();
@@ -197,7 +197,7 @@
<td colspan=3D"2"><hr><%=3D typelabel %><hr/></td>
</tr>
<%
- Map props =3D objecttProperties(nodeType.getName());
+ Map props =3D object.getProperties(nodeType.getName());
for (Iterator iterator1 =3D props.keySet().iterator(); iterato=
r1.hasNext();) {
%>
<tr>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info_versions.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_ve=
rsions.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_versions.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_versions.jsp Fri Nov 16 15:13:35 2007
@@ -12,11 +12,11 @@
=
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
- final JCRFileNodeWrapper object(JCRFileNodeWrapper) engineMap.get("obj=
ect");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
%>
<input type=3D"hidden" name=3D"saveProperties" value=3D"yes"/>
<%
- if (!objectVersioned()) {
+ if (!object.isVersioned()) {
%>
Versioning is not activated on this file.
<br>
@@ -32,10 +32,10 @@
<td>Author</td>
</tr>
<%
- List l =3D objecttVersions();
+ List l =3D object.getVersions();
for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
String s =3D (String) iterator.next();
- JCRFileNodeWrapper version =3D objecttVersion(s);
+ JCRFileNodeWrapper version =3D object.getVersion(s);
%>
<tr>
<td><%=3D s %></td>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/engines/filemanager/info_view.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info_vi=
ew.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/en=
gines/filemanager/info_view.jsp Fri Nov 16 15:13:35 2007
@@ -22,10 +22,10 @@
final String[] pathes =3D (String[]) engineMap.get("pathes");
final String tab =3D (String) engineMap.get("tab");
session.setAttribute("tab", tab);
- final JCRFileNodeWrapper object(JCRFileNodeWrapper) engineMap.get("obj=
ect");
+ final JCRFileNodeWrapper object =3D (JCRFileNodeWrapper) engineMap.get=
("object");
final String decodedPath =3D TableEntry.javascriptDecode(pathes[0]);
String type;
- if (objectCollection()) {
+ if (object.isCollection()) {
type =3D JahiaResourceBundle.getEngineResource("org.jahia.engines.=
filemanager.Filemanager_Engine.fileFolder.label",
jParams, jParams.getLocale());
} else {
@@ -46,7 +46,7 @@
</tr>
<tr>
<td>Title:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:title"=
))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j:tit=
le"))%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.file=
manager.Filemanager_Engine.path.label"/>
@@ -60,20 +60,20 @@
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.fileSize.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFileSize(object</td>
+ <td><%=3DDAVAbstractAction.getFileSize(object)%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.Type.label"/>:</td>
- <td><%=3Dtype%><%=3D(objectImage() ? " (Image)" : "")%></td>
+ <td><%=3Dtype%><%=3D(object.isImage() ? " (Image)" : "")%></td>
</tr>
<tr>
<td>Description:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:descri=
ption"))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j:des=
cription"))%></td>
</tr>
<tr>
<td>Keyword:</td>
- <td><%=3DDAVAbstractAction.getFormatedString(objecttProperty("j:keywor=
ds"))%></td>
+ <td><%=3DDAVAbstractAction.getFormatedString(object.getProperty("j:key=
words"))%></td>
</tr>
<tr>
<td colspan=3D"2"><hr>Lifecycle<hr/></td>
@@ -84,20 +84,20 @@
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.created.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFormatedDate(objecttCreationDateAsDate()=
)%>,
+ <td><%=3DDAVAbstractAction.getFormatedDate(object.getCreationDateAsDat=
e())%>,
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.file=
manager.Filemanager_Engine.by.label"/>
- <%=3DDAVAbstractAction.getFormatedString(objecttCreationUser())%><=
/td>
+ <%=3DDAVAbstractAction.getFormatedString(object.getCreationUser())=
%></td>
</tr>
<tr>
<td><jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.modified.label"/>:</td>
- <td><%=3DDAVAbstractAction.getFormatedDate(objecttLastModifiedAsDate()=
)%>,
+ <td><%=3DDAVAbstractAction.getFormatedDate(object.getLastModifiedAsDat=
e())%>,
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.file=
manager.Filemanager_Engine.by.label"/>
- <%=3DDAVAbstractAction.getFormatedString(objecttModificationUser()=
)%></td>
+ <%=3DDAVAbstractAction.getFormatedString(object.getModificationUse=
r())%></td>
</tr>
=
<%
- List types =3D objecttExtensionMixinTypes();
+ List types =3D object.getExtensionMixinTypes();
for (Iterator iterator =3D types.iterator(); iterator.hasNext();) {
NodeType nodeType =3D (NodeType) iterator.next();
String name =3D nodeType.getName();
@@ -112,7 +112,7 @@
<td colspan=3D"2"><hr><%=3D typelabel %><hr/></td>
</tr>
<%
- Map props =3D objecttProperties(nodeType.getName());
+ Map props =3D object.getProperties(nodeType.getName());
for (Iterator iterator1 =3D props.keySet().iterator(); iterator1.hasNe=
xt();) {
%>
<tr>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/htmleditors/fckeditor/utils.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils=
.jsp&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/fckeditor/utils.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/fckeditor/utils.jsp Fri Nov 16 15:13:35 2007
@@ -65,14 +65,14 @@
if (fileObject !=3D null) {
final TreeSet sortedResources =3D new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
- final JCRFileNodeWrapper fileAccess1(JCRFileNodeWrapper)o1;
- final JCRFileNodeWrapper fileAccess2(JCRFileNodeWrapper)o2;
- final boolean collection1 =3D fileAccess1Collection();
- final boolean collection2 =3D fileAccess2Collection();
+ final JCRFileNodeWrapper fileAccess1 =3D (JCRFileNodeWrapp=
er)o1;
+ final JCRFileNodeWrapper fileAccess2 =3D (JCRFileNodeWrapp=
er)o2;
+ final boolean collection1 =3D fileAccess1.isCollection();
+ final boolean collection2 =3D fileAccess2.isCollection();
if (collection1 !=3D collection2) {
return collection1?-1:1;
} else {
- return fileAccess1tPath().compareTo(fileAccess2tPath()=
);
+ return fileAccess1.getPath().compareTo(fileAccess2.get=
Path());
}
}
});
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/ja=
hia/htmleditors/xinha/utils.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp=
&rev=3D19189&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-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/xinha/utils.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/jsp/jahia/ht=
mleditors/xinha/utils.jsp Fri Nov 16 15:13:35 2007
@@ -64,14 +64,14 @@
if (fileObject !=3D null) {
final TreeSet sortedResources =3D new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
- final JCRFileNodeWrapper fileAccess1(JCRFileNodeWrapper)o1;
- final JCRFileNodeWrapper fileAccess2(JCRFileNodeWrapper)o2;
- final boolean collection1 =3D fileAccess1Collection();
- final boolean collection2 =3D fileAccess2Collection();
+ final JCRFileNodeWrapper fileAccess1 =3D (JCRFileNodeWrapp=
er)o1;
+ final JCRFileNodeWrapper fileAccess2 =3D (JCRFileNodeWrapp=
er)o2;
+ final boolean collection1 =3D fileAccess1.isCollection();
+ final boolean collection2 =3D fileAccess2.isCollection();
if (collection1 !=3D collection2) {
return collection1?-1:1;
} else {
- return fileAccess1tPath().compareTo(fileAccess2tPath()=
);
+ return fileAccess1.getPath().compareTo(fileAccess2.get=
Path());
}
}
});
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
