Changeset 8840 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2015-10-09T02:12:45+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 100 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
r8510 r8840 98 98 99 99 /** the current list of tags used as naming tags in relations */ 100 private static List<String> namingTagsForRelations = null;100 private static List<String> namingTagsForRelations; 101 101 102 102 /** -
trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
r8836 r8840 75 75 public class ExtendedDialog extends JDialog { 76 76 private final boolean disposeOnClose; 77 private volatile int result = 0;77 private volatile int result; 78 78 public static final int DialogClosedOtherwise = 0; 79 private boolean toggleable = false;79 private boolean toggleable; 80 80 private String rememberSizePref = ""; 81 private transient WindowGeometry defaultWindowGeometry = null;81 private transient WindowGeometry defaultWindowGeometry; 82 82 private String togglePref = ""; 83 83 private int toggleValue = -1; … … 90 90 private Set<Integer> cancelButtonIdx = Collections.emptySet(); 91 91 private int defaultButtonIdx = 1; 92 protected JButton defaultButton = null;92 protected JButton defaultButton; 93 93 private transient Icon icon; 94 94 private boolean modal; 95 private boolean focusOnDefaultButton = false;95 private boolean focusOnDefaultButton; 96 96 97 97 /** true, if the dialog should include a help button */ … … 304 304 } 305 305 306 private boolean setupDone = false;306 private boolean setupDone; 307 307 308 308 /** -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r8836 r8840 38 38 private final LinkGeneral lg; 39 39 private String content = ""; 40 private boolean contentInitialized = false;40 private boolean contentInitialized; 41 41 42 42 private static final String STYLE = "<style type=\"text/css\">\n" -
trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
r8510 r8840 26 26 public boolean groupbutton; 27 27 private transient ShowHideButtonListener listener; 28 private boolean hideIfDisabled = false;28 private boolean hideIfDisabled; 29 29 private boolean isExpert; 30 30 -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r8836 r8840 386 386 * audioMenu contains all audio-related actions. Be careful, this menu is not guaranteed to be displayed at all 387 387 */ 388 public JMenu audioMenu = null;388 public JMenu audioMenu; 389 389 /** 390 390 * helpMenu contains JOSM general actions (Help, About, etc.) … … 402 402 public final TaggingPresetSearchPrimitiveDialog.Action presetSearchPrimitiveAction = new TaggingPresetSearchPrimitiveDialog.Action(); 403 403 public final DialogsToggleAction dialogsToggleAction = new DialogsToggleAction(); 404 public FullscreenToggleAction fullscreenToggleAction = null;404 public FullscreenToggleAction fullscreenToggleAction; 405 405 406 406 /** … … 1015 1015 private final JTextField searchField; 1016 1016 private final MainMenu mainMenu; 1017 private String currentSearchText = null;1017 private String currentSearchText; 1018 1018 1019 1019 SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) { -
trunk/src/org/openstreetmap/josm/gui/MapMover.java
r8836 r8840 83 83 private final JPanel contentPane; 84 84 85 private boolean movementInPlace = false;85 private boolean movementInPlace; 86 86 87 87 /** -
trunk/src/org/openstreetmap/josm/gui/MapSlider.java
r8836 r8840 17 17 18 18 private final MapView mv; 19 private boolean preventChange = false;19 private boolean preventChange; 20 20 21 21 MapSlider(MapView mv) { -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r8836 r8840 197 197 198 198 // Determines if angle panel is enabled or not 199 private boolean angleEnabled = false;199 private boolean angleEnabled; 200 200 201 201 /** … … 340 340 * popup 341 341 */ 342 private List<JLabel> popupLabels = null;342 private List<JLabel> popupLabels; 343 343 /** 344 344 * The popup displayed to show additional information -
trunk/src/org/openstreetmap/josm/gui/MapView.java
r8646 r8840 123 123 } 124 124 125 public boolean viewportFollowing = false;125 public boolean viewportFollowing; 126 126 127 127 /** … … 240 240 * The play head marker: there is only one of these so it isn't in any specific layer 241 241 */ 242 public transient PlayHeadMarker playHeadMarker = null;242 public transient PlayHeadMarker playHeadMarker; 243 243 244 244 /** … … 342 342 343 343 // remebered geometry of the component 344 private Dimension oldSize = null;345 private Point oldLoc = null;344 private Dimension oldSize; 345 private Point oldLoc; 346 346 347 347 /** … … 535 535 } 536 536 537 private boolean virtualNodesEnabled = false;537 private boolean virtualNodesEnabled; 538 538 539 539 public void setVirtualNodesEnabled(boolean enabled) { -
trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
r8836 r8840 50 50 private int interval; 51 51 private int topFixedCount; 52 private int firstIndex = 0;52 private int firstIndex; 53 53 54 54 private static final int ARROW_ICON_HEIGHT = 10; -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r8836 r8840 189 189 190 190 private final transient Object paintRequestLock = new Object(); 191 private Rectangle paintRect = null;192 private Polygon paintPoly = null;191 private Rectangle paintRect; 192 private Polygon paintPoly; 193 193 194 194 protected transient ViewportData initialViewport; -
trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
r8836 r8840 71 71 private long elapsedTime; 72 72 73 private static NotificationManager INSTANCE = null;73 private static NotificationManager INSTANCE; 74 74 75 75 private static final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230); -
trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
r8795 r8840 24 24 */ 25 25 public abstract class PleaseWaitRunnable implements Runnable, CancelListener { 26 private boolean canceled = false;26 private boolean canceled; 27 27 private boolean ignoreException; 28 28 private final String title; -
trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
r8836 r8840 66 66 67 67 private JViewport vp = new JViewport(); 68 private JComponent component = null;68 private JComponent component; 69 69 70 70 private List<JButton> buttons = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
r8510 r8840 20 20 public class SizeButton extends JComponent { 21 21 22 private int x = 0;23 private int y = 0;22 private int x; 23 private int y; 24 24 25 25 private ImageIcon enlargeImage; 26 26 private ImageIcon shrinkImage; 27 private boolean isEnlarged = false;27 private boolean isEnlarged; 28 28 private final SlippyMapBBoxChooser slippyMapBBoxChooser; 29 29 -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
r8836 r8840 203 203 204 204 /** The horizontal direction of movement, -1:left, 0:stop, 1:right */ 205 private int directionX = 0;205 private int directionX; 206 206 207 207 /** The vertical direction of movement, -1:up, 0:stop, 1:down */ 208 private int directionY = 0;208 private int directionY; 209 209 210 210 /** … … 212 212 * executed via timer) or disabled 213 213 */ 214 protected boolean scheduled = false;214 protected boolean scheduled; 215 215 216 216 protected void setDirectionX(int directionX) { -
trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
r8510 r8840 40 40 private Font font; 41 41 42 private boolean isEnlarged = false;42 private boolean isEnlarged; 43 43 44 44 private int currentMap; -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r8836 r8840 530 530 private static class TileAddressValidator extends AbstractTextComponentValidator { 531 531 532 private TileBounds tileBounds = null;532 private TileBounds tileBounds; 533 533 534 534 TileAddressValidator(JTextComponent tc) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r8510 r8840 67 67 public static final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive"; 68 68 69 private JTabbedPane tabbedPane = null;69 private JTabbedPane tabbedPane; 70 70 private TagMerger tagMerger; 71 71 private NodeListMerger nodeListMerger; -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r8510 r8840 88 88 89 89 private final Set<PropertyChangeListener> listeners; 90 private boolean isFrozen = false;90 private boolean isFrozen; 91 91 private final ComparePairListModel comparePairListModel; 92 92 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
r8510 r8840 23 23 */ 24 24 public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer { 25 private transient Border rowNumberBorder = null;25 private transient Border rowNumberBorder; 26 26 27 27 /** -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
r8513 r8840 17 17 public class TagMergeItem { 18 18 19 private String key = null;20 private String myTagValue = null;21 private String theirTagValue = null;19 private String key; 20 private String myTagValue; 21 private String theirTagValue; 22 22 private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED; 23 23 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
r8510 r8840 38 38 private final transient Set<PropertyChangeListener> listeners; 39 39 40 private int numUndecidedTags = 0;40 private int numUndecidedTags; 41 41 42 42 /** -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r8510 r8840 62 62 private JTabbedPane tpResolvers; 63 63 private Mode mode; 64 private boolean canceled = false;64 private boolean canceled; 65 65 66 66 private final ImageIcon iconResolved; -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
r8513 r8840 28 28 private int numConflicts; 29 29 private PropertyChangeSupport support; 30 private boolean showTagsWithConflictsOnly = false;31 private boolean showTagsWithMultiValuesOnly = false;30 private boolean showTagsWithConflictsOnly; 31 private boolean showTagsWithMultiValuesOnly; 32 32 33 33 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r8540 r8840 34 34 } 35 35 36 public boolean initialized = false; // read only from outside36 public boolean initialized; // read only from outside 37 37 38 38 public void initialize(List<ToggleDialog> pAllDialogs) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r8836 r8840 84 84 85 85 /** Last selected element */ 86 private DefaultMutableTreeNode lastSelectedNode = null;86 private DefaultMutableTreeNode lastSelectedNode; 87 87 88 88 private transient OsmDataLayer linkedLayer; -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r8836 r8840 64 64 private final ZoomInCurrentLayerAction actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction(); 65 65 66 private transient Changeset current = null;66 private transient Changeset current; 67 67 68 68 protected JPanel buildActionButtonPanel() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
r8836 r8840 40 40 private JTable table; 41 41 42 private transient Changeset current = null;42 private transient Changeset current; 43 43 44 44 protected JPanel buildActionButtonPanel() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r8836 r8840 821 821 private List<Integer> position = new ArrayList<>(); 822 822 private Iterable<OsmPrimitive> selection; 823 private String positionString = null;824 private String roleString = null;823 private String positionString; 824 private String roleString; 825 825 826 826 MemberInfo(Iterable<OsmPrimitive> selection) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r8836 r8840 102 102 }; 103 103 104 private String lastAddKey = null;105 private String lastAddValue = null;104 private String lastAddKey; 105 private String lastAddValue; 106 106 107 107 public static final int DEFAULT_LRU_TAGS_NUMBER = 5; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
r8510 r8840 15 15 16 16 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor { 17 private AutoCompletingTextField editor = null;17 private AutoCompletingTextField editor; 18 18 private final transient DataSet ds; 19 19 private final transient Relation relation; 20 20 21 21 /** user input is matched against this list of auto completion items */ 22 private AutoCompletionList autoCompletionList = null;22 private AutoCompletionList autoCompletionList; 23 23 24 24 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
r8510 r8840 51 51 **/ 52 52 private transient List<RelationMember> members; 53 private transient List<WayConnectionType> connectionType = null;53 private transient List<WayConnectionType> connectionType; 54 54 55 55 private DefaultListSelectionModel listSelectionModel; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
r8836 r8840 168 168 } 169 169 170 private Integer firstOneway = null;171 private Node lastOnewayNode = null;172 private Node firstCircular = null;170 private Integer firstOneway; 171 private Node lastOnewayNode; 172 private Node firstCircular; 173 173 174 174 /** -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java
r8510 r8840 36 36 public boolean isLoop; 37 37 38 public boolean isOnewayLoopForwardPart = false;39 public boolean isOnewayLoopBackwardPart = false;40 public boolean isOnewayHead = false;41 public boolean isOnewayTail = false;38 public boolean isOnewayLoopForwardPart; 39 public boolean isOnewayLoopBackwardPart; 40 public boolean isOnewayHead; 41 public boolean isOnewayTail; 42 42 43 43 public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
r8836 r8840 73 73 * that refer to one of the primitives in the filter. 74 74 */ 75 private transient Set<? extends OsmPrimitive> filter = null;75 private transient Set<? extends OsmPrimitive> filter; 76 76 77 77 /** a counter to check if tree has been rebuild */ -
trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
r8836 r8840 42 42 public class BoundingBoxSelection implements DownloadSelection { 43 43 44 private JosmTextField[] latlon = null;44 private JosmTextField[] latlon; 45 45 private final JosmTextArea tfOsmUrl = new JosmTextArea(); 46 46 private final JosmTextArea showUrl = new JosmTextArea(); -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r8836 r8840 75 75 protected JCheckBox cbStartup; 76 76 protected final JLabel sizeCheck = new JLabel(); 77 protected transient Bounds currentBounds = null;77 protected transient Bounds currentBounds; 78 78 protected boolean canceled; 79 79 -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r8836 r8840 184 184 public double lat; 185 185 public double lon; 186 public int zoom = 0;187 public Bounds bounds = null;186 public int zoom; 187 public Bounds bounds; 188 188 189 189 public Bounds getDownloadArea() { … … 198 198 */ 199 199 private static class NameFinderResultParser extends DefaultHandler { 200 private SearchResult currentResult = null;201 private StringBuffer description = null;202 private int depth = 0;200 private SearchResult currentResult; 201 private StringBuffer description; 202 private int depth; 203 203 private List<SearchResult> data = new LinkedList<>(); 204 204 … … 330 330 private HttpURLConnection connection; 331 331 private List<SearchResult> data; 332 private boolean canceled = false;332 private boolean canceled; 333 333 private Server useserver; 334 334 private Exception lastException; … … 452 452 453 453 static class NamedResultTableColumnModel extends DefaultTableColumnModel { 454 private TableColumn col3 = null;455 private TableColumn col4 = null;454 private TableColumn col3; 455 private TableColumn col4; 456 456 protected final void createColumns() { 457 457 TableColumn col = null; -
trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
r8510 r8840 10 10 private HelpBrowser browser; 11 11 private List<String> history; 12 private int historyPos = 0;12 private int historyPos; 13 13 14 14 public HelpBrowserHistory(HelpBrowser browser) { -
trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
r8510 r8840 15 15 class DiffTableModel extends AbstractTableModel { 16 16 private transient List<TwoColumnDiff.Item> rows = new ArrayList<>(); 17 private boolean reversed = false;17 private boolean reversed; 18 18 19 19 public void setRows(List<TwoColumnDiff.Item> rows, boolean reversed) { -
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r8510 r8840 50 50 public class HistoryLoadTask extends PleaseWaitRunnable { 51 51 52 private boolean canceled = false;53 private Exception lastException = null;52 private boolean canceled; 53 private Exception lastException; 54 54 private Set<PrimitiveId> toLoad; 55 55 private HistoryDataSet loadedData; 56 private OsmServerHistoryReader reader = null;56 private OsmServerHistoryReader reader; 57 57 58 58 /** -
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r8836 r8840 89 89 protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) { 90 90 return new TableModelListener() { 91 private Boolean reversed = null;91 private Boolean reversed; 92 92 private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)"); 93 93 private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)"); -
trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
r8836 r8840 62 62 private Object[] reference; 63 63 private Object[] current; 64 boolean referenceReversed = false;64 boolean referenceReversed; 65 65 66 66 TwoColumnDiff(Object[] reference, Object[] current) { -
trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java
r7937 r8840 15 15 public abstract class AbstractUploadDialog extends JDialog { 16 16 17 private boolean canceled = false;17 private boolean canceled; 18 18 19 19 /** -
trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
r8510 r8840 53 53 private DownloadPrimitivesTask mainTask; 54 54 /** Flag indicated that user ask for cancel this task */ 55 private boolean canceled = false;55 private boolean canceled; 56 56 /** Reference to the task currently running */ 57 private PleaseWaitRunnable currentTask = null;57 private PleaseWaitRunnable currentTask; 58 58 59 59 /** -
trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
r8510 r8840 19 19 public class OpenChangesetComboBoxModel extends DefaultComboBoxModel<Changeset> implements ChangesetCacheListener { 20 20 private transient List<Changeset> changesets; 21 private transient Changeset selectedChangeset = null;21 private transient Changeset selectedChangeset; 22 22 23 23 protected Changeset getChangesetById(long id) { -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r8836 r8840 92 92 } 93 93 94 private JButton saveAndProceedActionButton = null;94 private JButton saveAndProceedActionButton; 95 95 96 96 /** -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r8540 r8840 43 43 */ 44 44 public class UploadPrimitivesTask extends AbstractUploadTask { 45 private boolean uploadCanceled = false;46 private Exception lastException = null;45 private boolean uploadCanceled; 46 private Exception lastException; 47 47 private APIDataSet toUpload; 48 48 private OsmServerWriter writer; -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r8513 r8840 61 61 private JMultilineLabel lblMultiChangesetPoliciesHeader; 62 62 63 private long numUploadedObjects = 0;63 private long numUploadedObjects; 64 64 65 65 /** -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
r8659 r8840 30 30 private static final String PREFERENCE_PREFIX = "imagery.cache."; 31 31 32 private static volatile TileLoaderFactory loaderFactoryOverride = null;32 private static volatile TileLoaderFactory loaderFactoryOverride; 33 33 34 34 /** -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r8836 r8840 473 473 */ 474 474 private static final class TileHolder { 475 private Tile t = null;475 private Tile t; 476 476 477 477 public Tile getTile() { … … 1299 1299 1300 1300 private static class TileSetInfo { 1301 public boolean hasVisibleTiles = false;1302 public boolean hasOverzoomedTiles = false;1303 public boolean hasLoadingTiles = false;1301 public boolean hasVisibleTiles; 1302 public boolean hasOverzoomedTiles; 1303 public boolean hasLoadingTiles; 1304 1304 } 1305 1305 -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r8836 r8840 75 75 protected Icon icon; 76 76 77 protected double dx = 0.0;78 protected double dy = 0.0;77 protected double dx; 78 protected double dy; 79 79 80 80 protected GammaImageProcessor gammaImageProcessor = new GammaImageProcessor(); -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r8625 r8840 109 109 * 110 110 */ 111 private boolean background = false;111 private boolean background; 112 112 113 113 /** -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r8836 r8840 109 109 public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer"; 110 110 111 private boolean requiresSaveToFile = false;112 private boolean requiresUploadToServer = false;111 private boolean requiresSaveToFile; 112 private boolean requiresUploadToServer; 113 113 private boolean isChanged = true; 114 114 private int highlightUpdateCount; … … 137 137 138 138 /** the global counter for created data layers */ 139 private static int dataLayerCounter = 0;139 private static int dataLayerCounter; 140 140 141 141 /** -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r8836 r8840 92 92 private static List<GpxData> loadedGpxData = new ArrayList<>(); 93 93 94 private transient GeoImageLayer yLayer = null;94 private transient GeoImageLayer yLayer; 95 95 private double timezone; 96 96 private long delta; … … 237 237 238 238 // remember the last number of matched photos 239 private int lastNumMatched = 0;239 private int lastNumMatched; 240 240 241 241 /** This class is called when the user doesn't find the GPX file he needs in the files that have -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r8836 r8840 93 93 private int currentPhoto = -1; 94 94 95 boolean useThumbs = false;95 boolean useThumbs; 96 96 private ExecutorService thumbsLoaderExecutor = 97 97 Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY)); 98 98 private ThumbsLoader thumbsloader; 99 private boolean thumbsLoaderRunning = false;100 volatile boolean thumbsLoaded = false;99 private boolean thumbsLoaderRunning; 100 volatile boolean thumbsLoaded; 101 101 private BufferedImage offscreenBuffer; 102 102 boolean updateOffscreenBuffer = true; … … 109 109 private static final class Loader extends PleaseWaitRunnable { 110 110 111 private boolean canceled = false;111 private boolean canceled; 112 112 private GeoImageLayer layer; 113 113 private Collection<File> selection; … … 902 902 } 903 903 904 private static volatile List<MapMode> supportedMapModes = null;904 private static volatile List<MapMode> supportedMapModes; 905 905 906 906 /** … … 938 938 } 939 939 940 private MouseAdapter mouseAdapter = null;941 private MapModeChangeListener mapModeListener = null;940 private MouseAdapter mouseAdapter; 941 private MapModeChangeListener mapModeListener; 942 942 943 943 @Override -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
r8836 r8840 33 33 34 34 /** The file that is currently displayed */ 35 private File file = null;35 private File file; 36 36 37 37 /** The image currently displayed */ 38 private transient Image image = null;38 private transient Image image; 39 39 40 40 /** The image currently displayed */ 41 private boolean errorLoading = false;41 private boolean errorLoading; 42 42 43 43 /** The rectangle (in image coordinates) of the image that is visible. This rectangle is calculated 44 44 * each time the zoom is modified */ 45 private Rectangle visibleRect = null;45 private Rectangle visibleRect; 46 46 47 47 /** When a selection is done, the rectangle of the selection (in image coordinates) */ 48 private Rectangle selectedRect = null;48 private Rectangle selectedRect; 49 49 50 50 /** The tracker to load the images */ 51 51 private MediaTracker tracker = new MediaTracker(this); 52 52 53 private String osdText = null;53 private String osdText; 54 54 55 55 private static final int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3; … … 136 136 private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener { 137 137 138 private boolean mouseIsDragging = false;139 private long lastTimeForMousePoint = 0L;140 private Point mousePointInImg = null;138 private boolean mouseIsDragging; 139 private long lastTimeForMousePoint; 140 private Point mousePointInImg; 141 141 142 142 /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
r8512 r8840 23 23 * The flag can used to decide for which image file the EXIF GPS data is (re-)written. 24 24 */ 25 private boolean isNewGpsData = false;25 private boolean isNewGpsData; 26 26 /** Temporary source of GPS time if not correlated with GPX track. */ 27 private Date exifGpsTime = null;27 private Date exifGpsTime; 28 28 Image thumbnail; 29 29 -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
r8836 r8840 46 46 47 47 private ImageDisplay imgDisplay = new ImageDisplay(); 48 private boolean centerView = false;48 private boolean centerView; 49 49 50 50 // Only one instance of that class is present at one time 51 51 private static volatile ImageViewerDialog dialog; 52 52 53 private boolean collapseButtonClicked = false;53 private boolean collapseButtonClicked; 54 54 55 55 static void newInstance() { … … 276 276 } 277 277 278 private transient GeoImageLayer currentLayer = null;279 private transient ImageEntry currentEntry = null;278 private transient GeoImageLayer currentLayer; 279 private transient ImageEntry currentEntry; 280 280 281 281 public void displayImage(GeoImageLayer layer, ImageEntry entry) { -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
r8836 r8840 26 26 public static final int maxSize = 120; 27 27 public static final int minSize = 22; 28 public volatile boolean stop = false;28 public volatile boolean stop; 29 29 private List<ImageEntry> data; 30 30 private GeoImageLayer layer; -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
r8554 r8840 184 184 } 185 185 186 private boolean noUpdates = false;186 private boolean noUpdates; 187 187 188 188 /** selects all rows (=tracks) in the table that are currently visible on the layer*/ -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
r8836 r8840 102 102 103 103 private Area a = new Area(); 104 private boolean cancel = false;105 private int ticks = 0;104 private boolean cancel; 105 private int ticks; 106 106 private Rectangle2D r = new Rectangle2D.Double(); 107 107 -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
r8540 r8840 53 53 54 54 //// Variables used only to check cache validity 55 private boolean computeCacheInSync = false;55 private boolean computeCacheInSync; 56 56 private int computeCacheMaxLineLengthUsed; 57 57 private Color computeCacheColorUsed; -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
r8540 r8840 43 43 44 44 private static class Markers { 45 public boolean timedMarkersOmitted = false;46 public boolean untimedMarkersOmitted = false;45 public boolean timedMarkersOmitted; 46 public boolean untimedMarkersOmitted; 47 47 } 48 48 -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
r8513 r8840 23 23 24 24 private URL audioUrl; 25 private static volatile AudioMarker recentlyPlayedMarker = null;25 private static volatile AudioMarker recentlyPlayedMarker; 26 26 public double syncOffset; 27 public boolean timeFromAudio = false; // as opposed to from the GPX track27 public boolean timeFromAudio; // as opposed to from the GPX track 28 28 29 29 public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) { … … 34 34 } 35 35 36 @Override public void actionPerformed(ActionEvent ev) { 36 @Override 37 public void actionPerformed(ActionEvent ev) { 37 38 play(); 38 39 } -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r8836 r8840 276 276 277 277 protected final ImageIcon symbol; 278 private BufferedImage redSymbol = null;278 private BufferedImage redSymbol; 279 279 public final MarkerLayer parentLayer; 280 280 /** Absolute time of marker in seconds since epoch */ … … 287 287 private CachedLatLon coor; 288 288 289 private boolean erroneous = false;289 private boolean erroneous; 290 290 291 291 public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer, -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r8836 r8840 69 69 */ 70 70 public final List<Marker> data; 71 private boolean mousePressed = false;72 public GpxLayer fromLayer = null;71 private boolean mousePressed; 72 public GpxLayer fromLayer; 73 73 private Marker currentMarker; 74 public AudioMarker syncAudioMarker = null;74 public AudioMarker syncAudioMarker; 75 75 76 76 /** -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
r8510 r8840 35 35 public final class PlayHeadMarker extends Marker { 36 36 37 private Timer timer = null;38 private double animationInterval = 0.0; // seconds39 private static volatile PlayHeadMarker playHead = null;40 private MapMode oldMode = null;37 private Timer timer; 38 private double animationInterval; // seconds 39 private static volatile PlayHeadMarker playHead; 40 private MapMode oldMode; 41 41 private LatLon oldCoor; 42 42 private boolean enabled; 43 private boolean wasPlaying = false;43 private boolean wasPlaying; 44 44 private int dropTolerance; /* pixels */ 45 private boolean jumpToMarker = false;45 private boolean jumpToMarker; 46 46 47 47 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
r8540 r8840 180 180 * session. There should be preference listener updating this cache. 181 181 */ 182 private static volatile Color DEFAULT_TEXT_COLOR = null;182 private static volatile Color DEFAULT_TEXT_COLOR; 183 183 184 184 private static void initDefaultParameters() { -
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
r8836 r8840 96 96 * a JOSM session. Should have a listener listening to preference changes. 97 97 */ 98 private static volatile String DEFAULT_FONT_NAME = null;99 private static volatile Float DEFAULT_FONT_SIZE = null;98 private static volatile String DEFAULT_FONT_NAME; 99 private static volatile Float DEFAULT_FONT_SIZE; 100 100 private static final Object lock = new Object(); 101 101 -
trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
r8459 r8840 37 37 * index of node in parent way or member in parent relation. Must be != null in LINK context. 38 38 */ 39 public Integer index = null;39 public Integer index; 40 40 41 41 /** 42 42 * count of nodes in parent way or members in parent relation. Must be != null in LINK context. 43 43 */ 44 public Integer count = null;44 public Integer count; 45 45 46 46 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
r8289 r8840 36 36 public int width = -1; 37 37 public int height = -1; 38 public int offsetX = 0;39 public int offsetY = 0;38 public int offsetX; 39 public int offsetY; 40 40 41 41 private boolean temporary; … … 54 54 /** 55 55 * Get the image associated with this MapImage object. 56 * 56 * 57 57 * @param disabled {@code} true to request disabled version, {@code false} for the standard version 58 58 * @return the image -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
r8742 r8840 85 85 86 86 private Color backgroundColorOverride; 87 private String css = null;87 private String css; 88 88 private ZipFile zipFile; 89 89 -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java
r8510 r8840 14 14 public int priority; 15 15 public String code; 16 public Collection<XmlCondition> conditions = null;16 public Collection<XmlCondition> conditions; 17 17 18 18 public Prototype(Range range) { -
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r8836 r8840 82 82 private String name = ""; 83 83 private String icon = ""; 84 private ImageIcon ico = null;84 private ImageIcon ico; 85 85 private final Map<String, Object> parameters = new ConcurrentHashMap<>(); 86 86 -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
r8836 r8840 28 28 private final JTree layerTree = new JTree(treeData); 29 29 private final List<WMSImagery.LayerDetails> selectedLayers = new LinkedList<>(); 30 private boolean previouslyShownUnsupportedCrsError = false;30 private boolean previouslyShownUnsupportedCrsError; 31 31 32 32 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
r8836 r8840 155 155 * by the user 156 156 */ 157 private boolean pluginPreferencesActivated = false;157 private boolean pluginPreferencesActivated; 158 158 159 159 protected JPanel buildSearchFieldPanel() { -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r8836 r8840 168 168 169 169 class ValidateApiUrlAction extends AbstractAction implements DocumentListener { 170 private String lastTestedUrl = null;170 private String lastTestedUrl; 171 171 172 172 ValidateApiUrlAction() { -
trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
r8692 r8840 41 41 private final Component dialogParent; 42 42 43 private int currentProgressValue = 0;43 private int currentProgressValue; 44 44 private String customText; 45 45 private String title; -
trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
r8510 r8840 16 16 public class SwingRenderingProgressMonitor extends AbstractProgressMonitor { 17 17 private static final int PROGRESS_BAR_MAX = 100; 18 private int currentProgressValue = 0;18 private int currentProgressValue; 19 19 private ProgressRenderer delegate; 20 20 -
trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
r8760 r8840 19 19 public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{ 20 20 21 protected AutoCompletingTextField editor = null;22 protected transient TagModel currentTag = null;21 protected AutoCompletingTextField editor; 22 protected transient TagModel currentTag; 23 23 24 24 /** the cache of auto completion items derived from the current JOSM data set */ 25 protected transient AutoCompletionManager autocomplete = null;25 protected transient AutoCompletionManager autocomplete; 26 26 27 27 /** user input is matched against this list of auto completion items */ 28 protected AutoCompletionList autoCompletionList = null;28 protected AutoCompletionList autoCompletionList; 29 29 30 30 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
r8510 r8840 20 20 */ 21 21 public class TagCellRenderer extends JLabel implements TableCellRenderer { 22 private Font fontStandard = null;23 private Font fontItalic = null;22 private Font fontStandard; 23 private Font fontItalic; 24 24 25 25 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
r8836 r8840 38 38 39 39 /** indicates whether the model is dirty */ 40 private boolean dirty = false;40 private boolean dirty; 41 41 private final PropertyChangeSupport propChangeSupport = new PropertyChangeSupport(this); 42 42 -
trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
r8510 r8840 8 8 9 9 /** the name of the tag */ 10 private String name = null;10 private String name; 11 11 12 12 /** the list of values */ 13 private List<String> values = null;13 private List<String> values; 14 14 15 15 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r8836 r8840 57 57 public class TagTable extends JTable { 58 58 /** the table cell editor used by this table */ 59 private TagCellEditor editor = null;59 private TagCellEditor editor; 60 60 private final TagEditorModel model; 61 61 private Component nextFocusComponent; … … 367 367 368 368 /** the delete action */ 369 private RunnableAction deleteAction = null;369 private RunnableAction deleteAction; 370 370 371 371 /** the add action */ 372 private RunnableAction addAction = null;372 private RunnableAction addAction; 373 373 374 374 /** the tag paste action */ 375 private RunnableAction pasteAction = null;375 private RunnableAction pasteAction; 376 376 377 377 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r8836 r8840 77 77 public static final int DIALOG_ANSWER_CANCEL = 3; 78 78 79 public TaggingPresetMenu group = null;79 public TaggingPresetMenu group; 80 80 public String name; 81 81 public String iconName; … … 212 212 213 213 private static class PresetPanel extends JPanel { 214 private boolean hasElements = false;214 private boolean hasElements; 215 215 216 216 PresetPanel() { … … 414 414 * True whenever the original selection given into createSelection was empty 415 415 */ 416 private boolean originalSelectionEmpty = false;416 private boolean originalSelectionEmpty; 417 417 418 418 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
r8836 r8840 81 81 } 82 82 83 private static int auto_increment_selected = 0;83 private static int auto_increment_selected; 84 84 /** Translatation of "<different>". Use in combo boxes to display en entry matching several different values. */ 85 85 public static final String DIFFERENT = tr("<different>"); … … 189 189 public SearchCompiler.Match memberExpression; 190 190 191 public boolean required = false;192 private long count = 0;191 public boolean required; 192 private long count; 193 193 194 194 public void setType(String types) throws SAXException { … … 307 307 public static class Usage { 308 308 private SortedSet<String> values; 309 private boolean hadKeys = false;310 private boolean hadEmpty = false;309 private boolean hadKeys; 310 private boolean hadEmpty; 311 311 312 312 public boolean hasUniqueValue() { … … 885 885 public String value_off = OsmUtils.falseval; 886 886 /** whether the off value is disabled in the dialog, i.e., only unset or yes are provided */ 887 public boolean disable_off = false;887 public boolean disable_off; 888 888 /** "on" or "off" or unset (default is unset) */ 889 public String default_ = null; // only used for tagless objects889 public String default_; // only used for tagless objects 890 890 891 891 private QuadStateCheckBox check; … … 1010 1010 protected JComponent component; 1011 1011 protected final Map<String, PresetListEntry> lhm = new LinkedHashMap<>(); 1012 private boolean initialized = false;1012 private boolean initialized; 1013 1013 protected Usage usage; 1014 1014 protected Object originalValue; -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
r8510 r8840 25 25 26 26 public class TaggingPresetMenu extends TaggingPreset { 27 public JMenu menu = null; // set by TaggingPresets27 public JMenu menu; // set by TaggingPresets 28 28 29 29 private static class PresetTextComparator implements Comparator<JMenuItem>, Serializable { -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
r8710 r8840 50 50 } 51 51 52 private static volatile File zipIcons = null;52 private static volatile File zipIcons; 53 53 private static volatile boolean loadIcons = true; 54 54 … … 103 103 104 104 static class HashSetWithLast<E> extends LinkedHashSet<E> { 105 protected E last = null;105 protected E last; 106 106 107 107 @Override -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
r8836 r8840 47 47 class AutoCompletingComboBoxDocument extends PlainDocument { 48 48 private final JosmComboBox<AutoCompletionListItem> comboBox; 49 private boolean selecting = false;49 private boolean selecting; 50 50 51 51 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
r8513 r8840 119 119 120 120 /** the auto completion list user input is matched against */ 121 protected AutoCompletionList autoCompletionList = null;121 protected AutoCompletionList autoCompletionList; 122 122 /** a string which should not be auto completed */ 123 protected String noAutoCompletionString = null;123 protected String noAutoCompletionString; 124 124 125 125 @Override -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
r8510 r8840 33 33 34 34 /** the bare list of AutoCompletionItems */ 35 private transient List<AutoCompletionListItem> list = null;35 private transient List<AutoCompletionListItem> list; 36 36 /** the filtered list of AutoCompletionItems */ 37 private transient ArrayList<AutoCompletionListItem> filtered = null;37 private transient ArrayList<AutoCompletionListItem> filtered; 38 38 /** the filter expression */ 39 private String filter = null;39 private String filter; 40 40 /** map from value to priority */ 41 41 private transient Map<String, AutoCompletionListItem> valutToItemMap; -
trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
r8510 r8840 40 40 * we don't know yet 41 41 */ 42 private Boolean valid = null;42 private Boolean valid; 43 43 // remember the message 44 44 private String msg; -
trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
r8836 r8840 28 28 public class BoundingBoxSelectionPanel extends JPanel { 29 29 30 private JosmTextField[] tfLatLon = null;30 private JosmTextField[] tfLatLon; 31 31 private final JosmTextField tfOsmUrl = new JosmTextField(); 32 32 -
trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java
r8513 r8840 44 44 public static class ChangesetIdValidator extends AbstractTextComponentValidator { 45 45 46 private int id = 0;46 private int id; 47 47 48 48 /** -
trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java
r6911 r8840 21 21 public class JMultilineLabel extends JEditorPane { 22 22 private int maxWidth = Integer.MAX_VALUE; 23 private Rectangle oldbounds = null;24 private Dimension oldPreferred = null;23 private Rectangle oldbounds; 24 private Dimension oldPreferred; 25 25 26 26 /** -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r8510 r8840 819 819 */ 820 820 public abstract static class Node { 821 private Split parent = null;821 private Split parent; 822 822 private Rectangle bounds = new Rectangle(); 823 private double weight = 0.0;823 private double weight; 824 824 825 825 /** -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
r8512 r8840 47 47 */ 48 48 public class MultiSplitPane extends JPanel { 49 private transient AccessibleContext accessibleContext = null;49 private transient AccessibleContext accessibleContext; 50 50 private boolean continuousLayout = true; 51 51 private transient DividerPainter dividerPainter = new DefaultDividerPainter(); … … 219 219 } 220 220 221 private boolean dragUnderway = false;222 private transient MultiSplitLayout.Divider dragDivider = null;223 private Rectangle initialDividerBounds = null;221 private boolean dragUnderway; 222 private transient MultiSplitLayout.Divider dragDivider; 223 private Rectangle initialDividerBounds; 224 224 private boolean oldFloatingDividers = true; 225 private int dragOffsetX = 0;226 private int dragOffsetY = 0;225 private int dragOffsetX; 226 private int dragOffsetY; 227 227 private int dragMin = -1; 228 228 private int dragMax = -1; -
trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
r8415 r8840 45 45 private static final String EDITABLE = "editable"; 46 46 47 protected JTextComponent component = null;47 protected JTextComponent component; 48 48 protected boolean undoRedo; 49 49 protected final UndoAction undoAction = new UndoAction();
Note:
See TracChangeset
for help on using the changeset viewer.