Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 22 insertions, 21 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
index a8d9e1b..a6bc653 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
@@ -21,65 +21,66 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.server.util;
 
 import java.util.Set;
 
 /**
  * Generate unique ID values for various objects in the response.
- * 
+ *
  * @author Patrick Peck
  * @version $Id$
  */
 public class IdGenerator {
   /** The base value to append the counter to. */
-  private String base;
+  private final String base;
   /** The <code>Set</code> of reserved ID values. */
-  private Set reserved;
+  private final Set reserved;
   /** The sequence number. */
   private int count;
-  
+
   /**
    * Create a new <code>IdGenerator</code>.
-   * 
-   * @param base A base value to append the IDs to. The creator of this object
-   * should provide a base value, so that appending the counter leads to unique
-   * IDs.
-   * @param reserved The <code>Set</code> of reserved IDs. A call to 
-   * <code>uniqueId()</code> will respect the reserved IDs.
+   *
+   * @param base     A base value to append the IDs to. The creator of this object
+   *                 should provide a base value, so that appending the counter
+   *                 leads to unique IDs.
+   * @param reserved The <code>Set</code> of reserved IDs. A call to
+   *                 <code>uniqueId()</code> will respect the reserved IDs.
    */
   public IdGenerator(String base, Set reserved) {
     this.base = base;
     this.reserved = reserved;
     count = 1;
   }
-  
+
   /**
    * Create the next ID value in the sequence.
-   * 
+   *
    * @return The next ID value in the sequence.
    */
   protected String nextId() {
     return base + "-" + count++;
   }
-  
+
   /**
    * Create the next unique ID value which is unique in the reserved ID set.
-   * 
+   *
    * The created ID is added to the set of reserved IDs.
-   * 
+   *
    * @return The next ID value.
    */
   public String uniqueId() {
     String nextId;
 
-    while (reserved.contains(nextId = nextId()));
-    
+    while (reserved.contains(nextId = nextId())) {
+      ;
+    }
+
     reserved.add(nextId);
-    
+
     return nextId;
-        
+
   }
-  
+
 }