Changeset 9059 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2015-11-23T01:09:15+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 106 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r8959 r9059 1452 1452 */ 1453 1453 void toOtherApplication(); 1454 1454 1455 /** 1455 * Called when the user comes from a window of another application 1456 * back to JOSM. 1456 * Called when the user comes from a window of another application back to JOSM. 1457 1457 */ 1458 1458 void fromOtherApplication(); -
trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java
r6380 r9059 3 3 package org.openstreetmap.josm.actions; 4 4 5 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 5 6 import static org.openstreetmap.josm.tools.I18n.tr; 6 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;7 7 8 8 import java.awt.event.ActionEvent; 9 9 import java.awt.event.KeyEvent; 10 10 import java.util.Collection; 11 11 12 import org.openstreetmap.josm.Main; 12 13 13 import org.openstreetmap.josm.data.osm.OsmPrimitive; 14 14 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy; 15 15 import org.openstreetmap.josm.tools.Shortcut; 16 16 17 public final class DuplicateAction extends JosmAction {17 public final class DuplicateAction extends JosmAction { 18 18 19 /** 20 * Constructs a new {@code DuplicateAction}. 21 */ 19 22 public DuplicateAction() { 20 23 super(tr("Duplicate"), "duplicate", -
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r8846 r9059 40 40 * @since 3715 41 41 */ 42 public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener {42 public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener { 43 43 private static volatile ImageryOffsetDialog offsetDialog; 44 44 private static Cursor cursor = ImageProvider.getCursor("normal", "move"); -
trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java
r6380 r9059 12 12 public class UnselectAllAction extends JosmAction { 13 13 14 /** 15 * Constructs a new {@code UnselectAllAction}. 16 */ 14 17 public UnselectAllAction() { 15 18 super(tr("Unselect All"), "unselectall", tr("Unselect all objects."), … … 26 29 getCurrentDataSet().setSelected(); 27 30 } 31 28 32 /** 29 33 * Refreshes the enabled state 30 *31 34 */ 32 35 @Override -
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r8931 r9059 44 44 * @author imi 45 45 */ 46 public class UploadAction extends JosmAction {46 public class UploadAction extends JosmAction { 47 47 /** 48 48 * The list of upload hooks. These hooks will be called one after the other -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r8931 r9059 1056 1056 } 1057 1057 } 1058 1058 1059 /** 1059 1060 * Takes the data from computeHelperLine to determine which ways/nodes should be highlighted -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r8931 r9059 357 357 } 358 358 } 359 359 360 /** 360 361 * Toggles dual alignment mode. -
trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
r8855 r9059 75 75 return ""; 76 76 } 77 77 78 /** 78 79 * Call selectMapMode(this) on the parent mapFrame. -
trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
r8510 r9059 43 43 // selected non-new relations 44 44 this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>() { 45 @Override public boolean evaluate(Relation r) { 45 @Override 46 public boolean evaluate(Relation r) { 46 47 return !r.isNew(); 47 }}); 48 } 49 }); 48 50 updateEnabledState(); 49 51 } -
trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
r8510 r9059 69 69 public boolean evaluate(Relation r) { 70 70 return r.hasIncompleteMembers(); 71 }}); 71 } 72 }); 72 73 this.incompleteMembers = buildSetOfIncompleteMembers(relations); 73 74 updateEnabledState(); -
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r8836 r9059 190 190 return null; 191 191 } 192 192 193 /** 193 194 * Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null -
trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
r8380 r9059 24 24 * while others indicate the note being opened, closed or reopened 25 25 */ 26 public enum Action {opened, closed, reopened, commented} 26 public enum Action { 27 opened, 28 closed, 29 reopened, 30 commented 31 } 27 32 28 33 /** -
trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
r8510 r9059 32 32 * 33 33 */ 34 public final class ChangesetCache implements PreferenceChangedListener {34 public final class ChangesetCache implements PreferenceChangedListener { 35 35 /** the unique instance */ 36 36 private static final ChangesetCache instance = new ChangesetCache(); -
trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
r8510 r9059 7 7 import java.util.Set; 8 8 9 public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {9 public class DefaultChangesetCacheEvent implements ChangesetCacheEvent { 10 10 11 11 private final Set<Changeset> added; -
trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
r8510 r9059 87 87 } 88 88 89 public finalvoid visitAll() {89 public void visitAll() { 90 90 for (OsmPrimitive osm : primitives) { 91 91 firstIteration = true; -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r8870 r9059 128 128 this(ha, capacity, false); 129 129 } 130 130 131 /** 131 132 * constructor -
trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
r6830 r9059 9 9 public abstract class AbstractDatasetChangedEvent { 10 10 11 public enum DatasetEventType {DATA_CHANGED, NODE_MOVED, PRIMITIVES_ADDED, PRIMITIVES_REMOVED, 12 RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED, CHANGESET_ID_CHANGED} 11 public enum DatasetEventType { 12 DATA_CHANGED, 13 NODE_MOVED, 14 PRIMITIVES_ADDED, 15 PRIMITIVES_REMOVED, 16 RELATION_MEMBERS_CHANGED, 17 TAGS_CHANGED, 18 WAY_NODES_CHANGED, 19 CHANGESET_ID_CHANGED 20 } 13 21 14 22 protected final DataSet dataSet; -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r8836 r9059 99 99 IN_EDT, 100 100 /** 101 * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to 102 * one event 101 * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to one event 103 102 */ 104 IN_EDT_CONSOLIDATED} 103 IN_EDT_CONSOLIDATED 104 } 105 105 106 106 private static class ListenerInfo { -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r8510 r9059 27 27 * @since 1670 28 28 */ 29 public class HistoryDataSet implements LayerChangeListener {29 public class HistoryDataSet implements LayerChangeListener { 30 30 /** the unique instance */ 31 31 private static HistoryDataSet historyDataSet; -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
r8540 r9059 19 19 * 20 20 */ 21 public class HistoryRelation extends HistoryOsmPrimitive {21 public class HistoryRelation extends HistoryOsmPrimitive { 22 22 23 23 private List<RelationMemberData> members = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
r6380 r9059 18 18 */ 19 19 void visit(Node n); 20 20 21 /** 21 22 * Visiting call for lines. … … 24 25 */ 25 26 void visit(Way w); 27 26 28 /** 27 29 * Visiting call for relations. … … 30 32 */ 31 33 void visit(Relation r); 34 32 35 /** 33 36 * Visiting call for changesets. -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r9032 r9059 934 934 } 935 935 } 936 936 937 /** 937 938 * highlights a given point by drawing a rounded rectangle around it. Give the -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
r9032 r9059 190 190 191 191 public static class PolyData { 192 public enum Intersection {INSIDE, OUTSIDE, CROSSING} 192 public enum Intersection { 193 INSIDE, 194 OUTSIDE, 195 CROSSING 196 } 193 197 194 198 private final Path2D.Double poly; -
trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
r8836 r9059 282 282 pane.setValue(JOptionPane.CLOSED_OPTION); 283 283 dialog.setVisible(false); 284 } }285 );284 } 285 }); 286 286 287 287 if (options != null) { -
trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
r8855 r9059 49 49 * 50 50 */ 51 public final class JosmUserIdentityManager implements PreferenceChangedListener {51 public final class JosmUserIdentityManager implements PreferenceChangedListener { 52 52 53 53 private static JosmUserIdentityManager instance; -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r9006 r9059 947 947 this.presetsMenu = presetsMenu; 948 948 } 949 949 950 /** 950 951 * Refreshes the enabled state -
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r8958 r9059 689 689 } 690 690 } 691 691 692 /** 692 693 * Removes a mapMode change listener -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r8907 r9059 495 495 public void run() { 496 496 staticPopup.hide(); 497 }}); 497 } 498 }); 498 499 } 499 500 … … 519 520 // There is no old popup 520 521 EventQueue.invokeLater(new Runnable() { 521 @Override 522 public void run() { 523 staticPopup.show(); 524 }}); 522 @Override 523 public void run() { 524 staticPopup.show(); 525 } 526 }); 525 527 } 526 528 this.popupLabels = lbls; -
trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
r8870 r9059 181 181 eventSource.addTemporaryLayer(selectionHintLayer); 182 182 } 183 183 184 /** 184 185 * Unregister itself from the given event source and hide the selection hint layer. -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r9012 r9059 80 80 * </pre> 81 81 */ 82 public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {82 public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser { 83 83 84 84 /** the current bounding box */ … … 217 217 * 218 218 */ 219 private static class TileGridInputPanel extends JPanel implements PropertyChangeListener {219 private static class TileGridInputPanel extends JPanel implements PropertyChangeListener { 220 220 public static final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds"; 221 221 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
r6890 r9059 7 7 import javax.swing.table.TableColumn; 8 8 9 public class RelationMemberListColumnModel extends DefaultTableColumnModel {9 public class RelationMemberListColumnModel extends DefaultTableColumnModel { 10 10 11 11 protected final void createColumns() { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
r8836 r9059 44 44 /** Call when need to go to next row */ 45 45 void gotoNextDecision(); 46 46 47 /** Call when need to go to previous row */ 47 48 void gotoPreviousDecision(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
r6890 r9059 7 7 import javax.swing.table.TableColumn; 8 8 9 public class TagConflictResolverColumnModel extends DefaultTableColumnModel {9 public class TagConflictResolverColumnModel extends DefaultTableColumnModel { 10 10 11 11 protected final void createColumns() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r8836 r9059 73 73 * 74 74 */ 75 public class ChangesetDialog extends ToggleDialog {75 public class ChangesetDialog extends ToggleDialog { 76 76 private ChangesetInSelectionListModel inSelectionModel; 77 77 private ChangesetsInActiveDataLayerListModel inActiveDataLayerModel; … … 291 291 * Selects objects for the currently selected changesets. 292 292 */ 293 class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener {293 class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener { 294 294 295 295 SelectObjectsAction() { … … 345 345 * 346 346 */ 347 class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener {347 class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener { 348 348 ReadChangesetsAction() { 349 349 putValue(NAME, tr("Download")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
r8958 r9059 422 422 * undo / redo switch to reduce duplicate code 423 423 */ 424 protected enum UndoRedoType {UNDO, REDO} 424 protected enum UndoRedoType { 425 UNDO, 426 REDO 427 } 425 428 426 429 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r8846 r9059 63 63 * 64 64 */ 65 public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener {65 public final class ConflictDialog extends ToggleDialog implements MapView.EditLayerChangeListener, IConflictListener, SelectionChangedListener { 66 66 67 67 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
r8989 r9059 274 274 } 275 275 276 private static class RelationMemberTableColumnModel extends DefaultTableColumnModel {276 private static class RelationMemberTableColumnModel extends DefaultTableColumnModel { 277 277 278 278 protected final void createColumns() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r8840 r9059 99 99 ELEMENT_SHRINKS /* else. (Remaining elements have more space.) */ 100 100 } 101 101 102 /** 102 103 * Reconstruct the view, if the configurations of dialogs has changed. -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
r8870 r9059 150 150 filterModel.addFilter(filter); 151 151 } 152 }}); 152 } 153 }); 153 154 SideButton editButton = new SideButton(new AbstractAction() { 154 155 { -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r8855 r9059 693 693 694 694 public final class ActivateLayerAction extends AbstractAction 695 implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {695 implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction { 696 696 private transient Layer layer; 697 697 private transient Shortcut multikeyShortcut; … … 1150 1150 * The action to move up the currently selected entries in the list. 1151 1151 */ 1152 class MoveUpAction extends AbstractAction implements IEnabledStateUpdating {1152 class MoveUpAction extends AbstractAction implements IEnabledStateUpdating { 1153 1153 MoveUpAction() { 1154 1154 putValue(NAME, tr("Move up")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r8836 r9059 115 115 } 116 116 updateButtonStates(); 117 }}); 117 } 118 }); 118 119 displayList.addMouseListener(new MouseAdapter() { 119 120 //center view on selected note on double click -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r8979 r9059 328 328 * 329 329 */ 330 static class NewAction extends AbstractAction implements LayerChangeListener {330 static class NewAction extends AbstractAction implements LayerChangeListener { 331 331 NewAction() { 332 332 putValue(SHORT_DESCRIPTION, tr("Create a new relation")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r8846 r9059 155 155 } 156 156 157 class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener {157 class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener { 158 158 159 159 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
r8836 r9059 399 399 * 400 400 */ 401 class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener {401 class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener { 402 402 RemoveFromCacheAction() { 403 403 putValue(NAME, tr("Remove from cache")); … … 427 427 * 428 428 */ 429 class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {429 class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener { 430 430 CloseSelectedChangesetsAction() { 431 431 putValue(NAME, tr("Close")); … … 469 469 * 470 470 */ 471 class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener {471 class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener { 472 472 DownloadSelectedChangesetsAction() { 473 473 putValue(NAME, tr("Update changeset")); … … 498 498 * 499 499 */ 500 class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener {500 class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener { 501 501 DownloadSelectedChangesetContentAction() { 502 502 putValue(NAME, tr("Download changeset content")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
r8510 r9059 25 25 * 26 26 */ 27 public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener {27 public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener { 28 28 29 29 /** the name of the property for the currently selected changeset in the detail view */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
r8510 r9059 29 29 * 30 30 */ 31 public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {31 public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask { 32 32 33 33 /** the list of changeset ids to download */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r8836 r9059 191 191 * 192 192 */ 193 class DownloadChangesetContentAction extends AbstractAction {193 class DownloadChangesetContentAction extends AbstractAction { 194 194 DownloadChangesetContentAction() { 195 195 putValue(NAME, tr("Download content")); … … 317 317 } 318 318 319 class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {319 class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener { 320 320 321 321 SelectInCurrentLayerAction() { … … 367 367 } 368 368 369 class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {369 class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener { 370 370 371 371 ZoomInCurrentLayerAction() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
r8836 r9059 139 139 * 140 140 */ 141 private static class ChangesetContentEntry implements ChangesetDataSetEntry {141 private static class ChangesetContentEntry implements ChangesetDataSetEntry { 142 142 private final ChangesetModificationType modificationType; 143 143 private final HistoryOsmPrimitive primitive; -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r8855 r9059 326 326 * 327 327 */ 328 class UpdateChangesetAction extends AbstractAction {328 class UpdateChangesetAction extends AbstractAction { 329 329 UpdateChangesetAction() { 330 330 putValue(NAME, tr("Update changeset")); … … 354 354 * 355 355 */ 356 class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {356 class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener { 357 357 358 358 SelectInCurrentLayerAction() { … … 415 415 * 416 416 */ 417 class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener {417 class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener { 418 418 419 419 ZoomInCurrentLayerAction() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java
r8510 r9059 6 6 import org.openstreetmap.josm.data.osm.Changeset; 7 7 8 public interface ChangesetDownloadTask extends Runnable {8 public interface ChangesetDownloadTask extends Runnable { 9 9 Set<Changeset> getDownloadedChangesets(); 10 10 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
r8510 r9059 34 34 * 35 35 */ 36 public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask {36 public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask { 37 37 38 38 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
r6084 r9059 11 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 12 13 public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener {13 public class ChangesetInSelectionListModel extends ChangesetListModel implements SelectionChangedListener, EditLayerChangeListener { 14 14 15 15 public ChangesetInSelectionListModel(DefaultListSelectionModel selectionModel) { 16 16 super(selectionModel); 17 17 } 18 18 19 /* ---------------------------------------------------------------------------- */ 19 20 /* Interface SelectionChangeListener */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
r8855 r9059 18 18 * 19 19 */ 20 public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener {20 public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener { 21 21 22 22 private TagEditorModel model; -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
r8836 r9059 76 76 * Downloads the single changeset from the OSM API 77 77 */ 78 class DownloadAction extends AbstractAction implements DocumentListener {78 class DownloadAction extends AbstractAction implements DocumentListener { 79 79 80 80 DownloadAction() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
r8510 r9059 35 35 * @since 2689 36 36 */ 37 public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask {37 public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetDownloadTask { 38 38 39 39 /** the changeset query */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r8996 r9059 708 708 List<Relation> sortedRelations = new ArrayList<>(roles.keySet()); 709 709 Collections.sort(sortedRelations, new Comparator<Relation>() { 710 @Override public int compare(Relation o1, Relation o2) { 710 @Override 711 public int compare(Relation o1, Relation o2) { 711 712 int comp = Boolean.valueOf(o1.isDisabledAndHidden()).compareTo(o2.isDisabledAndHidden()); 712 713 return comp != 0 ? comp : DefaultNameFormatter.getInstance().getRelationComparator().compare(o1, o2); 713 } }714 714 } 715 }); 715 716 716 717 for (Relation r: sortedRelations) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r8856 r9059 217 217 * Recursively. 218 218 */ 219 class DownloadAllChildRelationsAction extends AbstractAction {219 class DownloadAllChildRelationsAction extends AbstractAction { 220 220 DownloadAllChildRelationsAction() { 221 221 putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r8863 r9059 83 83 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; 84 84 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; 85 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; 85 86 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler; 86 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;87 87 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType; 88 88 import org.openstreetmap.josm.io.OnlineResource; … … 1208 1208 } 1209 1209 1210 class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener {1210 class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener { 1211 1211 DeleteCurrentRelationAction() { 1212 1212 putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation")); … … 1565 1565 } 1566 1566 1567 class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener {1567 class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener { 1568 1568 DownloadSelectedIncompleteMembersAction() { 1569 1569 putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
r8836 r9059 123 123 124 124 private transient ListSelectionListener highlighterListener = new ListSelectionListener() { 125 @Override 126 public void valueChanged(ListSelectionEvent lse) { 127 if (Main.isDisplayingMapView()) { 128 Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers(); 129 final List<OsmPrimitive> toHighlight = new ArrayList<>(); 130 for (RelationMember r: sel) { 131 if (r.getMember().isUsable()) { 132 toHighlight.add(r.getMember()); 125 @Override 126 public void valueChanged(ListSelectionEvent lse) { 127 if (Main.isDisplayingMapView()) { 128 Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers(); 129 final List<OsmPrimitive> toHighlight = new ArrayList<>(); 130 for (RelationMember r: sel) { 131 if (r.getMember().isUsable()) { 132 toHighlight.add(r.getMember()); 133 } 134 } 135 SwingUtilities.invokeLater(new Runnable() { 136 @Override 137 public void run() { 138 if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) { 139 Main.map.mapView.repaint(); 133 140 } 134 141 } 135 SwingUtilities.invokeLater(new Runnable() { 136 @Override 137 public void run() { 138 if (Main.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) { 139 Main.map.mapView.repaint(); 140 } 141 } 142 }); 143 } 144 }}; 142 }); 143 } 144 } 145 }; 145 146 146 147 private void initHighlighting() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
r8510 r9059 51 51 * 52 52 */ 53 public class ParentRelationLoadingTask extends PleaseWaitRunnable {53 public class ParentRelationLoadingTask extends PleaseWaitRunnable { 54 54 private boolean canceled; 55 55 private Exception lastException; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
r8846 r9059 20 20 * 21 21 */ 22 public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener {22 public class RelationDialogManager extends WindowAdapter implements MapView.LayerChangeListener { 23 23 24 24 /** keeps track of open relation editors */ … … 103 103 openDialogs = new HashMap<>(); 104 104 } 105 105 106 /** 106 107 * Register the relation editor for a relation managed by a -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
r8454 r9059 138 138 } 139 139 } 140 140 141 /** 141 142 * Replies the currently edited relation -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
r8510 r9059 16 16 import org.openstreetmap.josm.tools.CheckParameterUtil; 17 17 18 public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener {18 public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, MapView.LayerChangeListener { 19 19 20 20 /** this selection table model only displays selected primitives in this layer */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
r8840 r9059 31 31 public class RelationNodeMap { 32 32 33 private static class NodesWays {33 private static class NodesWays { 34 34 public final Map<Node, Set<Integer>> nodes = new TreeMap<>(); 35 35 public final Map<Integer, Set<Node>> ways = new TreeMap<>(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
r8510 r9059 213 213 return determineDirection(ref_i, ref_direction, k, false); 214 214 } 215 215 216 /** 216 217 * Determines the direction of way k with respect to the way ref_i. -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
r8836 r9059 208 208 } 209 209 210 class RemoveAction extends AbstractAction implements ListSelectionListener {210 class RemoveAction extends AbstractAction implements ListSelectionListener { 211 211 /** 212 212 * Constructs a new {@code RemoveAction}. -
trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
r8840 r9059 188 188 } 189 189 190 class LatValueChecker extends FocusAdapter implements ActionListener {190 class LatValueChecker extends FocusAdapter implements ActionListener { 191 191 private JosmTextField tfLatValue; 192 192 -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r8932 r9059 163 163 public void actionPerformed(ActionEvent e) { 164 164 Main.pref.put("download.autorun", cbStartup.isSelected()); 165 }}); 165 } 166 }); 166 167 167 168 pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5)); -
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r8836 r9059 167 167 * 168 168 */ 169 private static class LatLonViewer extends JPanel implements Observer {169 private static class LatLonViewer extends JPanel implements Observer { 170 170 171 171 private JLabel lblLat; -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
r8836 r9059 36 36 * 37 37 */ 38 public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener {38 public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener { 39 39 40 40 /** the embedded browser */ -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r8846 r9059 44 44 * @since 1709 45 45 */ 46 public class VersionInfoPanel extends JPanel implements Observer {46 public class VersionInfoPanel extends JPanel implements Observer { 47 47 private PointInTimeType pointInTimeType; 48 48 private transient HistoryBrowserModel model; -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r8951 r9059 44 44 * @since 1709 45 45 */ 46 public class VersionTable extends JTable implements Observer {46 public class VersionTable extends JTable implements Observer { 47 47 private VersionTablePopupMenu popupMenu; 48 48 private final transient HistoryBrowserModel model; -
trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
r8836 r9059 47 47 * </ul> 48 48 */ 49 public class ChangesetManagementPanel extends JPanel implements ListDataListener {49 public class ChangesetManagementPanel extends JPanel implements ListDataListener { 50 50 public static final String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset"; 51 51 public static final String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload"; … … 317 317 * 318 318 */ 319 class CloseChangesetAction extends AbstractAction implements ItemListener {319 class CloseChangesetAction extends AbstractAction implements ItemListener { 320 320 CloseChangesetAction() { 321 321 putValue(SMALL_ICON, ImageProvider.get("closechangeset")); -
trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
r8846 r9059 344 344 * If both text fields contain characters, submits the form by calling owner's {@link OKAction}. 345 345 */ 346 private static class TFKeyListener implements KeyListener {346 private static class TFKeyListener implements KeyListener { 347 347 protected CredentialDialog owner; // owner Dependency Injection to call OKAction 348 348 protected JTextField currentTF; -
trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
r8836 r9059 29 29 * Shows progress bar when downloading 30 30 */ 31 public class DownloadFileTask extends PleaseWaitRunnable {31 public class DownloadFileTask extends PleaseWaitRunnable { 32 32 private final String address; 33 33 private final File file; -
trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
r8510 r9059 21 21 22 22 // FIXME this class should extend HtmlPanel instead (duplicated code in here) 23 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener {23 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener { 24 24 private transient UploadStrategySpecification spec = new UploadStrategySpecification(); 25 25 private int numObjects; -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r9004 r9059 497 497 498 498 } 499 499 500 /** 500 501 * Creates popup menu items and binds to mouse actions … … 678 679 * 2); 679 680 } 681 680 682 /** 681 683 * Checks zoom level against settings -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r8811 r9059 654 654 return !equal(a, b); 655 655 } 656 656 657 /** 657 658 * Determines whether the JOSM search with {@code searchStr} applies to the object. -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r8846 r9059 121 121 * 122 122 */ 123 private class MatchingReferrerFinder extends AbstractVisitor{123 private class MatchingReferrerFinder extends AbstractVisitor { 124 124 private Environment e; 125 125 -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
r8836 r9059 336 336 * Starts the authorisation process 337 337 */ 338 class RunAuthorisationAction extends AbstractAction implements DocumentListener {338 class RunAuthorisationAction extends AbstractAction implements DocumentListener { 339 339 RunAuthorisationAction() { 340 340 putValue(NAME, tr("Authorize now")); -
trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
r8836 r9059 39 39 * @since 2746 40 40 */ 41 public class ManualAuthorizationUI extends AbstractAuthorizationUI {41 public class ManualAuthorizationUI extends AbstractAuthorizationUI { 42 42 43 43 private JosmTextField tfAccessTokenKey; -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
r8510 r9059 15 15 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel; 16 16 17 public class OsmPrivilegesPanel extends VerticallyScrollablePanel {17 public class OsmPrivilegesPanel extends VerticallyScrollablePanel { 18 18 19 19 private JCheckBox cbWriteApi; -
trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
r8836 r9059 382 382 * Action for retrieving a request token 383 383 */ 384 class RetrieveRequestTokenAction extends AbstractAction {384 class RetrieveRequestTokenAction extends AbstractAction { 385 385 386 386 RetrieveRequestTokenAction() { -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
r8846 r9059 322 322 public boolean identify(TabPreferenceSetting tps, Object name) { 323 323 return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName()); 324 }}, name); 324 } 325 }, name); 325 326 } 326 327 … … 330 331 public boolean identify(TabPreferenceSetting tps, Object clazz) { 331 332 return tps.getClass().isAssignableFrom((Class<?>) clazz); 332 }}, clazz); 333 } 334 }, clazz); 333 335 } 334 336 … … 342 344 public boolean identify(TabPreferenceSetting tps, Object unused) { 343 345 return tps.equals(tab); 344 }}, null); 346 } 347 }, null); 345 348 return tab.selectSubTab(sub); 346 349 } -
trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
r8850 r9059 265 265 // XML style is not bundled anymore 266 266 list.remove(Utils.find(list, new Predicate<SourceEntry>() { 267 @Override 268 public boolean evaluate(SourceEntry se) { 269 return "resource://styles/standard/elemstyles.xml".equals(se.url); 270 }})); 267 @Override 268 public boolean evaluate(SourceEntry se) { 269 return "resource://styles/standard/elemstyles.xml".equals(se.url); 270 } 271 })); 271 272 272 273 return changed; -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r8870 r9059 93 93 94 94 @Override 95 public finalboolean isValid() {95 public boolean isValid() { 96 96 try { 97 97 CustomProjection test = new CustomProjection(); … … 110 110 return true; 111 111 } 112 113 112 }; 114 113 -
trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
r8510 r9059 28 28 * 29 29 */ 30 public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener {30 public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener { 31 31 32 32 /** indicates whether we use basic authentication */ -
trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
r8846 r9059 24 24 private final CancelHandler cancelHandler; 25 25 26 protected enum State {INIT, IN_TASK, IN_SUBTASK, FINISHED} 26 protected enum State { 27 INIT, 28 IN_TASK, 29 IN_SUBTASK, 30 FINISHED 31 } 27 32 28 33 protected State state = State.INIT; -
trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
r8840 r9059 17 17 * 18 18 */ 19 public class TagCellEditor extends AbstractCellEditor implements TableCellEditor {19 public class TagCellEditor extends AbstractCellEditor implements TableCellEditor { 20 20 21 21 protected AutoCompletingTextField editor; -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
r8840 r9059 61 61 this.colSelectionModel = new DefaultListSelectionModel(); 62 62 } 63 63 64 /** 64 65 * Creates a new tag editor model. … … 301 302 } 302 303 } 304 303 305 /** 304 306 * deletes the tags given by tagIndices -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r8840 r9059 282 282 * Action to be run when the user adds a new tag. 283 283 * 284 * 285 */ 286 class AddAction extends RunnableAction implements PropertyChangeListener{ 284 */ 285 class AddAction extends RunnableAction implements PropertyChangeListener { 287 286 AddAction() { 288 287 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); … … 316 315 } 317 316 318 317 /** 319 318 * Action to be run when the user wants to paste tags from buffer 320 319 */ 321 class PasteAction extends RunnableAction implements PropertyChangeListener {320 class PasteAction extends RunnableAction implements PropertyChangeListener { 322 321 PasteAction() { 323 322 putValue(SMALL_ICON, ImageProvider.get("", "pastetags")); -
trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
r8840 r9059 32 32 * 33 33 */ 34 public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener {34 public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener { 35 35 private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1); 36 36 private static final Color ERROR_BACKGROUND = new Color(255, 224, 224); -
trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
r8840 r9059 164 164 } 165 165 166 private static class LongitudeValidator extends AbstractTextComponentValidator {166 private static class LongitudeValidator extends AbstractTextComponentValidator { 167 167 168 168 public static void decorate(JTextComponent tc) { -
trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
r8929 r9059 173 173 } 174 174 } 175 175 176 /** Rotate to the next allowed state.*/ 176 177 private void nextState() { -
trunk/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java
r8510 r9059 8 8 import javax.swing.text.JTextComponent; 9 9 10 public class SelectAllOnFocusGainedDecorator extends FocusAdapter {10 public class SelectAllOnFocusGainedDecorator extends FocusAdapter { 11 11 12 12 public static void decorate(JTextComponent tc) { -
trunk/src/org/openstreetmap/josm/io/CachedFile.java
r8929 r9059 484 484 return connectFollowingRedirect(downloadUrl, httpAccept, ifModifiedSince, null); 485 485 } 486 486 487 /** 487 488 * Opens a connection for downloading a resource. -
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r8856 r9059 44 44 public class GpxReader implements GpxConstants { 45 45 46 private enum State { init, gpx, metadata, wpt, rte, trk, ext, author, link, trkseg, copyright} 46 private enum State { 47 init, 48 gpx, 49 metadata, 50 wpt, 51 rte, 52 trk, 53 ext, 54 author, 55 link, 56 trkseg, 57 copyright 58 } 47 59 48 60 private String version; -
trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
r8855 r9059 56 56 * </pre> 57 57 */ 58 public class MultiFetchServerObjectReader extends OsmServerReader {58 public class MultiFetchServerObjectReader extends OsmServerReader { 59 59 /** 60 60 * the max. number of primitives retrieved in one step. Assuming IDs with 7 digits, -
trunk/src/org/openstreetmap/josm/io/NoteReader.java
r8851 r9059 40 40 * needs to know which one it is handling. 41 41 */ 42 private enum NoteParseMode {API, DUMP} 42 private enum NoteParseMode { 43 API, 44 DUMP 45 } 43 46 44 47 /** -
trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
r8509 r9059 26 26 return username; 27 27 } 28 28 29 /** 29 30 * Sets the user name … … 33 34 this.username = username; 34 35 } 36 35 37 /** 36 38 * Replies the password … … 40 42 return password; 41 43 } 44 42 45 /** 43 46 * Sets the password … … 47 50 this.password = Utils.copyArray(password); 48 51 } 52 49 53 /** 50 54 * Determines if authentication request has been canceled by user … … 54 58 return canceled; 55 59 } 60 56 61 /** 57 62 * Sets the cancelation status (authentication request canceled by user) … … 61 66 this.canceled = canceled; 62 67 } 68 63 69 /** 64 70 * Determines if authentication credentials should be saved … … 68 74 return saveCredentials; 69 75 } 76 70 77 /** 71 78 * Sets the saving status (authentication credentials to save) -
trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
r8938 r9059 33 33 * 34 34 */ 35 public class PluginDownloadTask extends PleaseWaitRunnable {35 public class PluginDownloadTask extends PleaseWaitRunnable { 36 36 37 37 /** -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r8944 r9059 1164 1164 public boolean accept(File dir, String name) { 1165 1165 return name.endsWith(".jar.new"); 1166 }}); 1166 } 1167 }); 1167 1168 if (files == null) 1168 1169 return; -
trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
r8510 r9059 32 32 */ 33 33 T get(LatLon ll); 34 34 35 /** 35 36 * Look up the property for a coordinate rectangle. -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r9038 r9059 43 43 } 44 44 45 public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING} 45 public enum PolygonIntersection { 46 FIRST_INSIDE_SECOND, 47 SECOND_INSIDE_FIRST, 48 OUTSIDE, 49 CROSSING 50 } 46 51 47 52 /** -
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r8952 r9059 208 208 } 209 209 } 210 210 211 /** 211 212 * use this to set a buttons's mnemonic … … 216 217 } 217 218 } 219 218 220 /** 219 221 * Sets the mnemonic key on a text component. … … 224 226 } 225 227 } 228 226 229 /** 227 230 * use this to set a actions's accelerator -
trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java
r8582 r9059 252 252 } 253 253 } 254 254 255 /** 255 256 * Formats a time to be displayed to current user, based on user preferences.
Note:
See TracChangeset
for help on using the changeset viewer.