xlawrence 2005/06/07 11:48:21 CEST
Modified files:
core/src/webapp/jsp/jahia/htmleditors/xinha utils.jsp
Log:
improved poor original code formatting
Revision Changes Path
1.4 +9 -11
jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp.diff?r1=1.3&r2=1.4&f=h
Index: utils.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- utils.jsp 6 Jun 2005 15:01:24 -0000 1.3
+++ utils.jsp 7 Jun 2005 09:48:21 -0000 1.4
@@ -101,23 +101,23 @@
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()) {
+ if (curObj.isCollection()) {
jsOperations.append("fo").append(counterOperations).append(".type =
'dir';\n");
- if(curObj.hasPermission(DAVFileAccess.WRITE) &&
curObj.isWriteable()) {
+ if (curObj.hasPermission(DAVFileAccess.WRITE) &&
curObj.isWriteable()) {
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'createDir';\n").
append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'fileUpload';\n");
}
- if(curObj.hasRevisions()) {
+ if (curObj.hasRevisions()) {
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'edit';\n");
}
- if(curObj.hasRevisions() &&
curObj.hasPermission(DAVFileAccess.MANAGE)){
+ if (curObj.hasRevisions() &&
curObj.hasPermission(DAVFileAccess.MANAGE)){
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'rightsMgmt';\n");
}
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'view&act=copy';\n");
- if(parentObj.hasPermission(DAVFileAccess.WRITE) &&
parentObj.isWriteable()) {
+ if (parentObj.hasPermission(DAVFileAccess.WRITE) &&
parentObj.isWriteable()) {
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'view&act=move';\n").
append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'fileRename';\n");
- if(curObj.hasPermission(DAVFileAccess.WRITE) &&
curObj.isWriteable()) {
+ if (curObj.hasPermission(DAVFileAccess.WRITE) &&
curObj.isWriteable()) {
jsOperations.append("fo").append(counterOperations).append(".operationsList[fo").append(counterOperations).append(".operationsList.length]
= 'fileDelete';\n");
}
}
@@ -163,7 +163,7 @@
final double fileSizeKo = size / 1024;
DecimalFormat df = new DecimalFormat();
df.setMaximumFractionDigits(2);
- df.setMinimumIntegerDigits( 1 );
+ df.setMinimumIntegerDigits(1);
fileSize = df.format(fileSizeKo) + " ko";
}
}
@@ -184,8 +184,7 @@
}
public String getSitemapToJs(JahiaData jData, String jahiaPath, JahiaField
theField,
- HashMap engineMap)
-throws JahiaException {
+ HashMap engineMap) throws JahiaException {
ParamBean jParams = jData.params();
StringBuffer buff = new StringBuffer();
buff.append("[[0,0,\'root\','/'],");
@@ -250,8 +249,7 @@
.append("\',\'").append(getPageState(pageId, jParams))
.append("\',\'")
.append(BigText_Field.getInstance().getFieldGroupsNotHavingAccessOnPageAsString(
- pageId, theField, jParams, engineMap))
- .append("'],");
+ pageId, theField, jParams, engineMap)).append("'],");
}
}
}
