Ticket #14013: fix14013.diff
File fix14013.diff, 4.0 KB (added by , 6 years ago) |
---|
-
plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java
44 44 import org.openstreetmap.josm.plugins.fixAddresses.OSMStreet; 45 45 import org.openstreetmap.josm.plugins.fixAddresses.StringUtils; 46 46 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AbstractAddressEditAction; 47 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.ApplyAllGuessesAction; 47 48 import org.openstreetmap.josm.plugins.fixAddresses.gui.actions.AddressActions; 48 49 import org.openstreetmap.josm.tools.ImageProvider; 49 50 … … 60 61 private JTable unresolvedTable; 61 62 private JTable streetTable; 62 63 64 private ApplyAllGuessesAction applyGuessesAction = AddressActions.getApplyGuessesAction(); 63 65 private AbstractAddressEditAction[] actions = new AbstractAddressEditAction[] { 64 66 AddressActions.getResolveAction(), 65 67 AddressActions.getGuessAddressAction(), 66 AddressActions.getApplyGuessesAction(), 68 applyGuessesAction, 69 AddressActions.getRemoveTagsAction(), 67 70 AddressActions.getSelectAction(), 68 AddressActions.getRemoveTagsAction(), 69 AddressActions.getConvertToRelationAction(), 70 AddressActions.getConvertAllToRelationAction() 71 //AddressActions.getConvertToRelationAction(), 72 //AddressActions.getConvertAllToRelationAction() 71 73 }; 72 74 73 75 private JLabel streetLabel; … … 125 127 unresolvedTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); 126 128 unresolvedTable.getSelectionModel().addListSelectionListener(this); 127 129 unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener()); 128 unresolvedTable.addMouseListener( AddressActions.getApplyGuessesAction());130 unresolvedTable.addMouseListener(applyGuessesAction); 129 131 130 132 JTableHeader header = unresolvedTable.getTableHeader(); 131 133 header.addMouseListener(uaModel.new ColumnListener(unresolvedTable)); … … 145 147 146 148 try { 147 149 JPanel unresolvedButtons = new JPanel(new GridLayout(2, 5, 5, 5)); 148 SideButton assign = new SideButton(AddressActions.getResolveAction()); 149 unresolvedButtons.add(assign); 150 151 SideButton guess = new SideButton(AddressActions.getGuessAddressAction()); 152 unresolvedButtons.add(guess); 153 SideButton applyAllGuesses = new SideButton(AddressActions.getApplyGuessesAction()); 154 unresolvedButtons.add(applyAllGuesses); 155 156 SideButton removeAddressTags = new SideButton(AddressActions.getRemoveTagsAction()); 157 unresolvedButtons.add(removeAddressTags); 158 159 unresolvedButtons.add(new JPanel()); 160 161 SideButton selectInMap = new SideButton(AddressActions.getSelectAction()); 162 unresolvedButtons.add(selectInMap); 150 for (AbstractAddressEditAction action : actions) { 151 action.setContainer(addressEditContainer); 152 SideButton button = new SideButton(action); 153 unresolvedButtons.add(button); 154 } 163 155 headerPanel2.setMinimumSize(new Dimension(100, 70)); 164 156 165 157 unresolvedPanel.add(unresolvedButtons, BorderLayout.SOUTH); … … 203 195 this.getContentPane().add(new JLabel(tr("(No data)")), BorderLayout.CENTER); 204 196 } 205 197 206 for (int i = 0; i < actions.length; i++) {207 actions[i].setContainer(addressEditContainer);208 }209 210 198 JPanel buttonPanel = new JPanel(new GridLayout(1, 10)); 211 199 JButton ok = new JButton(OK_COMMAND, ImageProvider.getIfAvailable(null, "ok")); 212 200 ok.addActionListener(this);