Changeset 10659 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2016-07-27T02:48:44+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
r10308 r10659 7 7 import java.io.IOException; 8 8 import java.net.URL; 9 import java.util.Objects; 9 10 10 11 import javax.sound.sampled.AudioFormat; … … 297 298 double offset = command.offset(); 298 299 speed = command.speed(); 299 if (playingUrl !=command.url() ||300 if (!Objects.equals(playingUrl, command.url()) || 300 301 stateChange != State.PAUSED || 301 302 offset != 0) { -
trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
r10043 r10659 147 147 } 148 148 for (OsmPrimitive o: rhs.getPrimitives(root)) { 149 if (condition == null || condition.match(o) && !result.contains(o)) { 149 if (condition == null || (condition.match(o) && !result.contains(o))) { 150 150 result.add(o); 151 151 }
Note:
See TracChangeset
for help on using the changeset viewer.