Changeset 5724 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
- Timestamp:
- 2013-02-17T15:01:13+01:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r5614 r5724 31 31 import java.util.Set; 32 32 33 import javax.swing.*; 33 import javax.swing.AbstractAction; 34 import javax.swing.BorderFactory; 35 import javax.swing.InputMap; 36 import javax.swing.JComponent; 37 import javax.swing.JLabel; 38 import javax.swing.JMenu; 39 import javax.swing.JMenuItem; 40 import javax.swing.JOptionPane; 41 import javax.swing.JPanel; 42 import javax.swing.JScrollPane; 43 import javax.swing.JSplitPane; 44 import javax.swing.JTabbedPane; 45 import javax.swing.JToolBar; 46 import javax.swing.KeyStroke; 47 import javax.swing.SwingUtilities; 34 48 import javax.swing.event.ChangeEvent; 35 49 import javax.swing.event.ChangeListener; … … 59 73 import org.openstreetmap.josm.gui.DefaultNameFormatter; 60 74 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 75 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 61 76 import org.openstreetmap.josm.gui.MainMenu; 62 77 import org.openstreetmap.josm.gui.SideButton; 63 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;64 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;65 78 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler; 66 79 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; … … 697 710 } 698 711 699 static boolean confirmAddingPrim tive(OsmPrimitive primitive) throws AddAbortException {712 static boolean confirmAddingPrimitive(OsmPrimitive primitive) throws AddAbortException { 700 713 String msg = tr("<html>This relation already has one or more members referring to<br>" 701 714 + "the object ''{0}''<br>" … … 747 760 continue; 748 761 } else if (MemberTableModel.hasMembersReferringTo(relation.getMembers(), Collections.singleton(p)) 749 && !confirmAddingPrim tive(p)) {762 && !confirmAddingPrimitive(p)) { 750 763 continue; 751 764 } … … 776 789 } 777 790 if (isPotentialDuplicate(primitive)) { 778 if (confirmAddingPrim tive(primitive)) {791 if (confirmAddingPrimitive(primitive)) { 779 792 ret.add(primitive); 780 793 }
Note:
See TracChangeset
for help on using the changeset viewer.