Changeset 6981 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2014-04-15T13:56:36+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
r6890 r6981 100 100 if (zipRequired) { 101 101 zip = true; 102 } else if ( ff == joz) {102 } else if (joz.equals(ff)) { 103 103 zip = true; 104 } else if ( ff == jos) {104 } else if (jos.equals(ff)) { 105 105 zip = false; 106 106 } else { … … 231 231 } 232 232 233 protected Component getDisabledExportPanel(Layer layer) {233 protected final Component getDisabledExportPanel(Layer layer) { 234 234 JPanel p = new JPanel(new GridBagLayout()); 235 235 JCheckBox include = new JCheckBox(); -
trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
r6850 r6981 104 104 } 105 105 try { 106 final String env _java_home = System.getenv("JAVA_HOME");107 final String env _java_home_alt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}";108 final String prop _java_home = System.getProperty("java.home");109 final String prop _java_home_alt = "<java.home>";106 final String envJavaHome = System.getenv("JAVA_HOME"); 107 final String envJavaHomeAlt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}"; 108 final String propJavaHome = System.getProperty("java.home"); 109 final String propJavaHomeAlt = "<java.home>"; 110 110 // Build a new list of VM parameters to modify it below if needed (default implementation returns an UnmodifiableList instance) 111 111 List<String> vmArguments = new ArrayList<String>(ManagementFactory.getRuntimeMXBean().getInputArguments()); … … 119 119 // Shorten some parameters for readability concerns 120 120 } else { 121 shortenParam(it, param, env _java_home, env_java_home_alt);122 shortenParam(it, param, prop _java_home, prop_java_home_alt);121 shortenParam(it, param, envJavaHome, envJavaHomeAlt); 122 shortenParam(it, param, propJavaHome, propJavaHomeAlt); 123 123 } 124 124 } -
trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
r6639 r6981 96 96 DataSet ds = getCurrentDataSet(); 97 97 ds.beginUpdate(); 98 try 99 { 98 try { 100 99 List<Way> ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class); 101 100 if (ways.isEmpty()) { 102 101 alertSelectAtLeastOneWay(); 103 102 return; 104 } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) 103 } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) { 105 104 return; 106 else if (ways.size() > 10) { 107 if (!confirmSimplifyManyWays(ways.size())) 108 return; 105 } else if (ways.size() > 10 && !confirmSimplifyManyWays(ways.size())) { 106 return; 109 107 } 110 108 … … 269 267 270 268 public static double xtd(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3) { 271 double dist _AD = dist(lat1, lon1, lat3, lon3);272 double crs _AD = course(lat1, lon1, lat3, lon3);273 double crs _AB = course(lat1, lon1, lat2, lon2);274 return Math.asin(Math.sin(dist _AD) * Math.sin(crs_AD - crs_AB));269 double distAD = dist(lat1, lon1, lat3, lon3); 270 double crsAD = course(lat1, lon1, lat3, lon3); 271 double crsAB = course(lat1, lon1, lat2, lon2); 272 return Math.asin(Math.sin(distAD) * Math.sin(crsAD - crsAB)); 275 273 } 276 274 -
trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
r6959 r6981 334 334 rolesToReAdd = null; 335 335 for (RelationMember rm : r.getMembers()) { 336 if (rm.isNode()) { 337 if (rm.getMember() == originalNode) { 338 if (newRel == null) { 339 newRel = new Relation(r); 340 rolesToReAdd = new HashSet<String>(); 341 } 342 rolesToReAdd.add(rm.getRole()); 336 if (rm.isNode() && rm.getMember() == originalNode) { 337 if (newRel == null) { 338 newRel = new Relation(r); 339 rolesToReAdd = new HashSet<String>(); 343 340 } 341 rolesToReAdd.add(rm.getRole()); 344 342 } 345 343 }
Note:
See TracChangeset
for help on using the changeset viewer.