Context Navigation

Changeset 12660 in josm for trunk

Timestamp:

2017-08-26T00:58:40+02:00 (7 years ago)

Author:

michael2402

Message:

See #14794: Add javadoc for gui/conflict/tags package.

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

-              r11772
+              r12660
 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;

-              r11553
+              r12660
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+/**
+ * This class stores the decision the user made regarding a relation member conflict
+ */
 public class RelationMemberConflictDecision {

-              r9078
+              r12660
 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> {

-              r6883
+              r12660
 import javax.swing.JLabel;
+/**
+ * This represents the decision a user can make regarding a relation conflict
+ */
 public enum RelationMemberConflictDecisionType {
     /**
 …
     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) {

-              r12636
+              r12660
 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 {

-              r11350
+              r12660
 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 {

-              r8510
+              r12660
 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 {

-              r11627
+              r12660
 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";

-              r9847
+              r12660
 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 {

Note: See TracChangeset for help on using the changeset viewer.