Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2014-02-27T01:41:49+01:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
r6830 r6889 28 28 * @return the calibrated length of recording in seconds. 29 29 */ 30 static public double getCalibratedDuration(File wavFile) {30 public static double getCalibratedDuration(File wavFile) { 31 31 try { 32 32 AudioInputStream audioInputStream = AudioSystem.getAudioInputStream( -
trunk/src/org/openstreetmap/josm/tools/Diff.java
r6830 r6889 491 491 492 492 /** Standard ScriptBuilders. */ 493 public final staticScriptBuilder493 public static final ScriptBuilder 494 494 forwardScript = new ForwardScript(), 495 495 reverseScript = new ReverseScript(); -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r6814 r6889 854 854 855 855 /** 90 degrees in radians units */ 856 final staticdouble DEGREE_90 = 90.0 * Math.PI / 180.0;856 static final double DEGREE_90 = 90.0 * Math.PI / 180.0; 857 857 858 858 /** -
trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
r6380 r6889 35 35 * @since 5915 36 36 */ 37 static public String getWikiLanguagePrefix(LocaleType type) {37 public static String getWikiLanguagePrefix(LocaleType type) { 38 38 if(type == LocaleType.ENGLISH) 39 39 return ""; … … 60 60 * @see #getWikiLanguagePrefix(LocaleType) 61 61 */ 62 static public String getWikiLanguagePrefix() {62 public static String getWikiLanguagePrefix() { 63 63 return getWikiLanguagePrefix(LocaleType.DEFAULT); 64 64 } … … 70 70 * @see #getJOSMLocaleCode(Locale) 71 71 */ 72 static public String getJOSMLocaleCode() {72 public static String getJOSMLocaleCode() { 73 73 return getJOSMLocaleCode(Locale.getDefault()); 74 74 } … … 84 84 * @return the JOSM code for the given locale 85 85 */ 86 static public String getJOSMLocaleCode(Locale locale) {86 public static String getJOSMLocaleCode(Locale locale) { 87 87 if (locale == null) return "en"; 88 88 String full = locale.toString(); … … 106 106 * @return the resulting locale 107 107 */ 108 static public Locale getLocale(String localeName) {108 public static Locale getLocale(String localeName) { 109 109 if (localeName.equals("he")) { 110 110 localeName = "iw_IL"; … … 123 123 } 124 124 125 static public String getLanguageCodeXML() {125 public static String getLanguageCodeXML() { 126 126 return getJOSMLocaleCode()+"."; 127 127 } 128 128 129 static public String getLanguageCodeManifest() {129 public static String getLanguageCodeManifest() { 130 130 return getJOSMLocaleCode()+"_"; 131 131 } -
trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
r6830 r6889 250 250 * @return matching zoom level for area 251 251 */ 252 static public int getZoom(Bounds b) {252 public static int getZoom(Bounds b) { 253 253 // convert to mercator (for calculation of zoom only) 254 254 double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI; -
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r6380 r6889 432 432 * @return the platform specific key stroke for the 'Copy' command 433 433 */ 434 static public KeyStroke getCopyKeyStroke() {434 public static KeyStroke getCopyKeyStroke() { 435 435 Shortcut sc = shortcuts.get("system:copy"); 436 436 if (sc == null) return null; … … 445 445 * @return the platform specific key stroke for the 'Paste' command 446 446 */ 447 static public KeyStroke getPasteKeyStroke() {447 public static KeyStroke getPasteKeyStroke() { 448 448 Shortcut sc = shortcuts.get("system:paste"); 449 449 if (sc == null) return null; … … 458 458 * @return the platform specific key stroke for the 'Cut' command 459 459 */ 460 static public KeyStroke getCutKeyStroke() {460 public static KeyStroke getCutKeyStroke() { 461 461 Shortcut sc = shortcuts.get("system:cut"); 462 462 if (sc == null) return null; -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r6883 r6889 412 412 } 413 413 414 private final staticdouble EPSILON = 1e-11;414 private static final double EPSILON = 1e-11; 415 415 416 416 /** -
trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
r6828 r6889 31 31 * @return the geometry object 32 32 */ 33 static public WindowGeometry centerOnScreen(Dimension extent) {33 public static WindowGeometry centerOnScreen(Dimension extent) { 34 34 return centerOnScreen(extent, "gui.geometry"); 35 35 } … … 44 44 * @return the geometry object 45 45 */ 46 static public WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {46 public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) { 47 47 Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) 48 48 : getFullScreenInfo(); … … 62 62 * @return the geometry object 63 63 */ 64 static public WindowGeometry centerInWindow(Component reference, Dimension extent) {64 public static WindowGeometry centerInWindow(Component reference, Dimension extent) { 65 65 Window parentWindow = null; 66 66 while(reference != null && ! (reference instanceof Window) ) { … … 82 82 * Exception thrown by the WindowGeometry class if something goes wrong 83 83 */ 84 static public class WindowGeometryException extends Exception {84 public static class WindowGeometryException extends Exception { 85 85 public WindowGeometryException(String message, Throwable cause) { 86 86 super(message, cause); … … 178 178 } 179 179 180 static public WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {180 public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) { 181 181 Rectangle screenDimension = getScreenInfo("gui.geometry"); 182 182 if (arg != null) {
Note:
See TracChangeset
for help on using the changeset viewer.