Changeset 8380 in josm

Timestamp:

2015-05-17T06:02:07+02:00 (10 years ago)

Author:

Don-vip

Message:

code style - A getX() method which returns a boolean should be named isX()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/UploadNotesTask.java (modified) (1 diff)
• actions/upload/ValidateUploadHook.java (modified) (1 diff)
• data/notes/NoteComment.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (2 diffs)
• data/validation/PaintVisitor.java (modified) (1 diff)
• data/validation/TestError.java (modified) (1 diff)
• gui/MainMenu.java (modified) (2 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (2 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (1 diff)
• gui/preferences/shortcut/PrefJPanel.java (modified) (2 diffs)
• io/NoteWriter.java (modified) (1 diff)
• tools/Shortcut.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -72 +72 @@
                 }
                 for (NoteComment comment : note.getComments()) {
-                    if (comment.getIsNew()) {
+                    if (comment.isNew()) {
                         if (Main.isDebugEnabled()) {
                             Main.debug("found note change to upload");

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -92 +92 @@
                     }
                 }
-                if (!error.getIgnored()) {
+                if (!error.isIgnored()) {
                     ++nume;
                 }

trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java

@@ -61 +61 @@
     }
 
-    public void setIsNew(boolean isNew) {
+    public void setNew(boolean isNew) {
         this.isNew = isNew;
     }
 
     /** @return true if this is a new comment/action and needs to be uploaded to the API */
-    public boolean getIsNew() {
+    public boolean isNew() {
         return isNew;
     }

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

@@ -149 +149 @@
             }
             for (NoteComment comment : note.getComments()) {
-                if (comment.getIsNew()) {
+                if (comment.isNew()) {
                     return true;
                 }
@@ -170 +170 @@
                     @Override
                     public boolean evaluate(NoteComment object) {
-                        return object.getIsNew();
+                        return object.isNew();
                     }
                 });

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ -112 +112 @@
     @Override
     public void visit(TestError error) {
-        if (error != null && !error.getIgnored()) {
+        if (error != null && !error.isIgnored()) {
             color = error.getSeverity().getColor();
             selected = error.isSelected();

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -208 +208 @@
     }
 
-    public boolean getIgnored() {
+    public boolean isIgnored() {
         return ignored;
     }

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

@@ -486 +486 @@
      */
     public static JMenuItem add(JMenu menu, JosmAction action, boolean isExpert, Integer index) {
-        if (action.getShortcut().getAutomatic())
+        if (action.getShortcut().isAutomatic())
             return null;
         final JMenuItem menuitem;
@@ -540 +540 @@
      */
     public static <E extends Enum<E>> JMenuItem add(JMenu menu, JosmAction action, Enum<E> group) {
-        if (action.getShortcut().getAutomatic())
+        if (action.getShortcut().isAutomatic())
             return null;
         int i = getInsertionIndexForGroup(menu, group.ordinal());

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -182 +182 @@
         final Boolean other = ValidatorPreference.PREF_OTHER.get();
         for (TestError e : errors) {
-            if (e.getIgnored()) {
+            if (e.isIgnored()) {
                 continue;
             }
@@ -321 +321 @@
         DataSet ds = Main.main.getCurrentDataSet();
         for (TestError error : newerrors) {
-            if (!error.getIgnored()) {
+            if (!error.isIgnored()) {
                 errors.add(error);
                 if (ds != null) {

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -1121 +1121 @@
 
             // add shortcut info to the tooltip if needed
-            if (sc.getAssignedUser()) {
+            if (sc.isAssignedUser()) {
                 if (tt.startsWith("<html>") && tt.endsWith("</html>")) {
                     tt = tt.substring(6,tt.length()-6);

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -166 +166 @@
                 label.setForeground(Main.pref.getUIColor("Table.foreground"));
             }
-            if(sc.getAssignedUser()) {
+            if(sc.isAssignedUser()) {
                 label.setBackground(Main.pref.getColor(
                         marktr("Shortcut Background: User"),
                         new Color(200,255,200)));
-            } else if(!sc.getAssignedDefault()) {
+            } else if(!sc.isAssignedDefault()) {
                 label.setBackground(Main.pref.getColor(
                         marktr("Shortcut Background: Modified"),
@@ -289 +289 @@
                 int row = panel.shortcutTable.convertRowIndexToModel(lsm.getMinSelectionIndex());
                 Shortcut sc = (Shortcut)panel.model.getValueAt(row, -1);
-                panel.cbDefault.setSelected(!sc.getAssignedUser());
+                panel.cbDefault.setSelected(!sc.isAssignedUser());
                 panel.cbDisable.setSelected(sc.getKeyStroke() == null);
                 panel.cbShift.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.SHIFT_DOWN_MASK) != 0);

trunk/src/org/openstreetmap/josm/io/NoteWriter.java

@@ -77 +77 @@
             out.print("user=\"" + encode(comment.getUser().getName()) + "\" ");
         }
-        out.print("is_new=\"" + comment.getIsNew() + "\" ");
+        out.print("is_new=\"" + comment.isNew() + "\" ");
         out.print(">");
         out.print(encode(comment.getText(), false));

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -82 +82 @@
     }
 
-    public boolean getAssignedDefault() {
+    public boolean isAssignedDefault() {
         return assignedDefault;
     }
 
-    public boolean getAssignedUser() {
+    public boolean isAssignedUser() {
         return assignedUser;
     }
 
-    public boolean getAutomatic() {
+    public boolean isAutomatic() {
         return automatic;
     }
@@ -98 +98 @@
     }
 
-    private boolean getReset() {
+    private boolean isReset() {
         return reset;
     }
@@ -167 +167 @@
     // get a string that can be put into the preferences
     private boolean save() {
-        if (getAutomatic() || getReset() || !getAssignedUser()) {
+        if (isAutomatic() || isReset() || !isAssignedUser()) {
             return Main.pref.putCollection("shortcut.entry."+shortText, null);
         } else {
@@ -316 +316 @@
 
         for(Shortcut sc : newshortcuts) {
-            if (sc.getAssignedUser()
+            if (sc.isAssignedUser()
             && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
                 shortcuts.put(sc.getShortText(), sc);
@@ -323 +323 @@
         // Shortcuts at their default values
         for(Shortcut sc : newshortcuts) {
-            if (!sc.getAssignedUser() && sc.getAssignedDefault()
+            if (!sc.isAssignedUser() && sc.isAssignedDefault()
             && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
                 shortcuts.put(sc.getShortText(), sc);
@@ -330 +330 @@
         // Shortcuts that were automatically moved
         for(Shortcut sc : newshortcuts) {
-            if (!sc.getAssignedUser() && !sc.getAssignedDefault()
+            if (!sc.isAssignedUser() && !sc.isAssignedDefault()
             && findShortcut(sc.getAssignedKey(), sc.getAssignedModifier()) == null) {
                 shortcuts.put(sc.getShortText(), sc);