Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java	(revision 1941)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java	(revision 1942)
@@ -7,5 +7,4 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.logging.Logger;
@@ -48,6 +47,20 @@
  */
 public class ConflictResolver extends JPanel implements PropertyChangeListener  {
+
+    /* -------------------------------------------------------------------------------------- */
+    /* Property names                                                                         */
+    /* -------------------------------------------------------------------------------------- */
+    /** name of the property indicating whether all conflicts are resolved,
+     *  {@see #isResolvedCompletely()}
+     */
     static public final String RESOLVED_COMPLETELY_PROP = ConflictResolver.class.getName() + ".resolvedCompletely";
+    /**
+     * name of the property for the {@see OsmPrimitive} in the role "my"
+     */
     static public final String MY_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".myPrimitive";
+
+    /**
+     * name of the property for the {@see OsmPrimitive} in the role "my"
+     */
     static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
 
@@ -66,10 +79,10 @@
     private ImageIcon mergeIncomplete;
 
-    /** the property change listeners */
-    private PropertyChangeSupport listeners;
-
     /** indicates whether the current conflict is resolved completely */
     private boolean resolvedCompletely;
 
+    /**
+     * loads the required icons
+     */
     protected void loadIcons() {
         mergeComplete = ImageProvider.get("dialogs/conflict","mergecomplete.png" );
@@ -77,4 +90,7 @@
     }
 
+    /**
+     * builds the UI
+     */
     protected void build() {
         tabbedPane = new JTabbedPane();
@@ -104,7 +120,8 @@
     }
 
-
+    /**
+     * constructor
+     */
     public ConflictResolver() {
-        listeners = new PropertyChangeSupport(this);
         resolvedCompletely = false;
         build();
@@ -112,57 +129,33 @@
     }
 
-
+    /**
+     * Sets the {@see OsmPrimitive} in the role "my"
+     * 
+     * @param my the primitive in the role "my"
+     */
     protected void setMy(OsmPrimitive my) {
         OsmPrimitive old = this.my;
         this.my = my;
         if (old != this.my) {
-            fireMyPrimitive(old, this.my);
-        }
-    }
-
+            firePropertyChange(MY_PRIMITIVE_PROP, old, this.my);
+        }
+    }
+
+    /**
+     * Sets the {@see OsmPrimitive} in the role "their".
+     * 
+     * @param their the primitive in the role "their"
+     */
     protected void setTheir(OsmPrimitive their) {
         OsmPrimitive old = this.their;
         this.their = their;
         if (old != this.their) {
-            fireTheirPrimitive(old, this.their);
-        }
-    }
-
-    protected void fireResolvedCompletely(boolean oldValue,boolean newValue) {
-        if (listeners == null) return;
-        listeners.firePropertyChange(RESOLVED_COMPLETELY_PROP, oldValue, newValue);
-    }
-
-    protected void fireMyPrimitive(OsmPrimitive oldValue,OsmPrimitive newValue) {
-        if (listeners == null) return;
-        listeners.firePropertyChange(MY_PRIMITIVE_PROP, oldValue, newValue);
-    }
-
-    protected void fireTheirPrimitive(OsmPrimitive oldValue,OsmPrimitive newValue) {
-        if (listeners == null) return;
-        listeners.firePropertyChange(THEIR_PRIMITIVE_PROP, oldValue, newValue);
-    }
-
-    /**
-     * Adds a property change listener
-     * 
-     *  @param listener the listener
-     */
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener listener) {
-        listeners.addPropertyChangeListener(listener);
-    }
-
-    /**
-     * Removes a property change listener
-     * 
-     *  @param listener the listener
-     */
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener listener) {
-        listeners.removePropertyChangeListener(listener);
-    }
-
+            firePropertyChange(THEIR_PRIMITIVE_PROP, old, this.their);
+        }
+    }
+
+    /**
+     * handles property change events
+     */
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) {
@@ -213,5 +206,4 @@
         }
     }
-
 
     /**
@@ -288,4 +280,8 @@
     }
 
+    /**
+     * Updates the state of the property {@see #RESOLVED_COMPLETELY_PROP}
+     * 
+     */
     protected void updateResolvedCompletely() {
         boolean oldValueResolvedCompletely = resolvedCompletely;
@@ -317,5 +313,5 @@
         }
         if (this.resolvedCompletely != oldValueResolvedCompletely) {
-            fireResolvedCompletely(oldValueResolvedCompletely, this.resolvedCompletely);
+            firePropertyChange(RESOLVED_COMPLETELY_PROP, oldValueResolvedCompletely, this.resolvedCompletely);
         }
     }