Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -114 +114 @@
 
     public String getLocaleName() {
-        if(locale_name == null) {
-            if(name_context != null) {
+        if (locale_name == null) {
+            if (name_context != null) {
                 locale_name = trc(name_context, TaggingPresetItems.fixPresetString(name));
             } else {
@@ -208 +208 @@
     private static class PresetPanel extends JPanel {
         private boolean hasElements = false;
+
         PresetPanel() {
             super(new GridBagLayout());
@@ -219 +220 @@
         List<Link> l = new LinkedList<>();
         List<PresetLink> presetLink = new LinkedList<>();
-        if (types != null){
+        if (types != null) {
             JPanel pp = new JPanel();
             for (TaggingPresetType t : types) {
@@ -267 +268 @@
         JToggleButton tb = new JToggleButton(new ToolbarButtonAction());
         tb.setFocusable(false);
-        p.add(tb, GBC.std(0,0).anchor(GBC.LINE_END));
+        p.add(tb, GBC.std(0, 0).anchor(GBC.LINE_END));
         return p;
     }
@@ -318 +319 @@
             final Relation r = new Relation();
             final Collection<RelationMember> members = new HashSet<>();
-            for(Tag t : getChangedTags()) {
+            for (Tag t : getChangedTags()) {
                 r.put(t.getKey(), t.getValue());
             }
@@ -340 +341 @@
         public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) {
             super(Main.parent, title,
-                    showNewRelation?
+                    showNewRelation ?
                             new String[] {tr("Apply Preset"), tr("New relation"), tr("Cancel")} :
                                 new String[] {tr("Apply Preset"), tr("Cancel")},
@@ -346 +347 @@
             if (icon != null)
                 setIconImage(icon.getImage());
-            contentInsets = new Insets(10,5,0,5);
+            contentInsets = new Insets(10, 5, 0, 5);
             if (showNewRelation) {
                 setButtonIcons(new String[] {"ok", "dialogs/addrelation", "cancel" });
@@ -375 +376 @@
         if (p.getComponentCount() != 0 && (sel.isEmpty() || p.hasElements)) {
             String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
-            if(sel.isEmpty()) {
-                if(originalSelectionEmpty) {
+            if (sel.isEmpty()) {
+                if (originalSelectionEmpty) {
                     title = tr("Nothing selected!");
                 } else {
@@ -460 +461 @@
     @Override
     public String toString() {
-        return (types == null?"":types) + " " + name;
+        return (types == null ? "" : types) + " " + name;
     }