Changeset 10210 in josm for trunk/test/unit/org/openstreetmap
- Timestamp:
- 2016-05-14T15:45:35+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
r9973 r10210 6 6 import static org.junit.Assert.assertTrue; 7 7 8 import java .util.Observable;9 import java .util.Observer;8 import javax.swing.event.ChangeEvent; 9 import javax.swing.event.ChangeListener; 10 10 11 11 import org.junit.Before; … … 24 24 public class PropertiesMergeModelTest { 25 25 26 private abstract static class Test Observer implements Observer {26 private abstract static class TestChangeListener implements ChangeListener { 27 27 public int numInvocations; 28 28 29 29 @Override 30 public void update(Observable o, Object arg) {30 public void stateChanged(ChangeEvent e) { 31 31 numInvocations++; 32 32 doTest(); … … 113 113 // decide KEEP_MINE and ensure notification via Observable 114 114 // 115 Test Observer observerTest;116 model.add Observer(117 observerTest = new Test Observer() {115 TestChangeListener observerTest; 116 model.addChangeListener( 117 observerTest = new TestChangeListener() { 118 118 @Override 119 119 public void doTest() { … … 128 128 // decide KEEP_THEIR and ensure notification via Observable 129 129 // 130 model. deleteObserver(observerTest);131 model.add Observer(132 observerTest = new Test Observer() {130 model.removeChangeListener(observerTest); 131 model.addChangeListener( 132 observerTest = new TestChangeListener() { 133 133 @Override 134 134 public void doTest() { … … 140 140 assertTrue(model.isCoordMergeDecision(MergeDecisionType.KEEP_THEIR)); 141 141 observerTest.assertNumInvocations(1); 142 model. deleteObserver(observerTest);142 model.removeChangeListener(observerTest); 143 143 } 144 144 }
Note:
See TracChangeset
for help on using the changeset viewer.