merged 1.1 branch into head

[mir.git] / source / mir / util / URLBuilder.java

diff --git a/source/mir/util/URLBuilder.java b/source/mir/util/URLBuilder.java
index ecb1ef3..e6db493 100755 (executable)
--- a/source/mir/util/URLBuilder.java
+++ b/source/mir/util/URLBuilder.java
@@ -47,10 +47,12 @@ public class URLBuilder {
   }
 
   public void setValue(String aKey, String aValue) {
-    if (aValue!=null)
+    if (aValue!=null) {
       keyValues.put(aKey, aValue);
-    else
+    }
+    else {
       deleteKey(aKey);
+    }
   }
 
   public void setValue(String aKey, int aValue) {
@@ -63,9 +65,7 @@ public class URLBuilder {
 
   public String getQuery() {
     StringBuffer query = new StringBuffer();
-    Iterator i;
-
-    i = keyValues.entrySet().iterator();
+    Iterator i = keyValues.entrySet().iterator();
 
     while(i.hasNext()) {
       Map.Entry entry = (Map.Entry) i.next();
@@ -74,8 +74,9 @@ public class URLBuilder {
       query.append("=");
       query.append(HTMLRoutines.encodeURL((String) entry.getValue()));
 
-      if (i.hasNext())
+      if (i.hasNext()) {
         query.append("&");
+      }
     }
 
     return query.toString();