Changeset 10134 in josm for trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

Timestamp:

2016-04-10T16:57:50+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar, javadoc

File:

• trunk/src/org/openstreetmap/josm/data/osm/NoteData.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -46 +46 @@
                 return -1;
             }
-            if (n1.getState() == State.closed && n2.getState() == State.open) {
+            if (n1.getState() == State.CLOSED && n2.getState() == State.OPEN) {
                 return 1;
             }
-            if (n1.getState() == State.open && n2.getState() == State.closed) {
+            if (n1.getState() == State.OPEN && n2.getState() == State.CLOSED) {
                 return -1;
             }
@@ -200 +200 @@
         Note note = new Note(location);
         note.setCreatedAt(new Date());
-        note.setState(State.open);
+        note.setState(State.OPEN);
         note.setId(newNoteId--);
-        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true);
+        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.OPENED, true);
         note.addComment(comment);
         if (Main.isDebugEnabled()) {
@@ -220 +220 @@
             throw new IllegalArgumentException("Note to modify must be in layer");
         }
-        if (note.getState() == State.closed) {
+        if (note.getState() == State.CLOSED) {
             throw new IllegalStateException("Cannot add a comment to a closed note");
         }
@@ -226 +226 @@
             Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
         }
-        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true);
+        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.COMMENTED, true);
         note.addComment(comment);
         dataUpdated();
@@ -240 +240 @@
             throw new IllegalArgumentException("Note to close must be in layer");
         }
-        if (note.getState() != State.open) {
+        if (note.getState() != State.OPEN) {
             throw new IllegalStateException("Cannot close a note that isn't open");
         }
@@ -246 +246 @@
             Main.debug("closing note {0} with comment: {1}", note.getId(), text);
         }
-        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true);
+        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.CLOSED, true);
         note.addComment(comment);
-        note.setState(State.closed);
+        note.setState(State.CLOSED);
         note.setClosedAt(new Date());
         dataUpdated();
@@ -262 +262 @@
             throw new IllegalArgumentException("Note to reopen must be in layer");
         }
-        if (note.getState() != State.closed) {
+        if (note.getState() != State.CLOSED) {
             throw new IllegalStateException("Cannot reopen a note that isn't closed");
         }
@@ -268 +268 @@
             Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
         }
-        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true);
+        NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.REOPENED, true);
         note.addComment(comment);
-        note.setState(State.open);
+        note.setState(State.OPEN);
         dataUpdated();
     }