Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 12661)
@@ -75,4 +75,5 @@
  * @param <C> the type of conflict resolution command
  * @see AbstractListMerger
+ * @see PairTable For the table displaying this model
  */
 public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends ConflictResolveCommand> extends ChangeNotifier {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java	(revision 12661)
@@ -10,4 +10,7 @@
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 
+/**
+ * This {@link ListCellRenderer} renders the value of a {@link ComparePairType}
+ */
 public class ComparePairListCellRenderer extends JLabel implements ListCellRenderer<ComparePairType> {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java	(revision 12661)
@@ -4,5 +4,9 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 
+/**
+ * The conflict resolver receives the result of a {@link ConflictDialog}. It should then apply the resulution the user selected.
+ */
 public interface IConflictResolver {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java	(revision 12661)
@@ -2,4 +2,11 @@
 package org.openstreetmap.josm.gui.conflict.pair;
 
+import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType;
+
+/**
+ * This is the merge decision for a primitive.
+ *
+ * @see RelationMemberConflictDecisionType the same for relation members
+ */
 public enum MergeDecisionType {
     KEEP_MINE,
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java	(revision 12661)
@@ -13,4 +13,7 @@
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
+/**
+ * This is the base class for all tables that display an {@link AbstractListMergeModel}.
+ */
 public abstract class PairTable extends OsmPrimitivesTable {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java	(revision 12661)
@@ -4,7 +4,12 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.table.TableCellRenderer;
+
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 
+/**
+ * This {@link TableCellRenderer} displays the decision a user made regarding a tag conflict
+ */
 public class MergedTableCellRenderer extends TagMergeTableCellRenderer {
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 12661)
@@ -4,7 +4,12 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.table.TableCellRenderer;
+
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 
+/**
+ * This {@link TableCellRenderer} renders the mine side of the tag conflict table.
+ */
 public class MineTableCellRenderer extends TagMergeTableCellRenderer {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 12661)
@@ -11,4 +11,7 @@
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 
+/**
+ * This is the base class for all cells in the {@link TagMerger}.
+ */
 public abstract class TagMergeTableCellRenderer extends JLabel implements TableCellRenderer {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 12660)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 12661)
@@ -4,7 +4,12 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.table.TableCellRenderer;
+
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 
+/**
+ * This {@link TableCellRenderer} renders the theirs side of the tag conflict table.
+ */
 public class TheirTableCellRenderer extends TagMergeTableCellRenderer {