Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1598) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1599) @@ -63,4 +63,6 @@ import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor; +import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference; import org.openstreetmap.josm.gui.tagging.TaggingPreset; @@ -294,7 +296,6 @@ */ void membershipEdit(int row) { - final RelationEditor editor = new RelationEditor((Relation)membershipData.getValueAt(row, 0), - (Collection) membershipData.getValueAt(row, 1) ); - editor.setVisible(true); + RelationEditor.getEditor((Relation)membershipData.getValueAt(row, 0), + (Collection) membershipData.getValueAt(row, 1) ).setVisible(true); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (revision 1598) +++ (revision ) @@ -1,548 +1,0 @@ -package org.openstreetmap.josm.gui.dialogs; - -import static org.openstreetmap.josm.tools.I18n.marktr; -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.Dimension; -import java.awt.GridBagLayout; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.io.IOException; -import java.text.Collator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Map.Entry; - -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.ListSelectionModel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; -import javax.swing.table.DefaultTableModel; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.ChangeCommand; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.DataSource; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; -import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.gui.OsmPrimitivRenderer; -import org.openstreetmap.josm.gui.SideButton; -import org.openstreetmap.josm.io.OsmServerObjectReader; -import org.openstreetmap.josm.tools.GBC; -import org.openstreetmap.josm.tools.Shortcut; -import org.xml.sax.SAXException; - -/** - * This dialog is for editing relations. - * - * In the basic form, it provides two tables, one with the relation tags - * and one with the relation members. (Relation tags can be edited through - * the normal properties dialog as well, if you manage to get a relation - * selected!) - * - * @author Frederik Ramm - * - */ -public class RelationEditor extends ExtendedDialog { - - /** - * The relation that this editor is working on, and the clone made for - * editing. - */ - private final Relation relation; - private final Relation clone; - private JLabel status; - - /** - * The property data. - */ - private final DefaultTableModel propertyData = new DefaultTableModel() { - @Override public boolean isCellEditable(int row, int column) { - return true; - } - @Override public Class getColumnClass(int columnIndex) { - return String.class; - } - }; - - /** - * The membership data. - */ - private final DefaultTableModel memberData = new DefaultTableModel() { - @Override public boolean isCellEditable(int row, int column) { - return column == 0; - } - @Override public Class getColumnClass(int columnIndex) { - return columnIndex == 1 ? OsmPrimitive.class : String.class; - } - }; - - /** - * The properties and membership lists. - */ - private final JTable propertyTable = new JTable(propertyData); - private final JTable memberTable = new JTable(memberData); - - // We need this twice, so cache result - protected final static String applyChangesText = tr("Apply Changes"); - - /** - * Creates a new relation editor for the given relation. The relation - * will be saved if the user selects "ok" in the editor. - * - * If no relation is given, will create an editor for a new relation. - * - * @param relation relation to edit, or null to create a new one. - */ - public RelationEditor(Relation relation) - { - this(relation, null); - } - - /** - * Creates a new relation editor for the given relation. The relation - * will be saved if the user selects "ok" in the editor. - * - * If no relation is given, will create an editor for a new relation. - * - * @param relation relation to edit, or null to create a new one. - */ - public RelationEditor(Relation relation, Collection selectedMembers ) - { - // Initalizes ExtendedDialog - super(Main.parent, - relation == null - ? tr("Create new relation") - : (relation.id == 0 - ? tr ("Edit new relation") - : tr("Edit relation #{0}", relation.id) - ), - new String[] { applyChangesText, tr("Cancel")}, - false - ); - - this.relation = relation; - - if (relation == null) { - // create a new relation - this.clone = new Relation(); - } else { - // edit an existing relation - this.clone = new Relation(relation); - } - - JPanel bothTables = setupBasicLayout(selectedMembers); - - JTabbedPane tabPane = new JTabbedPane(); - tabPane.add(bothTables, tr("Basic")); - - // This sets the minimum size before scrollbars appear on the dialog - tabPane.setPreferredSize(new Dimension(100, 100)); - contentConstraints = GBC.eol().fill().insets(5,10,5,0); - setupDialog(tabPane, new String[] { "ok.png", "cancel.png" }); - // FIXME: Make it remember last screen position - setSize(findMaxDialogSize()); - - try { setAlwaysOnTop(true); } catch (SecurityException sx) {} - setVisible(true); - } - - - /** - * Basic Editor panel has two blocks: a tag table at the top and a membership list below - * @param selectedMembers - * @return a JPanel with the described layout - */ - private JPanel setupBasicLayout(Collection selectedMembers) { - // setting up the properties table - propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")}); - propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - propertyData.addTableModelListener(new TableModelListener() { - public void tableChanged(TableModelEvent tme) { - if (tme.getType() == TableModelEvent.UPDATE) { - int row = tme.getFirstRow(); - - if (!(tme.getColumn() == 0 && row == propertyData.getRowCount() -1)) { - clone.entrySet().clear(); - for (int i = 0; i < propertyData.getRowCount(); i++) { - String key = propertyData.getValueAt(i, 0).toString(); - String value = propertyData.getValueAt(i, 1).toString(); - if (key.length() > 0 && value.length() > 0) clone.put(key, value); - } - refreshTables(); - } - } - } - }); - propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); - - // setting up the member table - - memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By"), tr("linked")}); - memberTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - memberTable.getColumnModel().getColumn(1).setCellRenderer(new OsmPrimitivRenderer()); - memberData.addTableModelListener(new TableModelListener() { - public void tableChanged(TableModelEvent tme) { - if (tme.getType() == TableModelEvent.UPDATE && tme.getColumn() == 0) { - int row = tme.getFirstRow(); - clone.members.get(row).role = memberData.getValueAt(row, 0).toString(); - } - } - }); - ListSelectionModel lsm = memberTable.getSelectionModel(); - lsm.addListSelectionListener(new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - ArrayList sel; - int cnt = memberTable.getSelectedRowCount(); - if(cnt > 0) - { - sel = new ArrayList(cnt); - for (int i : memberTable.getSelectedRows()) - sel.add((OsmPrimitive)memberTable.getValueAt(i, 1)); - } - else - { - cnt = memberTable.getRowCount(); - sel = new ArrayList(cnt); - for (int i = 0; i < cnt; ++i) - sel.add((OsmPrimitive)memberTable.getValueAt(i, 1)); - } - Main.ds.setSelected(sel); - } - }); - memberTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); - - // combine both tables and wrap them in a scrollPane - JPanel bothTables = new JPanel(); - bothTables.setLayout(new GridBagLayout()); - bothTables.add(new JLabel(tr("Tags (empty value deletes tag)")), GBC.eol().fill(GBC.HORIZONTAL)); - bothTables.add(new JScrollPane(propertyTable), GBC.eop().fill(GBC.BOTH)); - bothTables.add(status = new JLabel(tr("Members")), GBC.eol().fill(GBC.HORIZONTAL)); - // this is not exactly pretty but the four buttons simply don't fit in one line. - // we should have smaller buttons for situations like this. - JPanel buttonPanel = setupBasicButtons(); - - bothTables.add(new JScrollPane(memberTable), GBC.eol().fill(GBC.BOTH)); - bothTables.add(buttonPanel, GBC.eop().fill(GBC.HORIZONTAL)); - refreshTables(); - - if (selectedMembers != null) { - boolean scrolled = false; - for (int i = 0; i < memberData.getRowCount(); i++) { - for (RelationMember m : selectedMembers) { - if (m.member == memberData.getValueAt(i, 1) - && m.role.equals(memberData.getValueAt(i, 0))) { - memberTable.addRowSelectionInterval(i, i); - if (!scrolled) { - // Ensure that the first member is visible - memberTable.scrollRectToVisible(memberTable.getCellRect(i, 0, true)); - scrolled = true; - } - break; - } - } - - } - } - return bothTables; - } - - /** - * Creates the buttons for the basic editing layout - * @return JPanel with basic buttons - */ - private JPanel setupBasicButtons() { - JPanel buttonPanel = new JPanel(new GridLayout(2, 3)); - - buttonPanel.add(createButton(marktr("Move Up"), "moveup", tr("Move the currently selected members up"), KeyEvent.VK_N, new ActionListener() { - public void actionPerformed(ActionEvent e) { - moveMembers(-1); - } - })); - - buttonPanel.add(createButton(marktr("Add Selected"),"addselected", - tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() { - public void actionPerformed(ActionEvent e) { - addSelected(); - } - })); - - buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected", - tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() { - public void actionPerformed(ActionEvent e) { - deleteSelected(); - } - })); - - buttonPanel.add(createButton(marktr("Move Down"), "movedown", tr("Move the currently selected members down"), KeyEvent.VK_J, new ActionListener() { - public void actionPerformed(ActionEvent e) { - moveMembers(1); - } - })); - - buttonPanel.add(createButton(marktr("Remove"),"remove", - tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() { - public void actionPerformed(ActionEvent e) { - int[] rows = memberTable.getSelectedRows(); - RelationMember mem = new RelationMember(); - for (int row : rows) { - mem.role = memberTable.getValueAt(row, 0).toString(); - mem.member = (OsmPrimitive) memberTable.getValueAt(row, 1); - clone.members.remove(mem); - } - refreshTables(); - } - })); - - buttonPanel.add(createButton(marktr("Download Members"),"downloadincomplete", - tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() { - public void actionPerformed(ActionEvent e) { - downloadRelationMembers(); - refreshTables(); - } - })); - - return buttonPanel; - } - - /** - * This function saves the user's changes. Must be invoked manually. - */ - private void applyChanges() { - if (RelationEditor.this.relation == null) { - // If the user wanted to create a new relation, but hasn't added any members or - // tags, don't add an empty relation - if(clone.members.size() == 0 && !clone.isTagged()) - return; - Main.main.undoRedo.add(new AddCommand(clone)); - DataSet.fireSelectionChanged(Main.ds.getSelected()); - } else if (!RelationEditor.this.relation.realEqual(clone, true)) { - Main.main.undoRedo.add(new ChangeCommand(RelationEditor.this.relation, clone)); - DataSet.fireSelectionChanged(Main.ds.getSelected()); - } - } - - @Override - protected void buttonAction(ActionEvent evt) { - String a = evt.getActionCommand(); - if(applyChangesText.equals(a)) - applyChanges(); - - setVisible(false); - } - - @Override - protected Dimension findMaxDialogSize() { - // FIXME: Make it remember dialog size - return new Dimension(600, 500); - } - - private void refreshTables() { - // re-load property data - - propertyData.setRowCount(0); - for (Entry e : clone.entrySet()) { - propertyData.addRow(new Object[]{e.getKey(), e.getValue()}); - } - propertyData.addRow(new Object[]{"", ""}); - - // re-load membership data - - memberData.setRowCount(0); - for (int i=0; i 0) { - clone.members.add(rows[0], em); - } else { - clone.members.add(em); - } - } - refreshTables(); - } - - private void deleteSelected() { - for (OsmPrimitive p : Main.ds.getSelected()) { - Relation c = new Relation(clone); - for (RelationMember rm : c.members) { - if (rm.member == p) - { - RelationMember mem = new RelationMember(); - mem.role = rm.role; - mem.member = rm.member; - clone.members.remove(mem); - } - } - } - refreshTables(); - } - - private void moveMembers(int direction) { - int[] rows = memberTable.getSelectedRows(); - if (rows.length == 0) return; - - // check if user attempted to move anything beyond the boundary of the list - if (rows[0] + direction < 0) return; - if (rows[rows.length-1] + direction >= clone.members.size()) return; - - RelationMember m[] = new RelationMember[clone.members.size()]; - - // first move all selected rows from the member list into a new array, - // displaced by the move amount - for (Integer i: rows) { - m[i+direction] = clone.members.get(i); - clone.members.set(i, null); - } - - // now fill the empty spots in the destination array with the remaining - // elements. - int i = 0; - for (RelationMember rm : clone.members) { - if (rm != null) { - while (m[i] != null) i++; - m[i++] = rm; - } - } - - // and write the array back into the member list. - clone.members.clear(); - clone.members.addAll(Arrays.asList(m)); - refreshTables(); - ListSelectionModel lsm = memberTable.getSelectionModel(); - lsm.setValueIsAdjusting(true); - for (Integer j: rows) { - lsm.addSelectionInterval(j + direction, j + direction); - } - lsm.setValueIsAdjusting(false); - } - - private void downloadRelationMembers() { - boolean download = false; - for (RelationMember member : clone.members) { - if (member.member.incomplete) { - download = true; - break; - } - } - if (download) { - OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true); - try { - DataSet dataSet = reader.parseOsm(); - if (dataSet != null) { - final MergeVisitor visitor = new MergeVisitor(Main.main - .editLayer().data, dataSet); - for (final OsmPrimitive osm : dataSet.allPrimitives()) - osm.visit(visitor); - visitor.fixReferences(); - - // copy the merged layer's data source info - for (DataSource src : dataSet.dataSources) - Main.main.editLayer().data.dataSources.add(src); - Main.main.editLayer().fireDataChange(); - - if (visitor.conflicts.isEmpty()) - return; - final ConflictDialog dlg = Main.map.conflictDialog; - dlg.add(visitor.conflicts); - JOptionPane.showMessageDialog(Main.parent, - tr("There were conflicts during import.")); - if (!dlg.isVisible()) - dlg.action - .actionPerformed(new ActionEvent(this, 0, "")); - } - - } catch (SAXException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getMessage(), - tr("Error"), JOptionPane.ERROR_MESSAGE); - } catch (IOException e) { - e.printStackTrace(); - JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getMessage(), - tr("Error"), JOptionPane.ERROR_MESSAGE); - } - } - } -} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 1598) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 1599) @@ -27,4 +27,5 @@ import org.openstreetmap.josm.gui.OsmPrimitivRenderer; import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.layer.DataChangeListener; import org.openstreetmap.josm.gui.layer.Layer; @@ -40,6 +41,4 @@ * We don't have such dialogs for nodes, segments, and ways, because those * objects are visible on the map and can be selected there. Relations are not. - * - * @author Frederik Ramm */ public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataChangeListener { @@ -60,6 +59,5 @@ if (toEdit == null) return; - - new RelationEditor(toEdit).setVisible(true); + RelationEditor.getEditor(toEdit, null).setVisible(true); } }); @@ -95,5 +93,5 @@ public void actionPerformed(ActionEvent e) { // call relation editor with null argument to create new relation - new RelationEditor(null).setVisible(true); + RelationEditor.getEditor(null, null).setVisible(true); } }), GBC.std()); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1599) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1599) @@ -0,0 +1,507 @@ +package org.openstreetmap.josm.gui.dialogs.relation; + +import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map.Entry; + +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; +import javax.swing.table.DefaultTableModel; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSource; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; +import org.openstreetmap.josm.gui.OsmPrimitivRenderer; +import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.dialogs.ConflictDialog; +import org.openstreetmap.josm.io.OsmServerObjectReader; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Shortcut; +import org.xml.sax.SAXException; + +/** + * This dialog is for editing relations. + * + * In the basic form, it provides two tables, one with the relation tags + * and one with the relation members. (Relation tags can be edited through + * the normal properties dialog as well, if you manage to get a relation + * selected!) + * + * @author Frederik Ramm + * + */ +public class GenericRelationEditor extends RelationEditor { + + private JLabel status; + + /** + * The property data. + */ + private final DefaultTableModel propertyData = new DefaultTableModel() { + @Override public boolean isCellEditable(int row, int column) { + return true; + } + @Override public Class getColumnClass(int columnIndex) { + return String.class; + } + }; + + /** + * The membership data. + */ + private final DefaultTableModel memberData = new DefaultTableModel() { + @Override public boolean isCellEditable(int row, int column) { + return column == 0; + } + @Override public Class getColumnClass(int columnIndex) { + return columnIndex == 1 ? OsmPrimitive.class : String.class; + } + }; + + /** + * The properties and membership lists. + */ + private final JTable propertyTable = new JTable(propertyData); + private final JTable memberTable = new JTable(memberData); + + // We need this twice, so cache result + protected final static String applyChangesText = tr("Apply Changes"); + + /** + * Creates a new relation editor for the given relation. The relation + * will be saved if the user selects "ok" in the editor. + * + * If no relation is given, will create an editor for a new relation. + * + * @param relation relation to edit, or null to create a new one. + */ + public GenericRelationEditor(Relation relation, Collection selectedMembers ) + { + // Initalizes ExtendedDialog + super(relation, selectedMembers); + + JPanel bothTables = setupBasicLayout(selectedMembers); + + JTabbedPane tabPane = new JTabbedPane(); + tabPane.add(bothTables, tr("Basic")); + + // This sets the minimum size before scrollbars appear on the dialog + tabPane.setPreferredSize(new Dimension(100, 100)); + contentConstraints = GBC.eol().fill().insets(5,10,5,0); + setupDialog(tabPane, new String[] { "ok.png", "cancel.png" }); + // FIXME: Make it remember last screen position + setSize(findMaxDialogSize()); + + try { setAlwaysOnTop(true); } catch (SecurityException sx) {} + setVisible(true); + } + + + /** + * Basic Editor panel has two blocks: a tag table at the top and a membership list below + * @param selectedMembers + * @return a JPanel with the described layout + */ + private JPanel setupBasicLayout(Collection selectedMembers) { + // setting up the properties table + propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")}); + propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + propertyData.addTableModelListener(new TableModelListener() { + public void tableChanged(TableModelEvent tme) { + if (tme.getType() == TableModelEvent.UPDATE) { + int row = tme.getFirstRow(); + + if (!(tme.getColumn() == 0 && row == propertyData.getRowCount() -1)) { + clone.entrySet().clear(); + for (int i = 0; i < propertyData.getRowCount(); i++) { + String key = propertyData.getValueAt(i, 0).toString(); + String value = propertyData.getValueAt(i, 1).toString(); + if (key.length() > 0 && value.length() > 0) clone.put(key, value); + } + refreshTables(); + } + } + } + }); + propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); + + // setting up the member table + + memberData.setColumnIdentifiers(new String[]{tr("Role"),tr("Occupied By"), tr("linked")}); + memberTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + memberTable.getColumnModel().getColumn(1).setCellRenderer(new OsmPrimitivRenderer()); + memberData.addTableModelListener(new TableModelListener() { + public void tableChanged(TableModelEvent tme) { + if (tme.getType() == TableModelEvent.UPDATE && tme.getColumn() == 0) { + int row = tme.getFirstRow(); + clone.members.get(row).role = memberData.getValueAt(row, 0).toString(); + } + } + }); + ListSelectionModel lsm = memberTable.getSelectionModel(); + lsm.addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + ArrayList sel; + int cnt = memberTable.getSelectedRowCount(); + if(cnt > 0) + { + sel = new ArrayList(cnt); + for (int i : memberTable.getSelectedRows()) + sel.add((OsmPrimitive)memberTable.getValueAt(i, 1)); + } + else + { + cnt = memberTable.getRowCount(); + sel = new ArrayList(cnt); + for (int i = 0; i < cnt; ++i) + sel.add((OsmPrimitive)memberTable.getValueAt(i, 1)); + } + Main.ds.setSelected(sel); + } + }); + memberTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); + + // combine both tables and wrap them in a scrollPane + JPanel bothTables = new JPanel(); + bothTables.setLayout(new GridBagLayout()); + bothTables.add(new JLabel(tr("Tags (empty value deletes tag)")), GBC.eol().fill(GBC.HORIZONTAL)); + bothTables.add(new JScrollPane(propertyTable), GBC.eop().fill(GBC.BOTH)); + bothTables.add(status = new JLabel(tr("Members")), GBC.eol().fill(GBC.HORIZONTAL)); + // this is not exactly pretty but the four buttons simply don't fit in one line. + // we should have smaller buttons for situations like this. + JPanel buttonPanel = setupBasicButtons(); + + bothTables.add(new JScrollPane(memberTable), GBC.eol().fill(GBC.BOTH)); + bothTables.add(buttonPanel, GBC.eop().fill(GBC.HORIZONTAL)); + refreshTables(); + + if (selectedMembers != null) { + boolean scrolled = false; + for (int i = 0; i < memberData.getRowCount(); i++) { + for (RelationMember m : selectedMembers) { + if (m.member == memberData.getValueAt(i, 1) + && m.role.equals(memberData.getValueAt(i, 0))) { + memberTable.addRowSelectionInterval(i, i); + if (!scrolled) { + // Ensure that the first member is visible + memberTable.scrollRectToVisible(memberTable.getCellRect(i, 0, true)); + scrolled = true; + } + break; + } + } + + } + } + return bothTables; + } + + /** + * Creates the buttons for the basic editing layout + * @return JPanel with basic buttons + */ + private JPanel setupBasicButtons() { + JPanel buttonPanel = new JPanel(new GridLayout(2, 3)); + + buttonPanel.add(createButton(marktr("Move Up"), "moveup", tr("Move the currently selected members up"), KeyEvent.VK_N, new ActionListener() { + public void actionPerformed(ActionEvent e) { + moveMembers(-1); + } + })); + + buttonPanel.add(createButton(marktr("Add Selected"),"addselected", + tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() { + public void actionPerformed(ActionEvent e) { + addSelected(); + } + })); + + buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected", + tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() { + public void actionPerformed(ActionEvent e) { + deleteSelected(); + } + })); + + buttonPanel.add(createButton(marktr("Move Down"), "movedown", tr("Move the currently selected members down"), KeyEvent.VK_J, new ActionListener() { + public void actionPerformed(ActionEvent e) { + moveMembers(1); + } + })); + + buttonPanel.add(createButton(marktr("Remove"),"remove", + tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() { + public void actionPerformed(ActionEvent e) { + int[] rows = memberTable.getSelectedRows(); + RelationMember mem = new RelationMember(); + for (int row : rows) { + mem.role = memberTable.getValueAt(row, 0).toString(); + mem.member = (OsmPrimitive) memberTable.getValueAt(row, 1); + clone.members.remove(mem); + } + refreshTables(); + } + })); + + buttonPanel.add(createButton(marktr("Download Members"),"downloadincomplete", + tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() { + public void actionPerformed(ActionEvent e) { + downloadRelationMembers(); + refreshTables(); + } + })); + + return buttonPanel; + } + + /** + * This function saves the user's changes. Must be invoked manually. + */ + private void applyChanges() { + if (GenericRelationEditor.this.relation == null) { + // If the user wanted to create a new relation, but hasn't added any members or + // tags, don't add an empty relation + if(clone.members.size() == 0 && !clone.isTagged()) + return; + Main.main.undoRedo.add(new AddCommand(clone)); + DataSet.fireSelectionChanged(Main.ds.getSelected()); + } else if (!GenericRelationEditor.this.relation.realEqual(clone, true)) { + Main.main.undoRedo.add(new ChangeCommand(GenericRelationEditor.this.relation, clone)); + DataSet.fireSelectionChanged(Main.ds.getSelected()); + } + } + + @Override + protected void buttonAction(ActionEvent evt) { + String a = evt.getActionCommand(); + if(applyChangesText.equals(a)) + applyChanges(); + + setVisible(false); + } + + @Override + protected Dimension findMaxDialogSize() { + // FIXME: Make it remember dialog size + return new Dimension(600, 500); + } + + private void refreshTables() { + // re-load property data + + propertyData.setRowCount(0); + for (Entry e : clone.entrySet()) { + propertyData.addRow(new Object[]{e.getKey(), e.getValue()}); + } + propertyData.addRow(new Object[]{"", ""}); + + // re-load membership data + + memberData.setRowCount(0); + for (int i=0; i 0) { + clone.members.add(rows[0], em); + } else { + clone.members.add(em); + } + } + refreshTables(); + } + + private void deleteSelected() { + for (OsmPrimitive p : Main.ds.getSelected()) { + Relation c = new Relation(clone); + for (RelationMember rm : c.members) { + if (rm.member == p) + { + RelationMember mem = new RelationMember(); + mem.role = rm.role; + mem.member = rm.member; + clone.members.remove(mem); + } + } + } + refreshTables(); + } + + private void moveMembers(int direction) { + int[] rows = memberTable.getSelectedRows(); + if (rows.length == 0) return; + + // check if user attempted to move anything beyond the boundary of the list + if (rows[0] + direction < 0) return; + if (rows[rows.length-1] + direction >= clone.members.size()) return; + + RelationMember m[] = new RelationMember[clone.members.size()]; + + // first move all selected rows from the member list into a new array, + // displaced by the move amount + for (Integer i: rows) { + m[i+direction] = clone.members.get(i); + clone.members.set(i, null); + } + + // now fill the empty spots in the destination array with the remaining + // elements. + int i = 0; + for (RelationMember rm : clone.members) { + if (rm != null) { + while (m[i] != null) i++; + m[i++] = rm; + } + } + + // and write the array back into the member list. + clone.members.clear(); + clone.members.addAll(Arrays.asList(m)); + refreshTables(); + ListSelectionModel lsm = memberTable.getSelectionModel(); + lsm.setValueIsAdjusting(true); + for (Integer j: rows) { + lsm.addSelectionInterval(j + direction, j + direction); + } + lsm.setValueIsAdjusting(false); + } + + private void downloadRelationMembers() { + boolean download = false; + for (RelationMember member : clone.members) { + if (member.member.incomplete) { + download = true; + break; + } + } + if (download) { + OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true); + try { + DataSet dataSet = reader.parseOsm(); + if (dataSet != null) { + final MergeVisitor visitor = new MergeVisitor(Main.main + .editLayer().data, dataSet); + for (final OsmPrimitive osm : dataSet.allPrimitives()) + osm.visit(visitor); + visitor.fixReferences(); + + // copy the merged layer's data source info + for (DataSource src : dataSet.dataSources) + Main.main.editLayer().data.dataSources.add(src); + Main.main.editLayer().fireDataChange(); + + if (visitor.conflicts.isEmpty()) + return; + final ConflictDialog dlg = Main.map.conflictDialog; + dlg.add(visitor.conflicts); + JOptionPane.showMessageDialog(Main.parent, + tr("There were conflicts during import.")); + if (!dlg.isVisible()) + dlg.action + .actionPerformed(new ActionEvent(this, 0, "")); + } + + } catch (SAXException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getMessage(), + tr("Error"), JOptionPane.ERROR_MESSAGE); + } catch (IOException e) { + e.printStackTrace(); + JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getMessage(), + tr("Error"), JOptionPane.ERROR_MESSAGE); + } + } + } +} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 1599) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 1599) @@ -0,0 +1,86 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.relation; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.gui.ExtendedDialog; + +public abstract class RelationEditor extends ExtendedDialog { + + public static ArrayList> editors = new ArrayList>(); + + /** + * The relation that this editor is working on, and the clone made for + * editing. + */ + protected Relation relation; + protected Relation clone; + + /** + * This is a factory method that creates an appropriate RelationEditor + * instance suitable for editing the relation that was passed in as an + * argument. + * + * This method is guaranteed to return a working RelationEditor. If no + * specific editor has been registered for the type of relation, then + * a generic editor will be returned. + * Allerdings hatte er eine Art, Witwen Trost zuzusprechen und Jungfrauen erbauliche Worte zu sagen, die nicht ganz im Einklang mit seinem geistlichen Berufe stand + * Editors can be registered by adding their class to the static list "editors" + * in the RelationEditor class. When it comes to editing a relation, all + * registered editors are queried via their static "canEdit" method whether they + * feel responsible for that kind of relation, and if they return true + * then an instance of that class will be used. + * + * @param r the relation to be edited + * @return an instance of RelationEditor suitable for editing that kind of relation + */ + public static RelationEditor getEditor(Relation r, Collection selectedMembers) { + for (Class e : editors) { + try { + Method m = e.getMethod("canEdit", Relation.class); + Boolean canEdit = (Boolean) m.invoke(null, r); + if (canEdit) { + Constructor con = e.getConstructor(Relation.class, Collection.class); + RelationEditor editor = con.newInstance(r, selectedMembers); + return editor; + } + } catch (Exception ex) { + // plod on + } + } + return new GenericRelationEditor(r, selectedMembers); + } + + protected RelationEditor(Relation relation, Collection selectedMembers) + { + // Initalizes ExtendedDialog + super(Main.parent, + relation == null + ? tr("Create new relation") + : (relation.id == 0 + ? tr ("Edit new relation") + : tr("Edit relation #{0}", relation.id) + ), + new String[] { tr("Apply Changes"), tr("Cancel")}, + false + ); + + this.relation = relation; + + if (relation == null) { + // create a new relation + this.clone = new Relation(); + } else { + // edit an existing relation + this.clone = new Relation(relation); + } + } +}