Index: /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java
===================================================================
--- /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java	(revision 131)
+++ /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java	(revision 132)
@@ -20,9 +20,9 @@
  * to: <br />
  * <code>
- * (NOT <i>variable</i> OR NOT <i>condition</i>) OR (<i>variable</i> AND <i>selectedVaraible</i> AND <i>condition</i>)
+ * NOT <i>variable</i> OR NOT <i>condition</i> OR <i>selectedVaraible</i>
  * </code> <br />
  * or, if condition is "y", to: <br />
  * <code>
- * NOT <i>variable</i> OR (<i>variable</i> AND <i>selectedVaraible</i>)
+ * NOT <i>variable</i> OR <i>selectedVaraible</i>
  * </code> <br />
  * @author Adam Krafczyk
@@ -60,5 +60,4 @@
         OCLFeatureCall notVar = new OCLFeatureCall(var, OclKeyWords.NOT);
         
-        // TODO can selectedVariable be a condition?
         DecisionVariableDeclaration selectedVarDecl = reader.getVariable(selectedVariable);
         Variable selectedVar = varPool.obtainVariable(selectedVarDecl);
@@ -69,14 +68,9 @@
         
         if (condition != null) {
-            OCLFeatureCall notCondition = new OCLFeatureCall(condition, OclKeyWords.NOT);
-            
-            OCLFeatureCall leftOR = new OCLFeatureCall(notVar, OclKeyWords.OR, notCondition);
-            OCLFeatureCall rightAND1 = new OCLFeatureCall(var, OclKeyWords.AND, selectedVar);
-            OCLFeatureCall rightAND2 = new OCLFeatureCall(rightAND1, OclKeyWords.AND, condition);
-            
-            result = new OCLFeatureCall(leftOR, OclKeyWords.OR, rightAND2);
+            ConstraintSyntaxTree notCondition = new OCLFeatureCall(condition, OclKeyWords.NOT);
+            result = new OCLFeatureCall(notCondition, OclKeyWords.OR, selectedVar);
+            result = new OCLFeatureCall(notVar, OclKeyWords.OR, result);
         } else {
-            OCLFeatureCall and = new OCLFeatureCall(var, OclKeyWords.AND, selectedVar);
-            result = new OCLFeatureCall(notVar, OclKeyWords.OR, and);
+            result = new OCLFeatureCall(notVar, OclKeyWords.OR, selectedVar);
         }
         
Index: /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java
===================================================================
--- /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java	(revision 131)
+++ /Code/ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java	(revision 132)
@@ -39,5 +39,5 @@
     @Override
     ConstraintSyntaxTree toNotBooleanConstraintSyntaxTree(AbstractReader reader, Enum tristate) throws ParserException {
-        // Shouldn't be called since there are not separate _MODULe variables in not boolean models
+        // Shouldn't be called since there are not separate _MODULE variables in not boolean models
         return null;
     }