Changeset 4221 in josm
- Timestamp:
- 2011-07-10T21:11:08+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r4191 r4221 14 14 import java.util.Collection; 15 15 import java.util.Collections; 16 import java.util.Comparator;17 16 import java.util.HashSet; 18 17 import java.util.Iterator; … … 431 430 public SelectAction(boolean add) { 432 431 putValue(SHORT_DESCRIPTION, add ? tr("Add the selected relations to the current selection") 433 : tr("Set the current selection to the list of selected relations"));432 : tr("Set the current selection to the list of selected relations")); 434 433 putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); 435 434 putValue(NAME, add ? tr("Select relation (add)") : tr("Select relation")); … … 446 445 selection.add(model.getRelation(i)); 447 446 } 448 if(add) 447 if(add) { 449 448 Main.map.mapView.getEditLayer().data.addSelected(selection); 450 else449 } else { 451 450 Main.map.mapView.getEditLayer().data.setSelected(selection); 451 } 452 452 } 453 453 … … 469 469 public SelectMembersAction(boolean add) { 470 470 putValue(SHORT_DESCRIPTION,add ? tr("Add the members of all selected relations to current selection") 471 : tr("Select the members of all selected relations"));471 : tr("Select the members of all selected relations")); 472 472 putValue(SMALL_ICON, ImageProvider.get("selectall")); 473 473 putValue(NAME, add ? tr("Select members (add)") : tr("Select members")); … … 483 483 members.addAll(r.getMemberPrimitives()); 484 484 } 485 if(add) 485 if(add) { 486 486 Main.map.mapView.getEditLayer().data.addSelected(members); 487 else487 } else { 488 488 Main.map.mapView.getEditLayer().data.setSelected(members); 489 } 489 490 } 490 491 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r4215 r4221 44 44 import javax.swing.JToolBar; 45 45 import javax.swing.KeyStroke; 46 import javax.swing.SwingUtilities; 46 47 import javax.swing.event.ChangeEvent; 47 48 import javax.swing.event.ChangeListener; … … 282 283 cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1)); 283 284 cellEditorTextField.addFocusListener( 284 new FocusAdapter() { 285 @Override public void focusGained(FocusEvent e) { 286 cellEditorTextField.selectAll(); 285 new FocusAdapter() { 286 @Override public void focusGained(FocusEvent e) { 287 cellEditorTextField.selectAll(); 288 } 287 289 } 288 }289 290 ); 290 291 DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField); … … 1100 1101 */ 1101 1102 protected void applyNewRelation() { 1102 Relation newRelation = new Relation();1103 final Relation newRelation = new Relation(); 1103 1104 tagEditorPanel.getModel().applyToPrimitive(newRelation); 1104 1105 memberTableModel.applyToRelation(newRelation); … … 1130 1131 GenericRelationEditor.this 1131 1132 ); 1133 SwingUtilities.invokeLater(new Runnable() { 1134 @Override 1135 public void run() { 1136 // Relation list gets update in EDT so selecting my be postponed to following EDT run 1137 Main.map.relationListDialog.selectRelation(newRelation); 1138 } 1139 }); 1132 1140 } 1133 1141 -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r4218 r4221 785 785 if (rows != -1) 786 786 { 787 double height = renderer.getListCellRendererComponent(list, 788 new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;787 double height = renderer.getListCellRendererComponent(list, 788 new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows; 789 789 sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height)); 790 790 } … … 1098 1098 putValue("toolbar", "tagging_" + getRawName()); 1099 1099 putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ? 1100 tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :1101 tr("Use preset ''{0}''", getLocaleName())));1102 }1100 tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) : 1101 tr("Use preset ''{0}''", getLocaleName()))); 1102 } 1103 1103 1104 1104 public String getLocaleName() { … … 1369 1369 } 1370 1370 } else if (answer == DIALOG_ANSWER_NEW_RELATION) { 1371 List<Command> cmds = new ArrayList<Command>(2);1372 1371 final Relation r = new Relation(); 1373 1372 final Collection<RelationMember> members = new HashSet<RelationMember>(); … … 1375 1374 r.put(t.getKey(), t.getValue()); 1376 1375 } 1377 for(OsmPrimitive osm : sel) {1376 for(OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) { 1378 1377 RelationMember rm = new RelationMember("", osm); 1379 1378 r.addMember(rm); -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
r3720 r4221 40 40 import org.openstreetmap.josm.data.osm.Relation; 41 41 import org.openstreetmap.josm.data.osm.Way; 42 import org.openstreetmap.josm.data.preferences.BooleanProperty; 42 43 import org.openstreetmap.josm.gui.ExtendedDialog; 43 44 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference; … … 56 57 private int CLASSIFICATION_GROUP_MATCH = 200; 57 58 private int CLASSIFICATION_TAGS_MATCH = 100; 59 60 private final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true); 61 private final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true); 58 62 59 63 private static class ResultListCellRenderer extends DefaultListCellRenderer { … … 286 290 ckOnlyApplicable.setEnabled(false); 287 291 } else { 288 ckOnlyApplicable.setSelected( true);292 ckOnlyApplicable.setSelected(ONLY_APPLICABLE.get()); 289 293 ckOnlyApplicable.addItemListener(new ItemListener() { 290 294 @Override … … 297 301 ckSearchInTags = new JCheckBox(); 298 302 ckSearchInTags.setText(tr("Search in tags")); 299 ckSearchInTags.setSelected( Main.pref.getBoolean("taggingpreset.dialog.search-in-tags", true));303 ckSearchInTags.setSelected(SEARCH_IN_TAGS.get()); 300 304 ckSearchInTags.addItemListener(new ItemListener() { 301 305 @Override … … 432 436 } 433 437 434 Main.pref.put("taggingpreset.dialog.search-in-tags", ckSearchInTags.isSelected()); 438 SEARCH_IN_TAGS.put(ckSearchInTags.isSelected()); 439 if (ckOnlyApplicable.isEnabled()) { 440 ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected()); 441 } 435 442 } 436 443
Note:
See TracChangeset
for help on using the changeset viewer.