diff options
author | Eike Stepper | 2011-01-22 08:05:27 +0000 |
---|---|---|
committer | Eike Stepper | 2011-01-22 08:05:27 +0000 |
commit | 072750b8534acc7fc6700488bc6f409a969fb90a (patch) | |
tree | 84a40cd508f4c5caa1619f303b2c667c7b17634f | |
parent | 68f4337d7f3ee21495a77fe8f5768840314c61a1 (diff) | |
download | cdo-072750b8534acc7fc6700488bc6f409a969fb90a.tar.gz cdo-072750b8534acc7fc6700488bc6f409a969fb90a.tar.xz cdo-072750b8534acc7fc6700488bc6f409a969fb90a.zip |
added html escaping
-rw-r--r-- | plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java index 39eb8a7203..39a72fae9d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java @@ -1111,7 +1111,7 @@ public class CDOServerBrowser extends Worker String timeStamp = String.valueOf(commitInfo.getTimeStamp()); boolean selected = timeStamp.equals(param); - String formatted = CDOCommonUtil.formatTimeStamp(commitInfo.getTimeStamp()); + String formatted = CDOCommonUtil.formatTimeStamp(commitInfo.getTimeStamp()).replaceAll(" ", " "); String label = formatted; if (!selected && auditing) { @@ -1130,41 +1130,48 @@ public class CDOServerBrowser extends Worker String userID = commitInfo.getUserID(); out.print("<td valign=\"top\">\r\n"); - out.print(StringUtil.isEmpty(userID) ? " " : userID); + out.print(StringUtil.isEmpty(userID) ? " " : browser.escape(userID)); out.print("</td>\r\n"); String comment = commitInfo.getComment(); out.print("<td valign=\"top\">\r\n"); - out.print(StringUtil.isEmpty(comment) ? " " : comment); + out.print(StringUtil.isEmpty(comment) ? " " : browser.escape(comment)); out.print("</td>\r\n"); - out.print("</tr>\r\n"); + out.print("</tr>\r\n"); return selected; } protected void showCommitData(PrintStream out, CDOCommitInfo commitInfo, CDOServerBrowser browser) { out.print("<h4>New Objects:</h4>\r\n"); + out.print("<ul>\r\n"); for (CDOIDAndVersion key : commitInfo.getNewObjects()) { CDORevision newObject = (CDORevision)key; - out.print(browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision", - CDORevisionUtil.formatRevisionKey(newObject)) - + "<br>\r\n"); + out.print("<li>" + + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision", + CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n"); } + out.print("</ul>\r\n"); out.print("<h4>Changed Objects:</h4>\r\n"); + out.print("<ul>\r\n"); for (CDORevisionKey key : commitInfo.getChangedObjects()) { CDORevisionDelta changedObject = (CDORevisionDelta)key; - out.print(changedObject.toString() + "<br>\r\n"); + out.print("<li>" + changedObject.toString() + "<br>\r\n"); } + out.print("</ul>\r\n"); out.print("<h4>Detached Objects:</h4>\r\n"); + out.print("<ul>\r\n"); for (CDOIDAndVersion key : commitInfo.getDetachedObjects()) { - out.print(key.toString() + "<br>\r\n"); + out.print("<li>" + key.toString() + "<br>\r\n"); } + + out.print("</ul>\r\n"); } } } |