You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/03/23 13:49:38 UTC
svn commit: r926546 - in
/felix/trunk/webconsole-plugins/memoryusage/src/main:
java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java
resources/templates/memoryusage.html
Author: fmeschbe
Date: Tue Mar 23 12:49:38 2010
New Revision: 926546
URL: http://svn.apache.org/viewvc?rev=926546&view=rev
Log:
FELIX-2225 Show file sizes as scaled KB, MB, and GB values
Modified:
felix/trunk/webconsole-plugins/memoryusage/src/main/java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java
felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html (contents, props changed)
Modified: felix/trunk/webconsole-plugins/memoryusage/src/main/java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/memoryusage/src/main/java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java?rev=926546&r1=926545&r2=926546&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/memoryusage/src/main/java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java (original)
+++ felix/trunk/webconsole-plugins/memoryusage/src/main/java/org/apache/felix/webconsole/plugins/memoryusage/internal/MemoryUsagePanel.java Tue Mar 23 12:49:38 2010
@@ -78,7 +78,7 @@ public class MemoryUsagePanel extends Ab
final PrintWriter pw = res.getWriter();
final StringBuilder statusBuf = new StringBuilder(1024);
- statusBuf.append('[');
+ statusBuf.append('{');
final StringBuilder filesBuf = new StringBuilder(1024);
filesBuf.append('[');
@@ -91,26 +91,22 @@ public class MemoryUsagePanel extends Ab
for (File file : files)
{
filesBuf.append('{');
- filesBuf.append("'name':'").append(file.getName()).append("',");
- filesBuf.append("'date':").append(file.lastModified()).append(",");
- filesBuf.append("'size':").append(file.length());
+ filesBuf.append("'name':'").append(file.getName());
+ filesBuf.append("',").append("'date':").append(file.lastModified());
+ totalSize += support.formatNumber(filesBuf, "size", file.length());
filesBuf.append("},");
-
- totalSize += file.length();
}
- statusBuf.append(files.length);
- statusBuf.append(',');
- statusBuf.append(totalSize);
-
+ statusBuf.append("'files':").append(files.length);
+ support.formatNumber(statusBuf, "total", totalSize);
}
else
{
- statusBuf.append("0,0");
+ statusBuf.append("'files:0,total:0'");
}
filesBuf.append(']');
- statusBuf.append(']');
+ statusBuf.append('}');
JsonPrintHelper jph = new JsonPrintHelper();
support.printOverallMemory(jph);
Modified: felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html?rev=926546&r1=926545&r2=926546&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html [iso-8859-1] (original)
+++ felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html [UTF-8] Tue Mar 23 12:49:38 2010
@@ -93,7 +93,7 @@ var __pools__ = ${__pools__};
$(document).ready(function() {
- $(".statline").html("${dump.statline}".msgFormat(__status__[0].toLocaleString(), __status__[1].toLocaleString()));
+ $(".statline").html("${dump.statline}".msgFormat(__status__.files, __status__.total));
renderOverall(__overall__);
renderPools(__pools__);
Propchange: felix/trunk/webconsole-plugins/memoryusage/src/main/resources/templates/memoryusage.html
------------------------------------------------------------------------------
svn:mime-type = text/html; charset=UTF-8