Context Navigation

data

Timestamp:

2015-11-23T01:09:15+01:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm/data

Files:

r8836	r9059
190	190	return null;
191	191	}
	192
192	193	/**
193	194	* Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null

-              r8380
+              r9059
      * while others indicate the note being opened, closed or reopened
      */
+    public enum Action {opened, closed, reopened, commented}
+    public enum Action {
+        opened,
+        closed,
+        reopened,
+        commented
+    }
     /**

r8510	r9059
32	32	*
33	33	*/
34		public final class ChangesetCache implements PreferenceChangedListener{
	34	public final class ChangesetCache implements PreferenceChangedListener {
35	35	/** the unique instance */
36	36	private static final ChangesetCache instance = new ChangesetCache();

r8510	r9059
7	7	import java.util.Set;
8	8
9		public class DefaultChangesetCacheEvent implements ChangesetCacheEvent{
	9	public class DefaultChangesetCacheEvent implements ChangesetCacheEvent {
10	10
11	11	private final Set<Changeset> added;

r8510	r9059
87	87	}
88	88
89		public ~~final~~ void visitAll() {
	89	public void visitAll() {
90	90	for (OsmPrimitive osm : primitives) {
91	91	firstIteration = true;

-              r6830
+              r9059
 public abstract class AbstractDatasetChangedEvent {
+    public enum DatasetEventType {DATA_CHANGED, NODE_MOVED, PRIMITIVES_ADDED, PRIMITIVES_REMOVED,
+        RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED, CHANGESET_ID_CHANGED}
+    public enum DatasetEventType {
+        DATA_CHANGED,
+        NODE_MOVED,
+        PRIMITIVES_ADDED,
+        PRIMITIVES_REMOVED,
+        RELATION_MEMBERS_CHANGED,
+        TAGS_CHANGED,
+        WAY_NODES_CHANGED,
+        CHANGESET_ID_CHANGED
+    }
     protected final DataSet dataSet;

-              r8836
+              r9059
         IN_EDT,
         /**
+         * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to
+         * one event
+         * Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to one event
          */
+        IN_EDT_CONSOLIDATED}
+        IN_EDT_CONSOLIDATED
+    }
     private static class ListenerInfo {

r8510	r9059
27	27	* @since 1670
28	28	*/
29		public class HistoryDataSet implements LayerChangeListener{
	29	public class HistoryDataSet implements LayerChangeListener {
30	30	/** the unique instance */
31	31	private static HistoryDataSet historyDataSet;

r8540	r9059
19	19	*
20	20	*/
21		public class HistoryRelation extends HistoryOsmPrimitive{
	21	public class HistoryRelation extends HistoryOsmPrimitive {
22	22
23	23	private List<RelationMemberData> members = new ArrayList<>();

-              r6380
+              r9059
      */
     void visit(Node n);
     /**
      * Visiting call for lines.
 …
      */
     void visit(Way w);
     /**
      * Visiting call for relations.
 …
      */
     void visit(Relation r);
     /**
      * Visiting call for changesets.

r9032	r9059
934	934	}
935	935	}
	936
936	937	/**
937	938	* highlights a given point by drawing a rounded rectangle around it. Give the

-              r9032
+              r9059
     public static class PolyData {
+        public enum Intersection {INSIDE, OUTSIDE, CROSSING}
+        public enum Intersection {
+            INSIDE,
+            OUTSIDE,
+            CROSSING
+        }
         private final Path2D.Double poly;

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