Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10254)
@@ -226,9 +226,9 @@
     static class SegmentToKeepSelectionDialog extends ExtendedDialog {
         static final AtomicInteger DISPLAY_COUNT = new AtomicInteger();
-        final Way selectedWay;
-        final List<Way> newWays;
+        final transient Way selectedWay;
+        final transient List<Way> newWays;
         final JList<Way> list;
-        final List<OsmPrimitive> selection;
-        final Way wayToKeep;
+        final transient List<OsmPrimitive> selection;
+        final transient Way wayToKeep;
 
         SegmentToKeepSelectionDialog(Way selectedWay, List<Way> newWays, Way wayToKeep, List<OsmPrimitive> selection) {
Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 10254)
@@ -203,6 +203,6 @@
     static final class PropertiesMembershipDialog extends ExtendedDialog {
 
-        final ExistingBothNewChoice tags;
-        final ExistingBothNewChoice memberships;
+        final transient ExistingBothNewChoice tags;
+        final transient ExistingBothNewChoice memberships;
 
         private PropertiesMembershipDialog(boolean preselectNew, boolean queryTags, boolean queryMemberships) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 10254)
@@ -1794,8 +1794,8 @@
 
     private class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
-        private final List<? extends OsmPrimitive> input;
-        private final List<StyleRecord> output;
-
-        private final ElemStyles styles = MapPaintStyles.getStyles();
+        private final transient List<? extends OsmPrimitive> input;
+        private final transient List<StyleRecord> output;
+
+        private final transient ElemStyles styles = MapPaintStyles.getStyles();
         private final int directExecutionTaskSize;
 
Index: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 10254)
@@ -50,5 +50,5 @@
 public class SplashScreen extends JFrame implements ChangeListener {
 
-    private final SplashProgressMonitor progressMonitor;
+    private final transient SplashProgressMonitor progressMonitor;
     private final SplashScreenProgressRenderer progressRenderer;
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 10254)
@@ -19,7 +19,7 @@
 
 public class DialogsPanel extends JPanel implements Destroyable {
-    protected List<ToggleDialog> allDialogs = new ArrayList<>();
-    protected MultiSplitPane mSpltPane = new MultiSplitPane();
-    protected static final int DIVIDER_SIZE = 5;
+    private final List<ToggleDialog> allDialogs = new ArrayList<>();
+    private final MultiSplitPane mSpltPane = new MultiSplitPane();
+    private static final int DIVIDER_SIZE = 5;
 
     /**
@@ -40,5 +40,5 @@
             throw new IllegalStateException();
         initialized = true;
-        allDialogs = new ArrayList<>();
+        allDialogs.clear();
 
         for (ToggleDialog dialog: pAllDialogs) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10254)
@@ -1230,5 +1230,5 @@
     class TaginfoAction extends JosmAction {
 
-        final StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/");
+        final transient StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/");
 
         TaginfoAction() {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 10254)
@@ -1000,5 +1000,5 @@
 
         class IgnoreTagAction extends AbstractAction {
-            final Tag tag;
+            final transient Tag tag;
 
             IgnoreTagAction(String name, Tag tag) {
Index: /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 10254)
@@ -245,5 +245,5 @@
         private final JosmTextArea lblLat = newTextArea();
         private final JosmTextArea lblLon = newTextArea();
-        private final Updater updater;
+        private final transient Updater updater;
         private final Color modifiedColor;
 
@@ -331,5 +331,5 @@
     private static class MapViewer extends JMapViewer implements ChangeListener {
 
-        private final Updater updater;
+        private final transient Updater updater;
 
         MapViewer(HistoryBrowserModel model) {
@@ -365,5 +365,5 @@
 
         private final JosmTextArea lblDistance = newTextArea();
-        private final Updater updater;
+        private final transient Updater updater;
 
         DistanceViewer(HistoryBrowserModel model) {
Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 10254)
@@ -58,5 +58,5 @@
  * This wizard walks the user to the necessary steps to retrieve an OAuth Access Token which
  * allows JOSM to access the OSM API on the users behalf.
- *
+ * @since 2746
  */
 public class OAuthAuthorizationWizard extends JDialog {
@@ -69,5 +69,5 @@
     private ManualAuthorizationUI pnlManualAuthorisationUI;
     private JScrollPane spAuthorisationProcedureUI;
-    private final Executor executor;
+    private final transient Executor executor;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 10254)
@@ -39,4 +39,6 @@
     private int maxTextLength = -1;
     private boolean useFixedLocale;
+
+    private final transient InputContext privateInputContext = InputContext.getInstance();
 
     /**
@@ -335,6 +337,4 @@
     }
 
-    private final InputContext privateInputContext = InputContext.getInstance();
-
     @Override
     public InputContext getInputContext() {
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 10254)
@@ -96,5 +96,5 @@
      * The types as preparsed collection.
      */
-    public Set<TaggingPresetType> types;
+    public transient Set<TaggingPresetType> types;
     public final transient List<TaggingPresetItem> data = new LinkedList<>();
     public transient Roles roles;
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java	(revision 10253)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java	(revision 10254)
@@ -81,5 +81,5 @@
 
     static class HashSetWithLast<E> extends LinkedHashSet<E> {
-        protected E last;
+        protected transient E last;
 
         @Override