Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9623)
@@ -55,5 +55,5 @@
 public class JoinAreasAction extends JosmAction {
     // This will be used to commit commands and unite them into one large command sequence at the end
-    private final LinkedList<Command> cmds = new LinkedList<>();
+    private final transient LinkedList<Command> cmds = new LinkedList<>();
     private int cmdsCount;
     private final transient List<Relation> addedRelations = new LinkedList<>();
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9623)
@@ -101,5 +101,5 @@
      * Collection of nodes that is moved
      */
-    private List<Node> movingNodeList;
+    private transient List<Node> movingNodeList;
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java	(revision 9623)
@@ -308,8 +308,8 @@
     private static class Worker extends RecursiveTask<List<PolygonLevel>> {
 
-        private final List<JoinedPolygon> input;
+        private final transient List<JoinedPolygon> input;
         private final int from;
         private final int to;
-        private final List<PolygonLevel> output;
+        private final transient List<PolygonLevel> output;
         private final int directExecutionTaskSize;
 
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9623)
@@ -1184,5 +1184,5 @@
     }
 
-    private final CopyOnWriteArrayList<RepaintListener> repaintListeners = new CopyOnWriteArrayList<>();
+    private final transient CopyOnWriteArrayList<RepaintListener> repaintListeners = new CopyOnWriteArrayList<>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 9623)
@@ -318,5 +318,5 @@
         return pb;
     }
-    
+
     /**
      * @param r rectangle
@@ -605,6 +605,6 @@
     }
 
-    private final Stack<ZoomData> zoomUndoBuffer = new Stack<>();
-    private final Stack<ZoomData> zoomRedoBuffer = new Stack<>();
+    private final transient Stack<ZoomData> zoomUndoBuffer = new Stack<>();
+    private final transient Stack<ZoomData> zoomRedoBuffer = new Stack<>();
     private Date zoomTimestamp = new Date();
 
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(revision 9623)
@@ -127,6 +127,6 @@
 
     // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX)
-    private ICoordinate iSelectionRectStart;
-    private ICoordinate iSelectionRectEnd;
+    private transient ICoordinate iSelectionRectStart;
+    private transient ICoordinate iSelectionRectEnd;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9623)
@@ -139,5 +139,5 @@
     private final ReadOnlyTableModel tagData = new ReadOnlyTableModel();
     private final PropertiesCellRenderer cellRenderer = new PropertiesCellRenderer();
-    private final TableRowSorter<ReadOnlyTableModel> tagRowSorter = new TableRowSorter<>(tagData);
+    private final transient TableRowSorter<ReadOnlyTableModel> tagRowSorter = new TableRowSorter<>(tagData);
     private final JosmTextField tagTableFilter;
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 9623)
@@ -54,8 +54,8 @@
     private final transient List<RelationMember> members;
     private transient List<WayConnectionType> connectionType;
-    private final Relation relation;
+    private final transient Relation relation;
 
     private DefaultListSelectionModel listSelectionModel;
-    private final CopyOnWriteArrayList<IMemberModelListener> listeners;
+    private final transient CopyOnWriteArrayList<IMemberModelListener> listeners;
     private final transient OsmDataLayer layer;
     private final transient TaggingPresetHandler presetHandler;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 9623)
@@ -68,5 +68,5 @@
     private JPanel pnlActionButtonsPanel;
     private JPanel pnlResult;
-    private final Executor executor;
+    private final transient Executor executor;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java	(revision 9623)
@@ -47,5 +47,5 @@
     private JCheckBox cbSaveToPreferences;
     private HtmlPanel pnlMessage;
-    private final Executor executor;
+    private final transient Executor executor;
 
     protected JPanel buildAccessTokenPanel() {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java	(revision 9623)
@@ -47,6 +47,6 @@
     private RetrieveAccessTokenPanel pnlRetrieveAccessToken;
     private ShowAccessTokenPanel pnlShowAccessToken;
-    private final Executor executor;
-    
+    private final transient Executor executor;
+
     /**
      * build the UI
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 9623)
@@ -56,5 +56,5 @@
     /** indicates whether to use the default OSM URL or not */
     private JCheckBox cbUseDefaultServerUrl;
-    private final CollectionProperty SERVER_URL_HISTORY = new CollectionProperty("osm-server.url-history", Arrays.asList(
+    private final transient CollectionProperty SERVER_URL_HISTORY = new CollectionProperty("osm-server.url-history", Arrays.asList(
             "http://api06.dev.openstreetmap.org/api", "http://master.apis.dev.openstreetmap.org/api"));
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 9623)
@@ -46,5 +46,5 @@
     private final DefaultListSelectionModel colSelectionModel;
 
-    private OsmPrimitive primitive;
+    private transient OsmPrimitive primitive;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 9622)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 9623)
@@ -97,5 +97,5 @@
      */
     public Set<TaggingPresetType> types;
-    public final List<TaggingPresetItem> data = new LinkedList<>();
+    public final transient List<TaggingPresetItem> data = new LinkedList<>();
     public transient Roles roles;
     public transient TemplateEntry nameTemplate;