Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 8399)
@@ -88,5 +88,5 @@
     private String[] bToolTipTexts;
     private transient Icon[] bIcons;
-    private transient Set<Integer> cancelButtonIdx = Collections.emptySet();
+    private Set<Integer> cancelButtonIdx = Collections.emptySet();
     private int defaultButtonIdx = 1;
     protected JButton defaultButton = null;
@@ -108,5 +108,5 @@
     // For easy access when inherited
     protected transient Insets contentInsets = new Insets(10,5,0,5);
-    protected transient List<JButton> buttons = new ArrayList<>();
+    protected List<JButton> buttons = new ArrayList<>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 8399)
@@ -256,5 +256,5 @@
      * @since 5803
      */
-    private transient List <Object> dynamicItems = new ArrayList<>(20);
+    private List<Object> dynamicItems = new ArrayList<>(20);
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8399)
@@ -232,5 +232,5 @@
     public final HistoryInfoWebAction historyinfoweb = new HistoryInfoWebAction();
     /** View / "Zoom to"... actions */
-    public final transient Map<String, AutoScaleAction> autoScaleActions = new HashMap<>();
+    public final Map<String, AutoScaleAction> autoScaleActions = new HashMap<>();
     /** View / Jump to position */
     public final JumpToAction jumpToAct = new JumpToAction();
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 8399)
@@ -114,8 +114,8 @@
     private final JToolBar toolBarToggle = new JToolBar(JToolBar.VERTICAL);
 
-    private final transient List<ToggleDialog> allDialogs = new ArrayList<>();
-    private final transient List<MapMode> mapModes = new ArrayList<>();
-    private final transient List<IconToggleButton> allDialogButtons = new ArrayList<>();
-    public final transient List<IconToggleButton> allMapModeButtons = new ArrayList<>();
+    private final List<ToggleDialog> allDialogs = new ArrayList<>();
+    private final List<MapMode> mapModes = new ArrayList<>();
+    private final List<IconToggleButton> allDialogButtons = new ArrayList<>();
+    public final List<IconToggleButton> allMapModeButtons = new ArrayList<>();
 
     private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 8399)
@@ -732,5 +732,5 @@
         private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct);
 
-        private final transient Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
+        private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
 
         private final JSeparator separator = new JSeparator();
Index: trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 8399)
@@ -66,5 +66,5 @@
     private JComponent component = null;
 
-    private transient List<JButton> buttons = new ArrayList<>();
+    private List<JButton> buttons = new ArrayList<>();
 
     private Timer timer = new Timer(100, new ActionListener() {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8399)
@@ -827,5 +827,5 @@
 
         private int selectedIdx;
-        private final transient List<ComparePairType> compareModes;
+        private final List<ComparePairType> compareModes;
 
         /**
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 8399)
@@ -23,6 +23,6 @@
 
     private transient TagCollection tags;
-    private transient List<String> displayedKeys;
-    private transient Set<String> keysWithConflicts;
+    private List<String> displayedKeys;
+    private Set<String> keysWithConflicts;
     private transient Map<String, MultiValueResolutionDecision> decisions;
     private int numConflicts;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 8399)
@@ -19,5 +19,5 @@
 
 public class DialogsPanel extends JPanel implements Destroyable {
-    protected transient List<ToggleDialog> allDialogs = new ArrayList<>();
+    protected List<ToggleDialog> allDialogs = new ArrayList<>();
     protected MultiSplitPane mSpltPane = new MultiSplitPane();
     protected static final int DIVIDER_SIZE = 5;
@@ -26,5 +26,5 @@
      * Panels that are added to the multisplitpane.
      */
-    private transient List<JPanel> panels = new ArrayList<>();
+    private List<JPanel> panels = new ArrayList<>();
 
     private final JSplitPane parent;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8399)
@@ -532,5 +532,5 @@
 
     class AddTagsDialog extends AbstractTagsDialog {
-        private transient List<JosmAction> recentTagsActions = new ArrayList<>();
+        private List<JosmAction> recentTagsActions = new ArrayList<>();
 
         // Counter of added commands for possible undo
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java	(revision 8399)
@@ -282,5 +282,5 @@
         }
 
-        private final transient Collection<Direction> connectionTypesOfInterest = Arrays.asList(
+        private final Collection<Direction> connectionTypesOfInterest = Arrays.asList(
                 WayConnectionType.Direction.FORWARD, WayConnectionType.Direction.BACKWARD);
 
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 8399)
@@ -532,5 +532,5 @@
     public class TagTableModel extends AbstractTableModel {
 
-        private transient List<String> keys;
+        private List<String> keys;
         private PointInTimeType pointInTimeType;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 8399)
@@ -1053,5 +1053,5 @@
 
     protected static class IconPathTableModel extends AbstractTableModel {
-        private transient List<String> data;
+        private List<String> data;
         private DefaultListSelectionModel selectionModel;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java	(revision 8399)
@@ -30,5 +30,5 @@
 public class ListEditor extends ExtendedDialog {
 
-    private transient List<String> data;
+    private List<String> data;
     private transient PrefEntry entry;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java	(revision 8399)
@@ -39,5 +39,5 @@
 
     private EntryListModel entryModel;
-    private transient List<List<String>> data;
+    private List<List<String>> data;
     private transient PrefEntry entry;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 8399)
@@ -49,6 +49,6 @@
     private MapTableModel tableModel;
 
-    private transient List<List<String>> dataKeys;
-    private transient List<List<String>> dataValues;
+    private List<List<String>> dataKeys;
+    private List<List<String>> dataValues;
     private Integer entryIdx;
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java	(revision 8399)
@@ -77,5 +77,5 @@
 
     private static class LanguageComboBoxModel extends DefaultComboBoxModel<Locale> {
-        private final transient List<Locale> data = new ArrayList<>();
+        private final List<Locale> data = new ArrayList<>();
 
         public LanguageComboBoxModel(){
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 8399)
@@ -49,6 +49,6 @@
         private ProjectionCodeListModel model;
         public JList<String> selectionList;
-        private transient List<String> data;
-        private transient List<String> filteredData;
+        private List<String> data;
+        private List<String> filteredData;
         private static final String DEFAULT_CODE = "EPSG:3857";
         private String lastCode = DEFAULT_CODE;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java	(revision 8398)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java	(revision 8399)
@@ -97,5 +97,5 @@
 
     private final transient List<Pair<Action,Shortcut>> unregisteredActionShortcuts = new ArrayList<>();
-    private final transient Set<JosmAction> disabledMenuActions = new HashSet<>();
+    private final Set<JosmAction> disabledMenuActions = new HashSet<>();
 
     @Override