xlawrence 2005/11/11 14:32:45 CET
Modified files:
core/src/webapp/jsp/jahia/htmleditors/fckeditor utils.jsp
Log:
cleanup a few things (imports + deprecated)
Revision Changes Path
1.12 +44 -46
jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp.diff?r1=1.11&r2=1.12&f=h
Index: utils.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- utils.jsp 13 Oct 2005 10:59:05 -0000 1.11
+++ utils.jsp 11 Nov 2005 13:32:45 -0000 1.12
@@ -1,28 +1,27 @@
-<%@ page import="java.util.*" %>
-<%@ page import="java.text.*"%>
<%@ page import="org.apache.commons.lang.ArrayUtils" %>
-<%@ page import="org.jahia.data.*" %>
-<%@ page import="org.jahia.data.fields.*" %>
-<%@ page import="org.jahia.data.viewhelper.sitemap.*" %>
-<%@ page import="org.jahia.params.*" %>
-<%@ page import="org.jahia.registries.*" %>
-<%@ page import="org.jahia.services.*" %>
-<%@ page import="org.jahia.services.pages.*" %>
-<%@ page import="org.jahia.services.htmleditors.*" %>
-<%@ page import="org.jahia.services.sitemap.*" %>
-<%@ page import="org.jahia.services.webdav.*" %>
-<%@ page import="org.jahia.services.version.*" %>
-<%@ page import="org.jahia.utils.*" %>
-<%@ page import="org.jahia.engines.shared.*" %>
-<%@ page import="org.jahia.exceptions.*" %>
-<%@ page import="org.jahia.content.*" %>
+<%@ page import="org.jahia.data.JahiaData"%>
+<%@ page import="org.jahia.data.fields.JahiaField" %>
+<%@ page import="org.jahia.data.viewhelper.sitemap.SiteMapViewHelper" %>
+<%@ page import="org.jahia.data.viewhelper.sitemap.TreeSiteMapViewHelper" %>
+<%@ page import="org.jahia.engines.shared.BigText_Field" %>
+<%@ page import="org.jahia.exceptions.JahiaException" %>
+<%@ page import="org.jahia.params.ProcessingContext" %>
+<%@ page import="org.jahia.registries.ServicesRegistry" %>
+<%@ page import="org.jahia.services.pages.ContentPage" %>
+<%@ page import="org.jahia.services.pages.JahiaPage" %>
+<%@ page import="org.jahia.services.sitemap.JahiaSiteMapService" %>
+<%@ page import="org.jahia.services.version.EntryLoadRequest" %>
+<%@ page import="org.jahia.services.webdav.DAVFileAccess" %>
+<%@ page import="org.jahia.services.webdav.JahiaWebdavBaseService" %>
+<%@ page import="java.text.DecimalFormat" %>
+<%@ page import="java.util.*" %>
<%!
final String types[] = {"application/pdf", "application/msword",
"application/vnd.ms-excel", "application/vnd.ms-powerpoint",
"application/zip",
"text/html",
"image/", "text/", "video/", "audio/"};
-
+
final String picto[] = {"pdf", "doc", "xls", "ppt",
"zip",
"html",
@@ -62,7 +61,7 @@
}
});
sortedResources.addAll(fileObject.getChildren());
-
+
final Iterator iter = sortedResources.iterator();
String expand;
while (iter.hasNext()) {
@@ -71,22 +70,22 @@
String pathDisplay = curDf.getName();
if (! excludeList.contains(pathDisplay.toLowerCase()) &&
curDf.hasPermission(DAVFileAccess.READ)) {
-
+
if (! curDf.isCollection()) {
final String path = curDf.getPath();
- final String fileExt;
+ final String fileExt;
if (path.lastIndexOf(".") > 0) {
fileExt = path.substring(path.lastIndexOf(".") + 1);
pathDisplay = path.substring(path.lastIndexOf("/") +
1);
-
+
} else {
fileExt = "";
}
-
+
if (ArrayUtils.contains(defaultFileExt, fileExt)) {
isValideExt = true;
}
-
+
} else {
if (curDf.getChildren().size() > 0) {
isValideExt = true;
@@ -103,13 +102,13 @@
expand = curDf.getPath();
expand = expand.replaceAll("'", "\\\'");
expand = expand.replaceAll("\"", """);
-
+
pathDisplay = pathDisplay.replaceAll("'", "\\\'");
-
+
buff.append("[").append(level).append(",").append(counterOperations)
.append(",\'").append(pathDisplay).append("\','").append(expand)
.append("'],");
-
+
counterOperations++;
}
buff.append(expandOne(curDf, level + 1, lang));
@@ -127,7 +126,7 @@
append("fo").append(counterOperations).append(".id =
'fo").append(counterOperations).append("';\n").
append("fo").append(counterOperations).append(".name =
'").append(curObj.getName().replaceAll("'", "\\\\'")).append("';\n").
append("fo").append(counterOperations).append(".path =
'").append(curObj.getPath().replaceAll("'", "\\\\'")).append("';\n");
-
+
if (curObj.isCollection()) {
jsOperations.append("fo").append(counterOperations).append(".type =
'dir';\n");
if (curObj.hasPermission(DAVFileAccess.WRITE) &&
curObj.isWriteable()) {
@@ -148,7 +147,7 @@
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'fileDelete';\n");
}
}
-
+
} else {
jsOperations.append("fo").append(counterOperations).append(".size =
'").append(getFileSize(curObj)).append("';\n").
append("fo").append(counterOperations).append(".type =
'file';\n");
@@ -175,7 +174,7 @@
}
}
counterOperations++;
-
+
}
public String getFileSize(DAVFileAccess curObj) {
@@ -186,7 +185,7 @@
if (size < 1024) {
fileSize = buff.append(size).append(" octets").toString();
buff.delete(0, buff.length());
-
+
} else {
final double fileSizeKo = size / 1024;
final DecimalFormat df = new DecimalFormat();
@@ -205,8 +204,7 @@
excludeList.add("mygroups");
excludeList.add("groups");
excludeList.add("content");
- final DAVFileAccess df = JahiaWebdavBaseService.getInstance().
- getDAVFileAccess(jParams, "/");
+ final DAVFileAccess df =
JahiaWebdavBaseService.getInstance().getDAVFileAccess(jParams, "/");
buff.append(expandOne(df, 1, lang));
buff.deleteCharAt(buff.length() - 1);
buff.append("]");
@@ -216,22 +214,22 @@
}
public String getSitemapToJs(JahiaData jData, String jahiaPath, JahiaField
theField,
- HashMap engineMap, String currentLanguageCode) throws JahiaException
{
+ HashMap engineMap, String currentLanguageCode)
throws JahiaException {
try {
- final ProcessingContext jParams = jData.params();
+ final ProcessingContext jParams = jData.getProcessingContext();
buff.append("[[0,0,\'root\','/'],");
final int defaultLevel = SiteMapViewHelper.DISPLAY_ALL_LEVEL;
final JahiaSiteMapService siteMapService =
ServicesRegistry.getInstance().getJahiaSiteMapService();
final ContentPage theContentPage =
ServicesRegistry.getInstance().getJahiaPageService().
lookupContentPage(jParams.getSite().getHomePageID(), false);
-
+
final int pageInfosFlag;
if (jData.gui().isNormalMode()) {
pageInfosFlag = ContentPage.ACTIVE_PAGE_INFOS;
} else {
pageInfosFlag = ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS;
}
-
+
final SiteMapViewHelper siteMapViewHelper =
siteMapService.getTreeSiteMapViewHelper(
jParams.getUser(), theContentPage, jParams.getSessionID(),
pageInfosFlag,
currentLanguageCode, defaultLevel);
@@ -239,12 +237,12 @@
return "";
}
final TreeSiteMapViewHelper treeJahiaSiteMap =
(TreeSiteMapViewHelper)siteMapViewHelper;
-
+
final ArrayList shouldDrawLineSegment = new ArrayList();
for (int level = 0; level < treeJahiaSiteMap.getMaxLevel(); level++)
{
shouldDrawLineSegment.add(level, new Boolean(true));
}
-
+
for (int i = 0; i < treeJahiaSiteMap.size(); i++) {
final ContentPage contentPage =
treeJahiaSiteMap.getContentPage(i);
if (contentPage == null) {
@@ -257,16 +255,16 @@
!templateName.equals("listeBoxCommun.jsp") &&
!templateName.equals("listPopup.jsp") &&
!templateName.equals("popup.jsp")) {
-
+
String pageTitle = treeJahiaSiteMap.getPageTitle(i,
currentLanguageCode);
-
+
final JahiaPage thePage = contentPage.getPage(jParams);
-
+
if (thePage != null) {
final int pageId = thePage.getID();
-
- if ( pageTitle == null || "N/A".equals(pageTitle) ||
+
+ if ( pageTitle == null || "N/A".equals(pageTitle) ||
pageTitle.length() == 0) {
if ("fr".equals(currentLanguageCode)) {
pageTitle = new StringBuffer().append("Pas de
titre [pid = ").
@@ -275,11 +273,11 @@
pageTitle = new StringBuffer().append("No title
[pid = ").
append(pageId).append("]").toString();
}
- }
+ }
final StringBuffer pageUrl = new StringBuffer();
pageUrl.append(jahiaPath).append("/lang/").append(currentLanguageCode)
.append("/pid/").append(pageId);
-
+
buff.append("[").append((treeJahiaSiteMap.getPageLevel(i) + 1))
.append(",").append((i + 1)).append(",\'")
.append(pageTitle.replaceAll("'", "\\\\'"))
