Context Navigation

Changeset 8840 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-10-09T02:12:45+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S3052 - Fields should not be initialized to default values

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

-              r8742
+              r8840
      * know what id it will get.
      */
     protected long id = 0;
+    protected long id;
     /**
 …
      * Never changed by JOSM.
      */
     protected User user = null;
+    protected User user;
     /**
 …
      * ensure update consistency
      */
     protected int version = 0;
+    protected int version;
     /**

-              r8512
+              r8840
     private boolean incomplete;
     /** the changeset content */
     private ChangesetDataSet content = null;
+    private ChangesetDataSet content;
     /** the changeset discussion */
     private List<ChangesetDiscussionComment> discussion = null;
+    private List<ChangesetDiscussionComment> discussion;
     /**

r8512	r8840
121	121	private int highlightUpdateCount;
122	122
123		private boolean uploadDiscouraged ~~= false~~;
	123	private boolean uploadDiscouraged;
124	124
125	125	private final ReadWriteLock lock = new ReentrantReadWriteLock();

-              r8812
+              r8840
     public boolean enable = true;
     public boolean hiding = false;
     public boolean inverted = false;
+    public boolean hiding;
+    public boolean inverted;
     /**
 …
     public static class FilterPreferenceEntry {
         @pref @writeExplicitly public String version = "1";
         @pref public String text = null;
+        @pref public String text;
         @pref @writeExplicitly public String mode = "add";
         @pref public boolean case_sensitive = false;
         @pref public boolean regex_search = false;
         @pref public boolean mapCSS_search = false;
+        @pref public boolean case_sensitive;
+        @pref public boolean regex_search;
+        @pref public boolean mapCSS_search;
         @pref @writeExplicitly public boolean enable = true;
         @pref @writeExplicitly public boolean hiding = false;
         @pref @writeExplicitly public boolean inverted = false;
+        @pref @writeExplicitly public boolean hiding;
+        @pref @writeExplicitly public boolean inverted;
+    }

r8510	r8840
27	27
28	28	private final Storage<Note> noteList;
29		private Note selectedNote ~~= null~~;
	29	private Note selectedNote;
30	30	private Comparator<Note> comparator = DEFAULT_COMPARATOR;
31	31

-              r8811
+              r8840
      * MAPPAINT
      *--------*/
     public StyleCache mappaintStyle = null;
+    public StyleCache mappaintStyle;
     public int mappaintCacheIdx;
 …
      *--------------------------------------------------*/
     private static volatile Collection<String> workinprogress = null;
     private static volatile Collection<String> uninteresting = null;
     private static volatile Collection<String> discardable = null;
+    private static volatile Collection<String> workinprogress;
+    private static volatile Collection<String> uninteresting;
+    private static volatile Collection<String> discardable;
     /**
 …
+    }
     private static volatile Match directionKeys = null;
     private static volatile Match reversedDirectionKeys = null;
+    private static volatile Match directionKeys;
+    private static volatile Match reversedDirectionKeys;
     /**

-              r8510
+              r8840
     private int mask;
     private int size;
     private volatile int modCount = 0;
+    private volatile int modCount;
     private double loadFactor = 0.6d;
     private static final int DEFAULT_CAPACITY = 16;
 …
     private final class SafeReadonlyIter implements Iterator<T> {
         private final T[] data;
         private int slot = 0;
+        private int slot;
         SafeReadonlyIter(T[] data) {
 …
     private final class Iter implements Iterator<T> {
         private final int mods;
         private int slot = 0;
+        private int slot;
         private int removeSlot = -1;

-              r8588
+              r8840
 public final class User {
     private static long uidCounter = 0;
+    private static long uidCounter;
     /**
 …
+    }
     private static User lastUser = null;
+    private static User lastUser;
     /**

r8510	r8840
23	23	public class BoundingXYVisitor extends AbstractVisitor {
24	24
25		private ProjectionBounds bounds ~~= null~~;
	25	private ProjectionBounds bounds;
26	26
27	27	@Override

r8540	r8840
109	109
110	110	private final List<Descriptor> descriptors = new ArrayList<>();
111		private Class<? extends AbstractMapRenderer> activeRenderer ~~= null~~;
	111	private Class<? extends AbstractMapRenderer> activeRenderer;
112	112
113	113	private MapRendererFactory() {

r8674	r8840
35	35	private final Color defaultColor;
36	36
37		private static volatile Color backgroundColorCache ~~= null~~;
	37	private static volatile Color backgroundColorCache;
38	38
39	39	private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {

r8839	r8840
103	103	private int idx;
104	104
105		private Point prev ~~= null~~;
	105	private Point prev;
106	106	/* 'prev0' is a point that has distance 'offset' from 'prev' and the
107	107	* line from 'prev' to 'prev0' is perpendicular to the way segment from

r8512	r8840
74	74
75	75	/** Color cache to draw subsequent segments of same color as one <code>Path</code>. */
76		protected Color currentColor ~~= null~~;
	76	protected Color currentColor;
77	77	/** Path store to draw subsequent segments of same color as one <code>Path</code>. */
78	78	protected GeneralPath currentPath = new GeneralPath();

Note: See TracChangeset for help on using the changeset viewer.