Changeset 2618 in josm
- Timestamp:
- 12.12.2009 16:38:28 (2 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
.classpath (modified) (2 diffs)
-
.project (modified) (1 diff)
-
.settings/org.eclipse.jdt.core.prefs (modified) (4 diffs)
-
build.xml (modified) (7 diffs)
-
src/org/openstreetmap/josm/data/Preferences.java (modified) (6 diffs)
-
src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified) (3 diffs)
-
src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (4 diffs)
-
src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/.classpath
r2508 r2618 4 4 <classpathentry kind="src" path="test/unit"/> 5 5 <classpathentry kind="src" path="test/functional"/> 6 <classpathentry excluding="build/|dist/|src/|test/|test/unit/|test/functional/" including="data/|images/|presets/|styles/" kind="src" path=""/> 7 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/> 6 <classpathentry excluding="build/|dist/|src/|test/|test/unit/|test/functional/|test/build/" including="images/|presets/|styles/" kind="src" path=""/> 8 7 <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/> 9 8 <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> … … 18 17 <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/> 19 18 <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/> 19 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 20 <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> 21 <classpathentry kind="lib" path="test/build"/> 20 22 <classpathentry kind="output" path="bin"/> 21 23 </classpath> -
trunk/.project
r2453 r2618 23 23 </buildSpec> 24 24 <natures> 25 <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> 25 26 <nature>org.eclipse.jdt.core.javanature</nature> 26 27 </natures> -
trunk/.settings/org.eclipse.jdt.core.prefs
r2579 r2618 1 # Sun Dec 06 09:20:07CET 20091 #Tue Dec 01 19:01:34 CET 2009 2 2 eclipse.preferences.version=1 3 3 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled … … 11 11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 12 12 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore 13 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning14 org.eclipse.jdt.core.compiler.problem.deadCode=warning15 13 org.eclipse.jdt.core.compiler.problem.deprecation=warning 16 14 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled … … 32 30 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning 33 31 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning 34 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning 35 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning 32 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore 36 33 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore 37 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning38 34 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error 39 35 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning … … 318 314 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert 319 315 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert 316 org.eclipse.jdt.core.formatter.join_lines_in_comments=true 317 org.eclipse.jdt.core.formatter.join_wrapped_lines=true 320 318 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false 321 319 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -
trunk/build.xml
r2507 r2618 14 14 <property name="src.dir" value="src" /> 15 15 <property name="build.dir" value="build"/> 16 16 <!-- build parameter: compression level (ant -Dclevel=N) 17 17 N ranges from 0 (no compression) to 9 (maximum compression) 18 18 default: 9 --> 19 20 21 19 <condition property="clevel" value="${clevel}" else="9"> 20 <isset property="clevel" /> 21 </condition> 22 22 23 23 <!-- Java classpath addition (all jar files to compile tests with this) --> … … 28 28 </path> 29 29 30 30 31 31 <!-- 32 32 ** Used by Eclipse ant builder for updating 33 33 ** the REVISION file used by JOSM 34 --> 34 --> 35 35 <target name="create-revision-eclipse"> 36 36 <property name="revision.dir" value="bin"/> … … 40 40 <!-- 41 41 ** Creates the REVISION file to be included in the distribution 42 --> 42 --> 43 43 <target name="create-revision"> 44 44 <property name="revision.dir" value="${build.dir}"/> 45 45 <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false"> 46 47 48 49 46 <env key="LANG" value="C"/> 47 <arg value="info"/> 48 <arg value="--xml"/> 49 <arg value="."/> 50 50 </exec> 51 51 <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/> 52 52 <delete file="REVISION.XML" /> 53 53 <tstamp> 54 54 <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> 55 55 </tstamp> 56 56 … … 62 62 Is-Local-Build: true 63 63 Build-Date: ${build.tstamp} 64 </echo> 64 </echo> 65 65 </target> 66 66 67 67 68 68 <target name="dist" depends="compile,create-revision"> … … 78 78 <property name="version.entry.commit.revision" value="UNKNOWN"/> 79 79 <property name="version.entry.commit.date" value="UNKNOWN"/> 80 80 <echo>Revision ${version.entry.commit.revision}</echo> 81 81 <copy file="CONTRIBUTION" todir="build"/> 82 82 <copy file="README" todir="build"/> 83 83 <copy file="LICENSE" todir="build"/> 84 84 85 85 <!-- styles --> 86 86 <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/> 87 87 88 88 <!-- css--> 89 89 <copy file="src/org/openstreetmap/josm/gui/help/help-browser.css" todir="build/org/openstreetmap/josm/gui/help"/> 90 90 … … 92 92 <delete file="dist/josm-custom.jar"/> 93 93 <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}"> 94 94 <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> 95 95 <manifest> 96 96 <attribute name="Main-class" value="JOSM" /> … … 166 166 <compilerarg value="-Xlint:unchecked"/> 167 167 </javac> 168 <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}" 169 target="1.5" source="1.5" debug="on" encoding="UTF-8"> 170 <compilerarg value="-Xlint:deprecation"/> 171 <compilerarg value="-Xlint:unchecked"/> 172 </javac> 168 173 </target> 169 174 170 171 172 173 174 175 176 177 178 179 180 181 182 183 175 <target name="test" depends="test-compile"> 176 <junit printsummary="yes"> 177 <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/> 178 <classpath> 179 <path refid="test.classpath"/> 180 <pathelement path="${test.dir}/${build.dir}"/> 181 <pathelement path="${test.dir}/config"/> 182 </classpath> 183 <formatter type="plain"/> 184 <batchtest fork="no" todir="${test.dir}/report"> 185 <fileset dir="${test.dir}/unit" includes="**/*.java"/> 186 </batchtest> 187 </junit> 188 </target> 184 189 185 190 </project> -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r2542 r2618 24 24 import java.util.TreeMap; 25 25 import java.util.Map.Entry; 26 import java.util.concurrent.CopyOnWriteArrayList; 26 27 import java.util.regex.Matcher; 27 28 import java.util.regex.Pattern; … … 50 51 private File preferencesDirFile = null; 51 52 53 public static interface PreferenceChangeEvent{ 54 public String getKey(); 55 public String getOldValue(); 56 public String getNewValue(); 57 } 58 52 59 public static interface PreferenceChangedListener { 53 void preferenceChanged(String key, String newValue); 60 void preferenceChanged(PreferenceChangeEvent e); 61 } 62 63 private static class DefaultPreferenceChangeEvent implements PreferenceChangeEvent { 64 private String key; 65 private String oldValue; 66 private String newValue; 67 68 public DefaultPreferenceChangeEvent(String key, String oldValue, String newValue) { 69 this.key = key; 70 this.oldValue = oldValue; 71 this.newValue = newValue; 72 } 73 74 public String getKey() { 75 return key; 76 } 77 public void setKey(String key) { 78 this.key = key; 79 } 80 public String getOldValue() { 81 return oldValue; 82 } 83 public void setOldValue(String oldValue) { 84 this.oldValue = oldValue; 85 } 86 public String getNewValue() { 87 return newValue; 88 } 89 public void setNewValue(String newValue) { 90 this.newValue = newValue; 91 } 54 92 } 55 93 … … 96 134 } 97 135 98 public final ArrayList<PreferenceChangedListener> listener = new ArrayList<PreferenceChangedListener>(); 136 private final CopyOnWriteArrayList<PreferenceChangedListener> listeners = new CopyOnWriteArrayList<PreferenceChangedListener>(); 137 138 139 public void addPreferenceChangeListener(PreferenceChangedListener listener) { 140 if (listener != null && ! listeners.contains(listener)) { 141 listeners.add(listener); 142 } 143 } 144 145 public void removePreferenceChangeListener(PreferenceChangedListener listener) { 146 if (listener != null && listeners.contains(listener)) { 147 listeners.remove(listener); 148 } 149 } 150 151 protected void firePrefrenceChanged(String key, String oldValue, String newValue) { 152 PreferenceChangeEvent evt = new DefaultPreferenceChangeEvent(key, oldValue, newValue); 153 for (PreferenceChangedListener l : listeners) { 154 l.preferenceChanged(evt); 155 } 156 } 99 157 100 158 /** … … 289 347 System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile())); 290 348 } 291 firePref erenceChanged(key, value);349 firePrefrenceChanged(key, oldvalue, value); 292 350 return true; 293 351 } … … 311 369 } 312 370 313 private final void firePreferenceChanged(final String key, final String value) {314 for (final PreferenceChangedListener l : listener) {315 l.preferenceChanged(key, value);316 }317 }318 371 319 372 /** … … 618 671 synchronized public String getCollectionAsString(final String key) { 619 672 String s = get(key); 620 if(s != null && s.length() != 0) 673 if(s != null && s.length() != 0) { 621 674 s = s.replaceAll("\u001e",","); 675 } 622 676 return s; 623 677 } -
trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
r2613 r2618 10 10 import java.util.logging.Logger; 11 11 12 public class ChangesetCache { 12 import org.openstreetmap.josm.Main; 13 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 14 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 15 16 public class ChangesetCache implements PreferenceChangedListener{ 13 17 static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName()); 14 18 static private final ChangesetCache instance = new ChangesetCache(); … … 24 28 25 29 private ChangesetCache() { 30 Main.pref.addPreferenceChangeListener(this); 26 31 } 27 32 … … 135 140 return ret; 136 141 } 142 143 /* ------------------------------------------------------------------------- */ 144 /* interface PreferenceChangedListener */ 145 /* ------------------------------------------------------------------------- */ 146 public void preferenceChanged(PreferenceChangeEvent e) { 147 if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) 148 return; 149 150 // clear the cache when the API url changes 151 if (e.getOldValue() == null || e.getNewValue() == null || !e.getOldValue().equals(e.getNewValue())) { 152 clear(); 153 } 154 } 137 155 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r2613 r2618 30 30 import org.openstreetmap.josm.Main; 31 31 import org.openstreetmap.josm.data.APIDataSet; 32 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 33 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 32 34 import org.openstreetmap.josm.data.osm.Changeset; 33 35 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 45 47 * 46 48 */ 47 public class UploadDialog extends JDialog implements PropertyChangeListener {49 public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{ 48 50 protected static final Logger logger = Logger.getLogger(UploadDialog.class.getName()); 49 51 … … 221 223 } 222 224 ); 225 226 Main.pref.addPreferenceChangeListener(this); 223 227 } 224 228 … … 453 457 } 454 458 } 459 460 /* -------------------------------------------------------------------------- */ 461 /* Interface PreferenceChangedListener */ 462 /* -------------------------------------------------------------------------- */ 463 public void preferenceChanged(PreferenceChangeEvent e) { 464 if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) 465 return; 466 if (e.getNewValue() == null) { 467 setTitle(tr("Upload")); 468 } else { 469 setTitle(tr("Upload to ''{0}''", e.getNewValue())); 470 } 471 } 455 472 } -
trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r2450 r2618 34 34 import org.openstreetmap.josm.actions.RenameLayerAction; 35 35 import org.openstreetmap.josm.data.Bounds; 36 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 36 37 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 37 38 import org.openstreetmap.josm.data.coor.EastNorth; … … 113 114 setAssociatedFile(associatedFile); 114 115 this.data = data; 115 Main.pref. listener.add(this);116 Main.pref.addPreferenceChangeListener(this); 116 117 } 117 118 … … 284 285 } 285 286 286 public void preferenceChanged( String key, String newValue) {287 if (Main.map != null && ( key.equals("draw.rawgps.lines") || key.equals("draw.rawgps.lines.force"))) {287 public void preferenceChanged(PreferenceChangeEvent e) { 288 if (Main.map != null && (e.getKey().equals("draw.rawgps.lines") || e.getKey().equals("draw.rawgps.lines.force"))) { 288 289 Main.map.repaint(); 289 290 } … … 291 292 292 293 @Override public void destroy() { 293 Main.pref. listener.remove(RawGpsLayer.this);294 Main.pref.removePreferenceChangeListener(this); 294 295 } 295 296 }
Note: See TracChangeset
for help on using the changeset viewer.
