From 5fa2bf38be15865515740075ac4df579a6343f7e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 22 Nov 2011 19:41:00 +0100
Subject: [PATCH] use ; as url separator

---
 .../src/main/java/sonia/scm/url/WUIUrlBuilder.java     |  2 +-
 .../repository/sonia.repository.changesetviewergrid.js |  4 ++--
 .../sonia.repository.changesetviewerpanel.js           |  2 +-
 .../js/repository/sonia.repository.contentpanel.js     |  2 +-
 .../js/repository/sonia.repository.diffpanel.js        |  2 +-
 .../repository/sonia.repository.extendedinfopanel.js   |  2 +-
 .../js/repository/sonia.repository.infopanel.js        |  2 +-
 .../repository/sonia.repository.repositorybrowser.js   |  2 +-
 .../src/main/webapp/resources/js/sonia.global.js       |  4 ++--
 .../src/main/webapp/resources/js/sonia.history.js      | 10 +++++-----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/url/WUIUrlBuilder.java b/scm-core/src/main/java/sonia/scm/url/WUIUrlBuilder.java
index a34d2e6177..c9744effe3 100644
--- a/scm-core/src/main/java/sonia/scm/url/WUIUrlBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/url/WUIUrlBuilder.java
@@ -48,7 +48,7 @@ public class WUIUrlBuilder
   public static final String NULL = "null";
 
   /** Field description */
-  public static final String SEPARATOR = "|";
+  public static final String SEPARATOR = ";";
 
   //~--- constructors ---------------------------------------------------------
 
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewergrid.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewergrid.js
index 75604d0f93..a1ee25e495 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewergrid.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewergrid.js
@@ -140,7 +140,7 @@ Sonia.repository.ChangesetViewerGrid = Ext.extend(Ext.grid.GridPanel, {
   
   openDiffViewer: function(revision){
     main.addTab({
-      id: 'diffPanel|' + this.repository.id + '|' + revision,
+      id: 'diffPanel;' + this.repository.id + ';' + revision,
       xtype: 'diffPanel',
       repository: this.repository,
       revision: revision,
@@ -150,7 +150,7 @@ Sonia.repository.ChangesetViewerGrid = Ext.extend(Ext.grid.GridPanel, {
   
   openRepositoryBrowser: function(revision){
     main.addTab({
-      id: 'repositoryBrowser|' + this.repository.id + '|' + revision,
+      id: 'repositoryBrowser;' + this.repository.id + ';' + revision,
       xtype: 'repositoryBrowser',
       repository: this.repository,
       revision: revision,
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js
index 8469c89451..4a1995809b 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js
@@ -154,7 +154,7 @@ Sonia.History.register('repositoryChangesetViewerPanel', {
     if (limit){
       limit = parseInt(limit);
     }
-    var id = 'repositoryChangesetViewerPanel|' + repoId;
+    var id = 'repositoryChangesetViewerPanel;' + repoId;
     Sonia.repository.get(repoId, function(repository){
       var panel = Ext.getCmp(id);
       if (! panel){
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.contentpanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.contentpanel.js
index 50bbcd8473..de8706da37 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.contentpanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.contentpanel.js
@@ -210,7 +210,7 @@ Sonia.History.register('contentPanel', {
     if (!view || view == 'null'){
       view = 'content';
     }
-    var id = 'contentPanel|' + repoId + '|' + revision + '|' + path;
+    var id = 'contentPanel;' + repoId + ';' + revision + ';' + path;
     Sonia.repository.get(repoId, function(repository){
       var panel = Ext.getCmp(id);
       if (! panel){
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.diffpanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.diffpanel.js
index 3393e43fa3..c5abf52472 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.diffpanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.diffpanel.js
@@ -81,7 +81,7 @@ Sonia.History.register('diffPanel', {
   },
   
   onChange: function(repoId, revision){
-    var id = 'diffPanel|' + repoId + '|' + revision;
+    var id = 'diffPanel;' + repoId + ';' + revision;
     Sonia.repository.get(repoId, function(repository){
       var panel = Ext.getCmp(id);
       if (! panel){
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
index 0edbd171e2..c27034865b 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
@@ -95,7 +95,7 @@ Sonia.repository.ExtendedInfoPanel = Ext.extend(Sonia.repository.InfoPanel,{
   
   createRepositoryBrowser: function(){
     return {
-      id: 'repositoryBrowser|' + this.item.id + '|null',
+      id: 'repositoryBrowser;' + this.item.id + ';null',
       xtype: 'repositoryBrowser',
       repository: this.item,
       closable: true
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
index f0d0024da8..20c40c62a7 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
@@ -148,7 +148,7 @@ Sonia.repository.InfoPanel = Ext.extend(Ext.Panel, {
 
   createChangesetViewer: function(){
     return {
-      id: 'repositoryChangesetViewerPanel|' + this.item.id,
+      id: 'repositoryChangesetViewerPanel;' + this.item.id,
       repository: this.item,
       xtype: 'repositoryChangesetViewerPanel',
       closable: true,
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
index 91a099d1b4..4b181c8d9c 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
@@ -329,7 +329,7 @@ Sonia.History.register('repositoryBrowser', {
     if (path == 'null'){
       path = '';
     }
-    var id = 'repositoryBrowser|' + repoId + "|" + revision;
+    var id = 'repositoryBrowser;' + repoId + ';' + revision;
     Sonia.repository.get(repoId, function(repository){
       var panel = Ext.getCmp(id);
       if (! panel){
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.global.js b/scm-webapp/src/main/webapp/resources/js/sonia.global.js
index e0a331ca4f..6d23c35b92 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.global.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.global.js
@@ -85,7 +85,7 @@ var groupSearchStore = new Ext.data.JsonStore({
 
 Sonia = {
   
-  idSeparator: '|',
+  idSeparator: ';',
   idNoneObject: '-',
   
   id: function(){
@@ -93,7 +93,7 @@ Sonia = {
     for ( var i=0; i<arguments.length; i++ ){
       id += arguments[i];
       if ( (i+1) < arguments.length ){
-        id += '|';
+        id += this.idSeparator;
       }
     }
     if (id.length() == 0){
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.history.js b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
index d37c534619..c3bd2e52d6 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.history.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
@@ -55,7 +55,7 @@ Sonia.History = {
     for (var i=0; i<arguments.length; i++){
       token += arguments[i];
       if ( (i+1)<arguments.length ){
-        token += '|';
+        token += ';';
       }
     }    
     return token;
@@ -73,17 +73,17 @@ Sonia.History = {
         for (var i=0; i<item.length; i++){
           tokenSuffix += item[i];
           if ( (i+1)<item.length ){
-            tokenSuffix += '|';
+            tokenSuffix += ';';
           }
         }
       } else {
         tokenSuffix = item;
       }
       
-      var parts = token.split('|');
+      var parts = token.split(';');
       var newToken = '';
       for (var j=0; j<depth; j++){
-        newToken += parts[j] + '|';
+        newToken += parts[j] + ';';
       }
       newToken += tokenSuffix;
       this.add(newToken);
@@ -134,7 +134,7 @@ Sonia.History = {
   onChange: function(token){
     if(token){
       if (this.isInvokeable(this.recentlyAdded, token)){  
-        var parts = token.split('|');
+        var parts = token.split(';');
         var id = parts[0];
         this.recentlyChanged.push(token);
         Sonia.History.handleChange(id, parts.splice(1));