Changeset 6099 in josm for trunk/src/org
- Timestamp:
- 2013-08-02T07:23:48+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r6084 r6099 76 76 Main.registerActionShortcut(this, sc); 77 77 } 78 if (tooltip==null) tooltip=""; 78 79 setTooltip(tooltip); 79 80 if (getValue("toolbar") == null) { -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r6084 r6099 86 86 public class BackgroundProgressMonitor implements ProgressMonitorDialog { 87 87 88 private String title ;89 private String customText ;88 private String title=""; 89 private String customText=""; 90 90 91 91 private void updateText() { -
trunk/src/org/openstreetmap/josm/gui/SideButton.java
r6070 r6099 88 88 setActionCommand(name); 89 89 addActionListener(actionListener); 90 if (tooltip==null) tooltip=""; 90 91 setToolTipText(tooltip); 91 92 putClientProperty("help", "Dialog/"+property+"/"+name); -
trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
r6093 r6099 205 205 protected void setErrorFeedback(JosmTextField tf, String message) { 206 206 tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1)); 207 if (message==null) message=""; 207 208 tf.setToolTipText(message); 208 209 tf.setBackground(BG_COLOR_ERROR); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r6095 r6099 685 685 mainPanel.getActionMap().put(actionShortcutShiftKey, actionShift); 686 686 // Make the tag label clickable and set tooltip to the action description (this displays also the keyboard shortcut) 687 tagLabel.setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION)); 687 String tooltip = (String) action.getValue(Action.SHORT_DESCRIPTION); 688 if (tooltip==null) tooltip=""; 689 tagLabel.setToolTipText(tooltip); 688 690 tagLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); 689 691 tagLabel.addMouseListener(new MouseAdapter() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
r6084 r6099 40 40 setBorder(null); 41 41 setIcon(null); 42 setToolTipText( null);42 setToolTipText(""); 43 43 } 44 44 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
r6084 r6099 45 45 setBorder(null); 46 46 setIcon(null); 47 setToolTipText( null);47 setToolTipText(""); 48 48 } 49 49 -
trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
r6084 r6099 179 179 protected void setErrorMessage(JosmTextField tf, String msg) { 180 180 tf.setBorder(errorBorder); 181 if (msg==null) msg=""; 181 182 tf.setToolTipText(msg); 182 183 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r6084 r6099 397 397 protected void setErrorFeedback(JosmTextField tf, String message) { 398 398 tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1)); 399 if (message==null) message=""; 399 400 tf.setToolTipText(message); 400 401 tf.setBackground(BG_COLOR_ERROR); … … 403 404 protected void clearErrorFeedback(JosmTextField tf, String message) { 404 405 tf.setBorder(UIManager.getBorder("TextField.border")); 406 if (message==null) message=""; 405 407 tf.setToolTipText(message); 406 408 tf.setBackground(UIManager.getColor("TextField.background")); -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
r6070 r6099 83 83 if (c instanceof JComponent) { 84 84 JComponent jc = (JComponent) c; 85 jc.setToolTipText((String) getValueAt(row, col)); 85 String val=(String) getValueAt(row, col); 86 jc.setToolTipText(val==null? "": val); 86 87 } 87 88 return c; -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r6093 r6099 310 310 if (icon != null) 311 311 setIconImage(icon.getImage()); 312 if (title==null) title=""; 312 313 contentInsets = new Insets(10,5,0,5); 313 314 if (showNewRelation) { -
trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
r6084 r6099 51 51 tc.setBorder(ERROR_BORDER); 52 52 tc.setBackground(ERROR_BACKGROUND); 53 tc.setToolTipText(msg );53 tc.setToolTipText(msg == null ? "" : msg); 54 54 valid = false; 55 55 this.msg = msg; -
trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java
r5965 r6099 29 29 add(new JLabel(ImageProvider.get("statusline/"+img+".png")), GBC.std().anchor(GBC.WEST).insets(0,1,1,0)); 30 30 add(tf = new JLabel(), GBC.std().fill(GBC.BOTH).anchor(GBC.WEST).insets(2,1,1,0)); 31 setToolTipText(tooltip );31 setToolTipText(tooltip==null ? "" : tooltip); 32 32 this.charCount = charCount; 33 33 } -
trunk/src/org/openstreetmap/josm/tools/UrlLabel.java
r6070 r6099 54 54 setText("<html>" + description + "</html>"); 55 55 setCursor(null); 56 setToolTipText( null);56 setToolTipText(""); 57 57 } 58 58 }
Note:
See TracChangeset
for help on using the changeset viewer.