Changeset 8399 in josm for trunk/src/org


Ignore:
Timestamp:
2015-05-19T23:04:25+02:00 (10 years ago)
Author:
Don-vip
Message:

see #11397, see #11447 - partial revert of r8308 (SONARJAVA-1061: FP on S1948: no issue should be raised when using Collections of Serializable objects)

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r8390 r8399  
    8888    private String[] bToolTipTexts;
    8989    private transient Icon[] bIcons;
    90     private transient Set<Integer> cancelButtonIdx = Collections.emptySet();
     90    private Set<Integer> cancelButtonIdx = Collections.emptySet();
    9191    private int defaultButtonIdx = 1;
    9292    protected JButton defaultButton = null;
    … …  
    108108    // For easy access when inherited
    109109    protected transient Insets contentInsets = new Insets(10,5,0,5);
    110     protected transient List<JButton> buttons = new ArrayList<>();
     110    protected List<JButton> buttons = new ArrayList<>();
    111111
    112112    /**

  • trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

    r8308 r8399  
    256256     * @since 5803
    257257     */
    258     private transient List <Object> dynamicItems = new ArrayList<>(20);
     258    private List<Object> dynamicItems = new ArrayList<>(20);
    259259
    260260    /**

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r8394 r8399  
    232232    public final HistoryInfoWebAction historyinfoweb = new HistoryInfoWebAction();
    233233    /** View / "Zoom to"... actions */
    234     public final transient Map<String, AutoScaleAction> autoScaleActions = new HashMap<>();
     234    public final Map<String, AutoScaleAction> autoScaleActions = new HashMap<>();
    235235    /** View / Jump to position */
    236236    public final JumpToAction jumpToAct = new JumpToAction();

  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r8378 r8399  
    114114    private final JToolBar toolBarToggle = new JToolBar(JToolBar.VERTICAL);
    115115
    116     private final transient List<ToggleDialog> allDialogs = new ArrayList<>();
    117     private final transient List<MapMode> mapModes = new ArrayList<>();
    118     private final transient List<IconToggleButton> allDialogButtons = new ArrayList<>();
    119     public final transient List<IconToggleButton> allMapModeButtons = new ArrayList<>();
     116    private final List<ToggleDialog> allDialogs = new ArrayList<>();
     117    private final List<MapMode> mapModes = new ArrayList<>();
     118    private final List<IconToggleButton> allDialogButtons = new ArrayList<>();
     119    public final List<IconToggleButton> allMapModeButtons = new ArrayList<>();
    120120
    121121    private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8390 r8399  
    732732        private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct);
    733733
    734         private final transient Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
     734        private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
    735735
    736736        private final JSeparator separator = new JSeparator();

  • trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

    r8308 r8399  
    6666    private JComponent component = null;
    6767
    68     private transient List<JButton> buttons = new ArrayList<>();
     68    private List<JButton> buttons = new ArrayList<>();
    6969
    7070    private Timer timer = new Timer(100, new ActionListener() {

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r8390 r8399  
    827827
    828828        private int selectedIdx;
    829         private final transient List<ComparePairType> compareModes;
     829        private final List<ComparePairType> compareModes;
    830830
    831831        /**

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

    r8308 r8399  
    2323
    2424    private transient TagCollection tags;
    25     private transient List<String> displayedKeys;
    26     private transient Set<String> keysWithConflicts;
     25    private List<String> displayedKeys;
     26    private Set<String> keysWithConflicts;
    2727    private transient Map<String, MultiValueResolutionDecision> decisions;
    2828    private int numConflicts;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r8395 r8399  
    1919
    2020public class DialogsPanel extends JPanel implements Destroyable {
    21     protected transient List<ToggleDialog> allDialogs = new ArrayList<>();
     21    protected List<ToggleDialog> allDialogs = new ArrayList<>();
    2222    protected MultiSplitPane mSpltPane = new MultiSplitPane();
    2323    protected static final int DIVIDER_SIZE = 5;
    … …  
    2626     * Panels that are added to the multisplitpane.
    2727     */
    28     private transient List<JPanel> panels = new ArrayList<>();
     28    private List<JPanel> panels = new ArrayList<>();
    2929
    3030    private final JSplitPane parent;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r8371 r8399  
    532532
    533533    class AddTagsDialog extends AbstractTagsDialog {
    534         private transient List<JosmAction> recentTagsActions = new ArrayList<>();
     534        private List<JosmAction> recentTagsActions = new ArrayList<>();
    535535
    536536        // Counter of added commands for possible undo

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

    r8308 r8399  
    282282        }
    283283
    284         private final transient Collection<Direction> connectionTypesOfInterest = Arrays.asList(
     284        private final Collection<Direction> connectionTypesOfInterest = Arrays.asList(
    285285                WayConnectionType.Direction.FORWARD, WayConnectionType.Direction.BACKWARD);
    286286

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r8392 r8399  
    532532    public class TagTableModel extends AbstractTableModel {
    533533
    534         private transient List<String> keys;
     534        private List<String> keys;
    535535        private PointInTimeType pointInTimeType;
    536536

  • trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

    r8394 r8399  
    10531053
    10541054    protected static class IconPathTableModel extends AbstractTableModel {
    1055         private transient List<String> data;
     1055        private List<String> data;
    10561056        private DefaultListSelectionModel selectionModel;
    10571057

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

    r8378 r8399  
    3030public class ListEditor extends ExtendedDialog {
    3131
    32     private transient List<String> data;
     32    private List<String> data;
    3333    private transient PrefEntry entry;
    3434

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java

    r8382 r8399  
    3939
    4040    private EntryListModel entryModel;
    41     private transient List<List<String>> data;
     41    private List<List<String>> data;
    4242    private transient PrefEntry entry;
    4343

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

    r8382 r8399  
    4949    private MapTableModel tableModel;
    5050
    51     private transient List<List<String>> dataKeys;
    52     private transient List<List<String>> dataValues;
     51    private List<List<String>> dataKeys;
     52    private List<List<String>> dataValues;
    5353    private Integer entryIdx;
    5454

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

    r8308 r8399  
    7777
    7878    private static class LanguageComboBoxModel extends DefaultComboBoxModel<Locale> {
    79         private final transient List<Locale> data = new ArrayList<>();
     79        private final List<Locale> data = new ArrayList<>();
    8080
    8181        public LanguageComboBoxModel(){

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

    r8365 r8399  
    4949        private ProjectionCodeListModel model;
    5050        public JList<String> selectionList;
    51         private transient List<String> data;
    52         private transient List<String> filteredData;
     51        private List<String> data;
     52        private List<String> filteredData;
    5353        private static final String DEFAULT_CODE = "EPSG:3857";
    5454        private String lastCode = DEFAULT_CODE;

  • trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java

    r8308 r8399  
    9797
    9898    private final transient List<Pair<Action,Shortcut>> unregisteredActionShortcuts = new ArrayList<>();
    99     private final transient Set<JosmAction> disabledMenuActions = new HashSet<>();
     99    private final Set<JosmAction> disabledMenuActions = new HashSet<>();
    100100
    101101    @Override
Note: See TracChangeset for help on using the changeset viewer.