Changeset 10268 in josm for trunk/src/org

Timestamp:

2016-05-23T13:57:26+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• oauth/AdvancedOAuthPropertiesPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -639 +639 @@
             MapCSSRule r = candidates.next();
             env.clearSelectorMatchingInformation();
-            env.layer = null;
-            String sub = env.layer = r.selector.getSubpart().getId(env);
+            env.layer = r.selector.getSubpart().getId(env);
+            String sub = env.layer;
             if (r.selector.matches(env)) { // as side effect env.parent will be set (if s is a child selector)
                 Selector s = r.selector;

trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

@@ -151 +151 @@
         SelectAllOnFocusGainedDecorator.decorate(tfOsmLogoutURL);
 
-        cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
+        ilUseDefault = new UseDefaultItemListener();
+        cbUseDefaults.addItemListener(ilUseDefault);
     }