[Jboss-svn-commits] JBL Code SVN: r4596 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common

[<jbo...@li...>]

Author: adamw
Date: 2006-06-03 19:24:49 -0400 (Sat, 03 Jun 2006)
New Revision: 4596

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-690


Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java	2006-06-03 22:59:51 UTC (rev 4595)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java	2006-06-03 23:24:49 UTC (rev 4596)
@@ -423,6 +423,12 @@
         return link;
     }
 
+    private static String removeParameter(String link, String param) {
+        link = link.replace("?" + param + "&", "?");
+        link = link.replace("?" + param, "");
+        return link.replace("&" + param, "");
+    }
+
     public static String prepareLinkForChecking(String portalName, String link) {
         if (link == null)
             return link;
@@ -435,10 +441,11 @@
         // Deleting the noproject parameter, as it is not present in the generated links.
         // There are three possibilites: it is the first parameter and there are no more
         // parameters, there are more parameters, or it is a not-first parameter.
-        link = link.replace("?" + Constants.NO_PROJECT_PARAM + "&", "?");
-        link = link.replace("?" + Constants.NO_PROJECT_PARAM, "");
-        link = link.replace("&" + Constants.NO_PROJECT_PARAM, "");
+        link = removeParameter(link, Constants.NO_PROJECT_PARAM);
+        link = removeParameter(link, Constants.PROJECT_LIST_PARAM+"="+Constants.FALSE_VALUE);
+        link = removeParameter(link, Constants.PROJECT_LIST_PARAM+"="+Constants.TRUE_VALUE);
 
+
         return link;
     }