Changeset 2369 in josm
- Timestamp:
- 2009-11-01T09:22:27+01:00 (15 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r2368 r2369 1 <!-- 2 ** build.xml - main ant file for JOSM 3 ** 4 ** To build run 5 ** ant clean 6 ** ant dist 7 ** This will create 'josm-custom.jar' in directory 'dist'. See also 8 ** https://josm.openstreetmap.de/wiki/CreateBuild 9 ** 10 ** 11 --> 1 12 <project name="josm" default="dist" basedir="."> 2 13 <property name="test.dir" value="test" /> -
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
r2358 r2369 75 75 JTextArea revision = new JTextArea(); 76 76 revision.setEditable(false); 77 revision.setText(version.getRe vision());77 revision.setText(version.getReleaseAttributes()); 78 78 about.addTab(tr("Info"), info); 79 79 about.addTab(tr("Readme"), createScrollPane(readme)); -
trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
r2358 r2369 47 47 { 48 48 StringBuilder text = new StringBuilder(); 49 text.append(Version.getInstance().getRe vision());49 text.append(Version.getInstance().getReleaseAttributes()); 50 50 text.append("\n"); 51 51 text.append("Memory Usage: "); -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r2358 r2369 699 699 } 700 700 int v = Version.getInstance().getVersion(); 701 String s = ( v == Version.JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v); 701 String s = (v == Version.JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v); 702 if (! Version.getInstance().isLocalBuild() && v != Version.JOSM_UNKNOWN_VERSION) { 703 s += " SVN"; 704 } else if (Version.getInstance().isLocalBuild() && v != Version.JOSM_UNKNOWN_VERSION) { 705 s += " Local"; 706 } 702 707 sysProp.put("http.agent", "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")"); 703 708 System.setProperties(sysProp); -
trunk/src/org/openstreetmap/josm/data/Version.java
r2358 r2369 7 7 import java.io.IOException; 8 8 import java.io.InputStreamReader; 9 import java.net.MalformedURLException;10 9 import java.net.URL; 11 10 import java.util.HashMap; … … 17 16 18 17 /** 19 * Provides basic information about JOSM build currently used.18 * Provides basic information about the currently used JOSM build. 20 19 * 21 20 */ … … 67 66 private String revision; 68 67 private String time; 69 68 private boolean isLocalBuild; 70 69 71 70 protected HashMap<String, String> parseManifestStyleFormattedString(String content) { … … 118 117 } 119 118 119 // is this a local build ? 120 // 121 isLocalBuild = false; 122 value = properties.get("Is-Local-Build"); 123 if (value != null && value.trim().toLowerCase().equals("true")) { 124 isLocalBuild = true; 125 } 126 120 127 // the revision info 121 128 // … … 149 156 } 150 157 151 public String getRevision() { 158 /** 159 * Replies a text with the release attributes 160 * 161 * @return a text with the release attributes 162 */ 163 public String getReleaseAttributes() { 152 164 return revision; 153 165 } 154 166 167 /** 168 * Replies the build date as string 169 * 170 * @return the build date as string 171 */ 155 172 public String getTime() { 156 173 return time; 157 174 } 158 175 176 /** 177 * Replies the JOSM version. Replies {@see #JOSM_UNKNOWN_VERSION} if the version isn't known. 178 * @return the JOSM version 179 */ 159 180 public int getVersion() { 160 181 return version; 161 182 } 183 184 /** 185 * Replies true if this is a local build, i.e. an inofficial development build. 186 * 187 * @return true if this is a local build, i.e. an inofficial development build. 188 */ 189 public boolean isLocalBuild() { 190 return isLocalBuild; 191 } 162 192 }
Note:
See TracChangeset
for help on using the changeset viewer.