Index: /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultCondition.java
===================================================================
--- /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultCondition.java	(revision 383)
+++ /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultCondition.java	(revision 384)
@@ -53,40 +53,5 @@
         List<ConstraintSyntaxTree> defaultVariableConditions = new ArrayList<ConstraintSyntaxTree>();
         
-        if (variable.getDatatype().equals(Datatype.BOOLEAN)) {
-            /*
-             * Add (NOT variable OR defaultVariable) AND (varaible or NOT defaultVariable) to the list of conditions
-             */
-            ConstraintSyntaxTree defaultVariable = null;
-            if (defaultValue.equals("y") || defaultValue.equals("'y'")) {
-                defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
-                
-            } else if (defaultValue.equals("n") || defaultValue.equals("'n'")) {
-                defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
-                defaultVariable = new OCLFeatureCall(defaultVariable, OclKeyWords.NOT);
-                
-            } else {
-                defaultVariable = getPureBooleanConstraintSyntaxTree(reader, defaultValue,
-                        variable.getName());
-                if (defaultVariable == null) {
-                    defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
-                }
-            }
-            
-            Variable variable = varPool.obtainVariable(reader.getVariable(this.variable.getName()));
-            OCLFeatureCall notVariable = new OCLFeatureCall(variable, OclKeyWords.NOT);
-            OCLFeatureCall notDefaultVariable = new OCLFeatureCall(defaultVariable, OclKeyWords.NOT);
-            
-            defaultVariableConditions.add(new OCLFeatureCall(variable, OclKeyWords.OR, notDefaultVariable));
-            defaultVariableConditions.add(new OCLFeatureCall(notVariable, OclKeyWords.OR, defaultVariable));
-            
-        } else {
-            /*
-             * If not boolean that add add string (or integer) comparison directly
-             */
-            defaultValue = defaultValue.replace("'", "");
-            ConstraintSyntaxTree defaultTree = varPool.obtainVariable(reader.getVariable(variable.getName() + "="
-                        + defaultValue));
-            defaultVariableConditions.add(defaultTree);
-        }
+        createDefaultConditions(reader, defaultVariableConditions);
         
         String promptConditionString = variable.getPromptCondition();
@@ -139,4 +104,51 @@
     }
 
+    /**
+     * Will create a list of conditions for the Default values and adds them to the given list.
+     * Part of the {@link #toPureBooleanConstraintSyntaxTree(RSFReader)}.
+     * @param reader reader The reader to get the variables from.
+     * @param defaultVariableConditions A (empty) list, where to add the created conditions.
+     * @throws ParserException If the conditions contains an operation, that is not supported by the parser.
+     */
+    private void createDefaultConditions(RSFReader reader, List<ConstraintSyntaxTree> defaultVariableConditions)
+        throws ParserException {
+        
+        if (variable.getDatatype().equals(Datatype.BOOLEAN)) {
+            /*
+             * Add (NOT variable OR defaultVariable) AND (varaible or NOT defaultVariable) to the list of conditions
+             */
+            ConstraintSyntaxTree defaultVariable = null;
+            if (defaultValue.equals("y") || defaultValue.equals("'y'")) {
+                defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
+                
+            } else if (defaultValue.equals("n") || defaultValue.equals("'n'")) {
+                defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
+                defaultVariable = new OCLFeatureCall(defaultVariable, OclKeyWords.NOT);
+                
+            } else {
+                defaultVariable = getPureBooleanConstraintSyntaxTree(reader, defaultValue, variable.getName());
+                if (defaultVariable == null) {
+                    defaultVariable = varPool.obtainVariable(reader.getVariable(variable.getName()));
+                }
+            }
+            
+            Variable variable = varPool.obtainVariable(reader.getVariable(this.variable.getName()));
+            OCLFeatureCall notVariable = new OCLFeatureCall(variable, OclKeyWords.NOT);
+            OCLFeatureCall notDefaultVariable = new OCLFeatureCall(defaultVariable, OclKeyWords.NOT);
+            
+            defaultVariableConditions.add(new OCLFeatureCall(variable, OclKeyWords.OR, notDefaultVariable));
+            defaultVariableConditions.add(new OCLFeatureCall(notVariable, OclKeyWords.OR, defaultVariable));
+            
+        } else {
+            /*
+             * If not boolean that add add string (or integer) comparison directly
+             */
+            defaultValue = defaultValue.replace("'", "");
+            ConstraintSyntaxTree defaultTree = varPool.obtainVariable(reader.getVariable(variable.getName() + "="
+                        + defaultValue));
+            defaultVariableConditions.add(defaultTree);
+        }
+    }
+
     @Override
     ConstraintSyntaxTree toNotBooleanConstraintSyntaxTree(AbstractReader reader, Enum tristate) throws ParserException {