Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 12660)
@@ -44,4 +44,7 @@
 import org.openstreetmap.josm.tools.WindowGeometry;
 
+/**
+ * This conflict resolution dialog is used when tags are pasted from the clipboard that conflict with the existing ones.
+ */
 public class PasteTagsConflictResolverDialog extends JDialog implements PropertyChangeListener {
     static final Map<OsmPrimitiveType, String> PANE_TITLES;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 12660)
@@ -13,4 +13,7 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * This class stores the decision the user made regarding a relation member conflict
+ */
 public class RelationMemberConflictDecision {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 12660)
@@ -14,4 +14,7 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
+/**
+ * This class renders {@link RelationMemberConflictDecisionType} entries of a list/table
+ */
 public class RelationMemberConflictDecisionRenderer extends JLabel
 implements TableCellRenderer, ListCellRenderer<RelationMemberConflictDecisionType> {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 12660)
@@ -6,4 +6,7 @@
 import javax.swing.JLabel;
 
+/**
+ * This represents the decision a user can make regarding a relation conflict
+ */
 public enum RelationMemberConflictDecisionType {
     /**
@@ -23,4 +26,9 @@
     UNDECIDED;
 
+    /**
+     * Sets the label according to the current decision.
+     * @param decision The decision
+     * @param label The label to set
+     */
     public static void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) {
         switch(decision) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 12660)
@@ -39,4 +39,8 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * This component presents the user with the ability to resolve a relation member conflict
+ * @see RelationMemberConflictResolverModel
+ */
 public class RelationMemberConflictResolver extends JPanel {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java	(revision 12660)
@@ -14,6 +14,10 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
+import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberTable;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 
+/**
+ * This class defines the columns of a {@link RelationMemberTable}
+ */
 public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 12660)
@@ -13,4 +13,9 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
+/**
+ * The main table displayed in the {@link RelationMemberConflictResolver}
+ *
+ * @see RelationMemberConflictResolverColumnModel
+ */
 public class RelationMemberConflictResolverTable extends JTable implements MultiValueCellEditor.NavigationListener {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 12660)
@@ -17,4 +17,7 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * This model holds the information about tags that are currently conflicting and the decision of the user regarding them.
+ */
 public class TagConflictResolverModel extends DefaultTableModel {
     public static final String NUM_CONFLICTS_PROP = TagConflictResolverModel.class.getName() + ".numConflicts";
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 12659)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 12660)
@@ -11,4 +11,7 @@
 import org.openstreetmap.josm.gui.widgets.JosmTable;
 
+/**
+ * This table presents the tags that are conflicting to the user.
+ */
 public class TagConflictResolverTable extends JosmTable implements MultiValueCellEditor.NavigationListener {