Index: trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/result/UsabilityProblemDescriptionResolver.java
===================================================================
--- trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/result/DefectDescriptionResolver.java	(revision 1138)
+++ trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/result/UsabilityProblemDescriptionResolver.java	(revision 1217)
@@ -33,22 +33,28 @@
 /**
  * <p>
- * TODO comment
+ * Helper class, which creates a {@link UsabilityProblemDescription} for a usability rule.
  * </p>
  * 
  * @author Alexander Deicke
  */
-public class DefectDescriptionResolver {
-
+public class UsabilityProblemDescriptionResolver {
+
+    /**
+     * <p>
+     * .properties file, which contains all details concerning a usability defect.
+     * </p>
+     */
     private final String defectDescriptionFile = "defects.props";
 
     /**
      * <p>
-     * TODO: comment
+     * Creates a defect description for a {@link UsabilityRule}.
      * </p>
      * 
      * @param name
-     * @return
-     */
-    public UsabilityDefect descriptionFor(String usabilityRuleName) {
+     *            of usability rule
+     * @return defect description for usability rule
+     */
+    public UsabilityProblemDescription descriptionFor(String usabilityRuleName) {
         Props allProperties = initProperties();
         Map<String, String> usabilityRuleProperties =
@@ -59,8 +65,8 @@
     /**
      * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @return
+     * Initializes the properties, which are used to create the defect description.
+     * </p>
+     * 
+     * @return properties needed to create defect description
      */
     private Props initProperties() {
@@ -77,8 +83,8 @@
     /**
      * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @return
+     * Loads the .properties file from the system.
+     * </p>
+     * 
+     * @return iff present, {@link File} object of the .properties file
      */
     private Optional<File> getDefectDescriptionFile() {
@@ -94,4 +100,15 @@
     }
 
+    /**
+     * 
+     * <p>
+     * Loads the values from the .properties.
+     * </p>
+     * 
+     * @param defectDescriptionFile
+     *            .properties file
+     * @param props
+     *            object, which stores the loaded values
+     */
     private void loadProperties(Optional<File> defectDescriptionFile, Props props) {
         try {
@@ -105,11 +122,15 @@
     /**
      * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @return
+     * Returns all existing properties for a given usability rule.
+     * </p>
+     * 
+     * @param allProperties
+     *            all properties available
+     * @param usabilityRuleName
+     *            name of usability rule
+     * @return all properties of certain usability rule
      */
     private Map<String, String> allUsabilityRuleProperties(Props allProperties,
-                                                                   String usabilityRuleName)
+                                                           String usabilityRuleName)
     {
         Map<String, String> usabilityRuleProperties = Maps.newHashMap();
@@ -120,24 +141,27 @@
     /**
      * <p>
-     * TODO: comment
+     * Creates the usability defect.
      * </p>
      * 
      * @param usabilityRuleProperties
-     * @return
-     */
-    private UsabilityDefect createUsabilityDefect(Map<String, String> usabilityRuleProperties) {
+     *            all properties needed for creation.
+     * @return defect description for a usability rule
+     */
+    private UsabilityProblemDescription createUsabilityDefect(Map<String, String> usabilityRuleProperties)
+    {
         String description =
-            Iterables.getOnlyElement(Maps.filterKeys(usabilityRuleProperties, descriptionProperty()).values());
-        EnumMap<UsabilityDefectSeverityLevel, Double> severity =
+            Iterables.getOnlyElement(Maps
+                .filterKeys(usabilityRuleProperties, descriptionProperty()).values());
+        EnumMap<UsabilityProblemSeverityLevel, Double> severity =
             getSeverityMap(usabilityRuleProperties);
-        return new UsabilityDefect(description, severity);
-    }
-
-    /**
-     * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @return
+        return new UsabilityProblemDescription(description, severity);
+    }
+
+    /**
+     * <p>
+     * Gets the description property.
+     * </p>
+     * 
+     * @return description property
      */
     private Predicate<String> descriptionProperty() {
@@ -150,21 +174,23 @@
         };
     }
-    
-    /**
-     * <p>
-     * TODO: comment
+
+    /**
+     * <p>
+     * Creates severity level map for defect description, by matching all entried from .properties
+     * file to corresponding {@link UsabilityProblemSeverityLevel}.
      * </p>
      * 
      * @param usabilityRuleProperties
-     * @return
-     */
-    private EnumMap<UsabilityDefectSeverityLevel, Double> getSeverityMap(Map<String, String> usabilityRuleProperties)
+     *            all properties of certain usability rule
+     * @return assignment of {@link UsabilityProblemSeverityLevel} and corresponding threshold
+     */
+    private EnumMap<UsabilityProblemSeverityLevel, Double> getSeverityMap(Map<String, String> usabilityRuleProperties)
     {
-        EnumMap<UsabilityDefectSeverityLevel, Double> severityMap =
-            Maps.newEnumMap(UsabilityDefectSeverityLevel.class);
+        EnumMap<UsabilityProblemSeverityLevel, Double> severityMap =
+            Maps.newEnumMap(UsabilityProblemSeverityLevel.class);
         Map<String, String> allSeverityProperties =
             Maps.filterEntries(usabilityRuleProperties, allSeverityProperties());
         for (Entry<String, String> severityProperty : allSeverityProperties.entrySet()) {
-            UsabilityDefectSeverityLevel severityLevel =
+            UsabilityProblemSeverityLevel severityLevel =
                 getSeverityLevel(severityProperty.getKey());
             Double rule = Double.valueOf(severityProperty.getValue());
@@ -176,23 +202,24 @@
     /**
      * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @param key
-     * @return
-     */
-    private UsabilityDefectSeverityLevel getSeverityLevel(String severityProperty) {
+     * Matches severity level from .properties file against {@link UsabilityProblemSeverityLevel}.
+     * </p>
+     * 
+     * @param severityProperty
+     *            severity level from .properties file
+     * @return matching {@link UsabilityProblemSeverityLevel}
+     */
+    private UsabilityProblemSeverityLevel getSeverityLevel(String severityProperty) {
         int startSeverityLevel = severityProperty.lastIndexOf(".") + 1;
-        String severitLevelIdentifier =
+        String severityLevelIdentifier =
             severityProperty.substring(startSeverityLevel).toUpperCase();
-        return UsabilityDefectSeverityLevel.valueOf(severitLevelIdentifier);
-    }
-
-    /**
-     * <p>
-     * TODO: comment
-     * </p>
-     * 
-     * @return
+        return UsabilityProblemSeverityLevel.valueOf(severityLevelIdentifier);
+    }
+
+    /**
+     * <p>
+     * Gets the severity level properties.
+     * </p>
+     * 
+     * @return severity level
      */
     private Predicate<Entry<String, String>> allSeverityProperties() {
