Index: /trunk/.classpath =================================================================== --- /trunk/.classpath (revision 1649) +++ /trunk/.classpath (revision 1650) @@ -2,5 +2,7 @@ - + + + @@ -9,4 +11,11 @@ + + + + + + + Index: /trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /trunk/.settings/org.eclipse.jdt.core.prefs (revision 1649) +++ /trunk/.settings/org.eclipse.jdt.core.prefs (revision 1650) @@ -1,3 +1,3 @@ -#Sun Sep 07 19:15:59 CEST 2008 +#Sat Jun 06 11:00:10 CEST 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning @@ -101,10 +101,10 @@ org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true org.eclipse.jdt.core.formatter.comment.format_comments=true org.eclipse.jdt.core.formatter.comment.format_header=false org.eclipse.jdt.core.formatter.comment.format_html=false -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true org.eclipse.jdt.core.formatter.comment.format_source_code=false org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true Index: /trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /trunk/.settings/org.eclipse.jdt.ui.prefs (revision 1649) +++ /trunk/.settings/org.eclipse.jdt.ui.prefs (revision 1650) @@ -1,5 +1,6 @@ -#Wed Apr 16 17:01:39 CEST 2008 +#Sat Jun 06 11:00:10 CEST 2009 eclipse.preferences.version=1 formatter_profile=_josm -formatter_settings_version=10 -org.eclipse.jdt.ui.text.custom_code_templates= +formatter_settings_version=11 +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.text.custom_code_templates= Index: /trunk/build.xml =================================================================== --- /trunk/build.xml (revision 1649) +++ /trunk/build.xml (revision 1650) @@ -96,4 +96,9 @@ + + + + + Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java (revision 1650) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java (revision 1650) @@ -0,0 +1,30 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict; + +import java.awt.Color; +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +public class ComparePairListCellRenderer extends JLabel implements ListCellRenderer { + public final static Color BGCOLOR_SELECTED = new Color(143,170,255); + + public ComparePairListCellRenderer() { + setOpaque(true); + } + public Component getListCellRendererComponent( + JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) + { + ComparePairType type = (ComparePairType)value; + setText(type.getDisplayName()); + setBackground(isSelected ? BGCOLOR_SELECTED : Color.WHITE); + setForeground(Color.BLACK); + return this; + } +} Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java (revision 1650) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java (revision 1650) @@ -0,0 +1,88 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.conflict; +import static org.openstreetmap.josm.gui.conflict.ListRole.MERGED_ENTRIES; +import static org.openstreetmap.josm.gui.conflict.ListRole.MY_ENTRIES; +import static org.openstreetmap.josm.gui.conflict.ListRole.THEIR_ENTRIES; +import static org.openstreetmap.josm.tools.I18n.tr; + +/** + * Enumeration of the possible comparison pairs + * + */ +public enum ComparePairType { + + /** + * compare my version of an {@see OsmPrimitive} with their version + */ + MY_WITH_THEIR (tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}), + + /** + * compare my version of an {@see OsmPrimitive} with the merged version + */ + MY_WITH_MERGED (tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}), + + /** + * compare their version of an {@see OsmPrimitive} with the merged veresion + */ + THEIR_WITH_MERGED(tr("Their with Merged"), new ListRole[] {THEIR_ENTRIES, MERGED_ENTRIES}); + + /** the localized display name */ + private final String displayName; + private ListRole[] participatingRoles; + + ComparePairType(String displayName, ListRole[] participatingRoles) { + this.displayName = displayName; + this.participatingRoles = participatingRoles; + } + + /** + * replies the display name + * + * @return the display name + */ + public String getDisplayName() { + return displayName; + } + + /** + * replies true, if role is participating in this comparison + * pair + * + * @param role the list role + * @return true, if role is participating in this comparison + * pair; false, otherwise + */ + public boolean isParticipatingIn(ListRole role) { + for (ListRole r: participatingRoles) { + if (r.equals(role)) return true; + } + return false; + } + + /** + * replies the pair of {@see ListRole}s participating in this comparison + * pair + * + * @return the pair of list roles + */ + public ListRole[] getParticipatingRoles() { + return participatingRoles; + } + + /** + * replies the opposite role of role participating in this comparison + * pair + * + * @param role one of the two roles in this pair + * @return the opposite role + * @exception IllegalStateException if role is not participating in this pair + */ + public ListRole getOppositeRole(ListRole role) { + if (!isParticipatingIn(role)) + throw new IllegalStateException(tr("role {0} is not participating in compare pair {1}", role.toString(), this.toString())); + if (participatingRoles[0].equals(role)) + return participatingRoles[1]; + else + return participatingRoles[0]; + } +} Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (revision 1649) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (revision 1650) @@ -93,5 +93,5 @@ tabbedPane.setIconAt(0, mergeIncomplete); } - } else if (evt.getPropertyName().equals(ListMergeModel.PROP_FROZEN)) { + } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) { boolean frozen = (Boolean)evt.getNewValue(); if (frozen && evt.getSource() == nodeListMerger.getModel()) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (revision 1649) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (revision 1650) @@ -2,4 +2,10 @@ package org.openstreetmap.josm.gui.conflict; +import static org.openstreetmap.josm.gui.conflict.ComparePairType.MY_WITH_MERGED; +import static org.openstreetmap.josm.gui.conflict.ComparePairType.MY_WITH_THEIR; +import static org.openstreetmap.josm.gui.conflict.ComparePairType.THEIR_WITH_MERGED; +import static org.openstreetmap.josm.gui.conflict.ListRole.MERGED_ENTRIES; +import static org.openstreetmap.josm.gui.conflict.ListRole.MY_ENTRIES; +import static org.openstreetmap.josm.gui.conflict.ListRole.THEIR_ENTRIES; import static org.openstreetmap.josm.tools.I18n.tr; @@ -7,7 +13,10 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Observable; import java.util.logging.Logger; +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; import javax.swing.DefaultListSelectionModel; import javax.swing.table.DefaultTableModel; @@ -36,5 +45,5 @@ * ListMergeModel is an abstract class. Three methods have to be implemented by subclasses: *