Changeset 10254 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2016-05-20T22:21:01+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
r10174 r10254 226 226 static class SegmentToKeepSelectionDialog extends ExtendedDialog { 227 227 static final AtomicInteger DISPLAY_COUNT = new AtomicInteger(); 228 final Way selectedWay; 229 final List<Way> newWays; 228 final transient Way selectedWay; 229 final transient List<Way> newWays; 230 230 final JList<Way> list; 231 final List<OsmPrimitive> selection; 232 final Way wayToKeep; 231 final transient List<OsmPrimitive> selection; 232 final transient Way wayToKeep; 233 233 234 234 SegmentToKeepSelectionDialog(Way selectedWay, List<Way> newWays, Way wayToKeep, List<OsmPrimitive> selection) { -
trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
r10181 r10254 203 203 static final class PropertiesMembershipDialog extends ExtendedDialog { 204 204 205 final ExistingBothNewChoice tags; 206 final ExistingBothNewChoice memberships; 205 final transient ExistingBothNewChoice tags; 206 final transient ExistingBothNewChoice memberships; 207 207 208 208 private PropertiesMembershipDialog(boolean preselectNew, boolean queryTags, boolean queryMemberships) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r10216 r10254 1794 1794 1795 1795 private class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor { 1796 private final List<? extends OsmPrimitive> input; 1797 private final List<StyleRecord> output; 1798 1799 private final ElemStyles styles = MapPaintStyles.getStyles(); 1796 private final transient List<? extends OsmPrimitive> input; 1797 private final transient List<StyleRecord> output; 1798 1799 private final transient ElemStyles styles = MapPaintStyles.getStyles(); 1800 1800 private final int directExecutionTaskSize; 1801 1801 -
trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
r10173 r10254 50 50 public class SplashScreen extends JFrame implements ChangeListener { 51 51 52 private final SplashProgressMonitor progressMonitor; 52 private final transient SplashProgressMonitor progressMonitor; 53 53 private final SplashScreenProgressRenderer progressRenderer; 54 54 -
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r10001 r10254 19 19 20 20 public class DialogsPanel extends JPanel implements Destroyable { 21 pr otectedList<ToggleDialog> allDialogs = new ArrayList<>();22 pr otectedMultiSplitPane mSpltPane = new MultiSplitPane();23 pr otectedstatic final int DIVIDER_SIZE = 5;21 private final List<ToggleDialog> allDialogs = new ArrayList<>(); 22 private final MultiSplitPane mSpltPane = new MultiSplitPane(); 23 private static final int DIVIDER_SIZE = 5; 24 24 25 25 /** … … 40 40 throw new IllegalStateException(); 41 41 initialized = true; 42 allDialogs = new ArrayList<>();42 allDialogs.clear(); 43 43 44 44 for (ToggleDialog dialog: pAllDialogs) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r10228 r10254 1230 1230 class TaginfoAction extends JosmAction { 1231 1231 1232 final StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/"); 1232 final transient StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/"); 1233 1233 1234 1234 TaginfoAction() { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r10250 r10254 1000 1000 1001 1001 class IgnoreTagAction extends AbstractAction { 1002 final Tag tag; 1002 final transient Tag tag; 1003 1003 1004 1004 IgnoreTagAction(String name, Tag tag) { -
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r10210 r10254 245 245 private final JosmTextArea lblLat = newTextArea(); 246 246 private final JosmTextArea lblLon = newTextArea(); 247 private final Updater updater; 247 private final transient Updater updater; 248 248 private final Color modifiedColor; 249 249 … … 331 331 private static class MapViewer extends JMapViewer implements ChangeListener { 332 332 333 private final Updater updater; 333 private final transient Updater updater; 334 334 335 335 MapViewer(HistoryBrowserModel model) { … … 365 365 366 366 private final JosmTextArea lblDistance = newTextArea(); 367 private final Updater updater; 367 private final transient Updater updater; 368 368 369 369 DistanceViewer(HistoryBrowserModel model) { -
trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
r10183 r10254 58 58 * This wizard walks the user to the necessary steps to retrieve an OAuth Access Token which 59 59 * allows JOSM to access the OSM API on the users behalf. 60 * 60 * @since 2746 61 61 */ 62 62 public class OAuthAuthorizationWizard extends JDialog { … … 69 69 private ManualAuthorizationUI pnlManualAuthorisationUI; 70 70 private JScrollPane spAuthorisationProcedureUI; 71 private final Executor executor; 71 private final transient Executor executor; 72 72 73 73 /** -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
r10132 r10254 39 39 private int maxTextLength = -1; 40 40 private boolean useFixedLocale; 41 42 private final transient InputContext privateInputContext = InputContext.getInstance(); 41 43 42 44 /** … … 335 337 } 336 338 337 private final InputContext privateInputContext = InputContext.getInstance();338 339 339 @Override 340 340 public InputContext getInputContext() { -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
r9991 r10254 96 96 * The types as preparsed collection. 97 97 */ 98 public Set<TaggingPresetType> types; 98 public transient Set<TaggingPresetType> types; 99 99 public final transient List<TaggingPresetItem> data = new LinkedList<>(); 100 100 public transient Roles roles; -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
r9799 r10254 81 81 82 82 static class HashSetWithLast<E> extends LinkedHashSet<E> { 83 protected E last; 83 protected transient E last; 84 84 85 85 @Override
Note:
See TracChangeset
for help on using the changeset viewer.