Changeset 3479 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2010-08-29T14:55:25+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
r3181 r3479 5 5 6 6 import java.awt.Color; 7 import java.awt.Dimension;8 7 import java.awt.Font; 9 8 import java.awt.GridBagConstraints; 10 9 import java.awt.GridBagLayout; 11 10 import java.awt.Insets; 12 import java.awt.Toolkit;13 11 import java.awt.event.MouseAdapter; 14 12 import java.awt.event.MouseEvent; -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r3105 r3479 24 24 import java.util.Set; 25 25 import java.util.Vector; 26 import java.util.logging.Logger;27 26 import java.util.regex.Matcher; 28 27 import java.util.regex.Pattern; … … 55 54 * TileSelectionBBoxChooser allows to select a bounding box (i.e. for downloading) based 56 55 * on OSM tile numbers. 57 * 56 * 58 57 * TileSelectionBBoxChooser can be embedded as component in a Swing container. Example: 59 58 * <pre> … … 70 69 * } 71 70 * }); 72 * 71 * 73 72 * // init the chooser with a bounding box 74 73 * chooser.setBoundingBox(....); 75 * 74 * 76 75 * f.setVisible(true); 77 76 * </pre> 78 77 */ 79 78 public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{ 80 81 static private final Logger logger = Logger.getLogger(TileSelectionBBoxChooser.class.getName());82 79 83 80 /** the current bounding box */ … … 129 126 /** 130 127 * Replies the current bounding box. null, if no valid bounding box is currently selected. 131 * 128 * 132 129 */ 133 130 public Bounds getBoundingBox() { … … 137 134 /** 138 135 * Sets the current bounding box. 139 * 136 * 140 137 * @param bbox the bounding box. null, if this widget isn't initialized with a bounding box 141 138 */ … … 162 159 /** 163 160 * Computes the bounding box given a tile grid. 164 * 161 * 165 162 * @param tb the description of the tile grid 166 163 * @return the bounding box … … 177 174 /** 178 175 * Replies lat/lon of the north/west-corner of a tile at a specific zoom level 179 * 176 * 180 177 * @param tile the tile address (x,y) 181 178 * @param zoom the zoom level … … 205 202 /** 206 203 * A panel for describing a rectangular area of OSM tiles at a given zoom level. 207 * 204 * 208 205 * The panel emits PropertyChangeEvents for the property {@see TileGridInputPanel#TILE_BOUNDS_PROP} 209 206 * when the user successfully enters a valid tile grid specification. … … 572 569 /** 573 570 * Validates the x- or y-coordinate of a tile at a given zoom level. 574 * 571 * 575 572 */ 576 573 static private class TileCoordinateValidator extends AbstractTextComponentValidator { … … 653 650 */ 654 651 static private class TileBoundsMapView extends JMapViewer { 655 private Bounds bbox;656 652 private Point min; 657 653 private Point max; … … 662 658 663 659 public void setBoundingBox(Bounds bbox){ 664 this.bbox = bbox;665 660 if (bbox == null) { 666 661 min = null; -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
r3210 r3479 35 35 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; 36 36 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; 37 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;38 37 import org.openstreetmap.josm.tools.ImageProvider; 39 38 -
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandListMutableTreeNode.java
r3262 r3479 4 4 import javax.swing.tree.DefaultMutableTreeNode; 5 5 6 import org.openstreetmap.josm.command.Command;7 6 import org.openstreetmap.josm.command.PseudoCommand; 8 7 -
trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
r3363 r3479 2 2 package org.openstreetmap.josm.gui.dialogs; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;5 4 import static org.openstreetmap.josm.tools.I18n.tr; 6 5 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r3083 r3479 439 439 private JMultilineLabel lblMessage; 440 440 private Changeset current; 441 private DownloadAction actDownload;442 441 443 442 protected void build() { … … 447 446 ); 448 447 add(lblMessage); 449 add(new JButton( actDownload =new DownloadAction()));448 add(new JButton(new DownloadAction())); 450 449 451 450 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
r3214 r3479 9 9 import javax.swing.table.TableCellEditor; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.data.osm.DataSet; 13 12 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; 14 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;15 13 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; 16 14 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
r3083 r3479 42 42 private JCheckBox cbReadFull; 43 43 private EditAction editAction; 44 private final GenericRelationEditor relationEditor;45 44 46 45 /** … … 70 69 71 70 public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model, GenericRelationEditor relationEditor) { 72 this.relationEditor = relationEditor;73 71 this.model = model; 74 72 this.layer = layer; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
r3200 r3479 2 2 package org.openstreetmap.josm.gui.dialogs.relation; 3 3 4 import java.awt.Dimension;5 4 import java.awt.Point; 6 import java.awt.Toolkit;7 5 import java.awt.event.WindowAdapter; 8 6 import java.awt.event.WindowEvent; … … 235 233 protected boolean hasEditorWithCloseUpperLeftCorner(Point p, RelationEditor thisEditor) { 236 234 for (RelationEditor editor: openDialogs.values()) { 237 if (editor == thisEditor) 235 if (editor == thisEditor) { 238 236 continue; 237 } 239 238 Point corner = editor.getLocation(); 240 239 if (p.x >= corner.x -5 && corner.x + 5 >= p.x -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
r2990 r3479 34 34 /** The image currently displayed */ 35 35 private Image image = null; 36 private Image image_c = null;37 36 38 37 /** The image currently displayed */ 39 38 private boolean errorLoading = false; 40 private boolean errorLoading_c = false;41 39 42 40 /** The rectangle (in image coordinates) of the image that is visible. This rectangle is calculated 43 41 * each time the zoom is modified */ 44 42 private Rectangle visibleRect = null; 45 private Rectangle visibleRect_c = null;46 43 47 44 /** When a selection is done, the rectangle of the selection (in image coordinates) */ -
trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java
r3474 r3479 773 773 r = new InputStreamReader(stream); 774 774 } 775 BufferedReaderreader = new BufferedReader(r);775 reader = new BufferedReader(r); 776 776 777 777 String line; -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
r3385 r3479 118 118 AutoCompletionListItem bestItem = null; 119 119 for (int i = 0, n = model.getSize(); i < n; i++) { 120 AutoCompletionListItem currentItem = (AutoCompletionListItem) model.getElementAt(i); ;120 AutoCompletionListItem currentItem = (AutoCompletionListItem) model.getElementAt(i); 121 121 if (currentItem.getValue().startsWith(pattern)) { 122 122 if (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0) { -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
r3289 r3479 4 4 import java.util.ArrayList; 5 5 import java.util.Collection; 6 import java.util.Comparator;7 6 import java.util.Collections; 8 7 import java.util.HashSet; 9 8 import java.util.List; 10 9 import java.util.Map; 10 import java.util.Set; 11 11 import java.util.Map.Entry; 12 import java.util.Set; 13 import java.util.TreeSet; 14 import java.util.logging.Logger; 15 12 13 import org.openstreetmap.josm.data.osm.DataSet; 16 14 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 15 import org.openstreetmap.josm.data.osm.OsmUtils; 18 16 import org.openstreetmap.josm.data.osm.Relation; 19 17 import org.openstreetmap.josm.data.osm.RelationMember; 20 import org.openstreetmap.josm.data.osm.DataSet;21 18 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent; 22 19 import org.openstreetmap.josm.data.osm.event.DataChangedEvent; … … 28 25 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; 29 26 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 30 import org.openstreetmap.josm.gui.MapView;31 import org.openstreetmap.josm.gui.layer.Layer;32 import org.openstreetmap.josm.gui.layer.OsmDataLayer;33 27 import org.openstreetmap.josm.gui.tagging.TaggingPreset; 34 28 import org.openstreetmap.josm.tools.MultiMap; … … 70 64 */ 71 65 protected static MultiMap<String, String> presetTagCache = new MultiMap<String, String>(); 72 /** 73 * the cached list of member roles 66 /** 67 * the cached list of member roles 74 68 * only accessed by getRoleCache(), rebuild() and cacheRelationMemberRoles() 75 69 * use getRoleCache() accessor … … 187 181 TaggingPreset.Roles r = (TaggingPreset.Roles) item; 188 182 for (TaggingPreset.Role i : r.roles) { 189 if (i.key != null) 183 if (i.key != null) { 190 184 presetRoleCache.add(i.key); 185 } 191 186 } 192 187 } -
trunk/src/org/openstreetmap/josm/gui/tagging/tagging-preset.xsd
r3321 r3479 161 161 <attribute name="requisite" type="string"/> 162 162 <attribute name="type" type="string"/> 163 <attribute name="count" type="integer"/> 163 164 </complexType> 164 165
Note:
See TracChangeset
for help on using the changeset viewer.