You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/11/09 07:31:26 UTC
svn commit: r1768854 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid:
common/HexDumpWidget.js management/showMessage.js
Author: kwall
Date: Wed Nov 9 07:31:26 2016
New Revision: 1768854
URL: http://svn.apache.org/viewvc?rev=1768854&view=rev
Log:
QPID-7409: [Java Broker] Address some of the problems reported by Alex Rudyy <or...@apache.org>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js?rev=1768854&r1=1768853&r2=1768854&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js Wed Nov 9 07:31:26 2016
@@ -30,12 +30,12 @@ define(["dojo/_base/declare",
* constructor fields
*/
data: null,
- width: 8,
+ numberOfColumns: 8,
postCreate: function ()
{
this.inherited(arguments);
- var rows = Math.floor(this.data.length / this.width) + (this.data.length % this.width == 0 ? 0 : 1);
+ var rows = Math.floor(this.data.length / this.numberOfColumns) + (this.data.length % this.numberOfColumns == 0 ? 0 : 1);
var hexDumpBox = domConstruct.create("div", {class: "hexDumpBox"}, this.domNode);
var hexBox = domConstruct.create("span", {class: "hexBox"}, hexDumpBox);
@@ -51,7 +51,7 @@ define(["dojo/_base/declare",
var asciiHeadRowDom = domConstruct.create("div", {class: "hexDumpHeadRow"}, asciiBox);
domConstruct.create("span", {class: "hexCountCell"}, hexHeadRowDom);
- for (var column = 0; column < this.width; column++)
+ for (var column = 0; column < this.numberOfColumns; column++)
{
var hexHeadCellDom = domConstruct.create("span", {class: "hexDumpCell"}, hexHeadRowDom);
hexHeadCellDom.innerHTML = this._toHex(column, 2);
@@ -69,11 +69,11 @@ define(["dojo/_base/declare",
var asciiRowDom = domConstruct.create("div", {class: "hexDumpRow"}, asciiBox);
var hexCountCellDom = domConstruct.create("span", {class: "hexCountCell"}, hexRowDom);
- hexCountCellDom.innerHTML = this._toHex(row * this.width, 4);
+ hexCountCellDom.innerHTML = this._toHex(row * this.numberOfColumns, 4);
- for (var column = 0; column < this.width; column++)
+ for (var column = 0; column < this.numberOfColumns; column++)
{
- var dataIndex = (row * this.width) + column;
+ var dataIndex = (row * this.numberOfColumns) + column;
if (dataIndex >= this.data.length)
{
break;
@@ -110,7 +110,7 @@ define(["dojo/_base/declare",
_toAsciiPrintable: function (c)
{
- if (c < 32 || c > 127)
+ if (c <= 32 || c >= 127)
{
return ".";
}
@@ -122,7 +122,7 @@ define(["dojo/_base/declare",
_toHex: function (d, pad)
{
- var hex = Number(d).toString(16);
+ var hex = Number(d & 0xFF).toString(16);
while (hex.length < pad)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js?rev=1768854&r1=1768853&r2=1768854&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js Wed Nov 9 07:31:26 2016
@@ -116,7 +116,7 @@ define(["dojo/dom",
for (var i = 0; i < contentData.length; i++)
{
var element = contentData[i];
- if (!Number.isInteger(element) || element < 0 || element > 255)
+ if (!Number.isInteger(element) || element < -128 || element > 127)
{
isByteArray = false;
break;
@@ -287,7 +287,7 @@ define(["dojo/dom",
showMessage.previewWidget.destroyRecursive();
}
var widgetDiv = construct.create("div", null, previewContent, "last");
- var contentData = jqson.parse(content);
+ var contentData = json.parse(content);
var contentWidget = showMessage.createPreviewWidget(contentData, widgetDiv);
showMessage.previewWidget = contentWidget;
contentWidget.startup();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org