Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 12150)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 12151)
@@ -76,4 +76,9 @@
  */
 public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends ConflictResolveCommand> extends ChangeNotifier {
+    /**
+     * The property name to listen for frozen changes.
+     * @see #setFrozen(boolean)
+     * @see #isFrozen()
+     */
     public static final String FROZEN_PROP = AbstractListMergeModel.class.getName() + ".frozen";
 
@@ -230,7 +235,11 @@
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
             listeners.forEach(listener -> listener.propertyChange(evt));
-            }
-        }
-
+        }
+    }
+
+    /**
+     * Sets the frozen status for this model.
+     * @param isFrozen <code>true</code> if it should be frozen.
+     */
     public final void setFrozen(boolean isFrozen) {
         boolean oldValue = this.isFrozen;
@@ -239,4 +248,8 @@
     }
 
+    /**
+     * Check if the model is frozen.
+     * @return The current frozen state.
+     */
     public final boolean isFrozen() {
         return isFrozen;
@@ -398,4 +411,8 @@
     }
 
+    /**
+     * Copies over all values from the given side to the merged table..
+     * @param source The source side to copy from.
+     */
     public void copyAll(ListRole source) {
         getMergedEntries().clear();
@@ -567,5 +584,4 @@
      */
     protected boolean myAndTheirEntriesEqual() {
-
         if (getMyEntriesSize() != getTheirEntriesSize())
             return false;
@@ -704,4 +720,8 @@
         }
 
+        /**
+         * Get the role of the table.
+         * @return The role.
+         */
         public ListRole getRole() {
             return role;