[jbosstools-commits] JBoss Tools SVN: r29067 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences.
Author: adietish
Date: 2011-02-08 12:27:38 -0500 (Tue, 08 Feb 2011)
New Revision: 29067
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java
Log:
[JBIDE-8357]
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java 2011-02-08
16:55:21 UTC (rev 29066)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringsPreferenceValue.java 2011-02-08
17:27:38 UTC (rev 29067)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.preferences;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -22,10 +24,16 @@
public class StringsPreferenceValue extends AbstractPreferenceValue<String[]> {
private String delimiter;
+ private String escapedDelimiter;
public StringsPreferenceValue(char delimiter, String prefsKey, String pluginId) {
super(prefsKey, pluginId);
this.delimiter = String.valueOf(delimiter);
+ try {
+ this.escapedDelimiter = URLEncoder.encode(String.valueOf(delimiter),
"UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // cannot happen since we use a fixed, known encoding
+ }
}
public String[] get() {
@@ -43,7 +51,9 @@
ArrayList<String> values = new ArrayList<String>();
StringTokenizer tokenizer = new StringTokenizer(string, delimiter);
while (tokenizer.hasMoreTokens()) {
- values.add(tokenizer.nextToken());
+ String value = tokenizer.nextToken();
+ String unescapedValue = unescapeDelimiterCharacter(value);
+ values.add(unescapedValue);
}
return values.toArray(new String[values.size()]);
}
@@ -73,6 +83,7 @@
public void add(String value) {
String currentValues = doGet();
StringBuilder builder = new StringBuilder(currentValues);
+ value = escapeDelimiterCharacter(value);
if (!contains(value, currentValues)) {
if (hasValues(currentValues)) {
builder.append(delimiter);
@@ -82,6 +93,36 @@
}
}
+ private String escapeDelimiterCharacter(String value) {
+ if (value == null || value.length() == 0) {
+ return value;
+ }
+
+ int index = value.indexOf(delimiter);
+ if (index < 0) {
+ return value;
+ }
+ StringBuilder builder = new StringBuilder(value.substring(0, index));
+ builder.append(escapedDelimiter);
+ builder.append(value.substring(index + 1));
+ return builder.toString();
+ }
+
+ private String unescapeDelimiterCharacter(String value) {
+ if (value == null || value.length() == 0) {
+ return value;
+ }
+
+ int index = value.indexOf(escapedDelimiter);
+ if (index < 0) {
+ return value;
+ }
+ StringBuilder builder = new StringBuilder(value.substring(0, index));
+ builder.append(delimiter);
+ builder.append(value.substring(index + 1));
+ return builder.toString();
+ }
+
private boolean contains(String value, String currentValues) {
return currentValues != null
&& currentValues.length() > 0