Changeset 5481 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
- Timestamp:
- 2012-08-28T00:16:35+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r5266 r5481 26 26 * the deleted or visible state of {@link OsmPrimitive}s. 27 27 * 28 * This model is an {@link Observable}. It notifies registered {@link Observer}s whenever the28 * This model is an {@link Observable}. It notifies registered {@link java.util.Observer}s whenever the 29 29 * internal state changes. 30 30 * … … 33 33 * 34 34 * @see Node#getCoor() 35 * @see OsmPrimitive# deleted36 * @see OsmPrimitive# visible35 * @see OsmPrimitive#isDeleted 36 * @see OsmPrimitive#isVisible 37 37 * 38 38 */ … … 120 120 121 121 /** 122 * populates the model with the differences between my and their version 123 * 124 * @param my my version of the primitive 125 * @param their their version of the primitive 122 * Populates the model with the differences between local and server version 123 * 124 * @param conflict The conflict information 126 125 */ 127 126 public void populate(Conflict<? extends OsmPrimitive> conflict) { … … 151 150 /** 152 151 * replies the coordinates of my {@link OsmPrimitive}. null, if my primitive hasn't 153 * coordinates (i.e. because it is a {@link Way}).152 * coordinates (i.e. because it is a {@link org.openstreetmap.josm.data.osm.Way}). 154 153 * 155 154 * @return the coordinates of my {@link OsmPrimitive}. null, if my primitive hasn't 156 * coordinates (i.e. because it is a {@link Way}).155 * coordinates (i.e. because it is a {@link org.openstreetmap.josm.data.osm.Way}). 157 156 */ 158 157 public LatLon getMyCoords() { … … 162 161 /** 163 162 * replies the coordinates of their {@link OsmPrimitive}. null, if their primitive hasn't 164 * coordinates (i.e. because it is a {@link Way}).163 * coordinates (i.e. because it is a {@link org.openstreetmap.josm.data.osm.Way}). 165 164 * 166 165 * @return the coordinates of my {@link OsmPrimitive}. null, if my primitive hasn't 167 * coordinates (i.e. because it is a {@link Way}).166 * coordinates (i.e. because it is a {@link org.openstreetmap.josm.data.osm.Way}). 168 167 */ 169 168 public LatLon getTheirCoords() { … … 189 188 190 189 /** 191 * decides a conflict between my and their coordinates190 * Decides a conflict between local and server coordinates 192 191 * 193 192 * @param decision the decision … … 201 200 202 201 /** 203 * replies my deleted state,204 * @return 202 * Replies deleted state of local dataset 203 * @return The state of deleted flag 205 204 */ 206 205 public Boolean getMyDeletedState() { … … 208 207 } 209 208 209 /** 210 * Replies deleted state of Server dataset 211 * @return The state of deleted flag 212 */ 210 213 public Boolean getTheirDeletedState() { 211 214 return theirDeletedState; 212 215 } 213 216 217 /** 218 * Replies deleted state of combined dataset 219 * @return The state of deleted flag 220 */ 214 221 public Boolean getMergedDeletedState() { 215 222 switch(deletedMergeDecision) { … … 223 230 224 231 /** 225 * returns my referrers,226 * @return myreferrers232 * Returns local referrers 233 * @return The referrers 227 234 */ 228 235 public List<OsmPrimitive> getMyReferrers() { … … 231 238 232 239 /** 233 * returns their referrers,234 * @return theirreferrers240 * Returns server referrers 241 * @return The referrers 235 242 */ 236 243 public List<OsmPrimitive> getTheirReferrers() { … … 289 296 * their deleted states 290 297 * 291 * @return trueif my and their primitive have a conflict between298 * @return <code>true</code> if my and their primitive have a conflict between 292 299 * their deleted states 293 300 */ … … 299 306 * replies true if all conflict in this model are resolved 300 307 * 301 * @return true if all conflict in this model are resolved; falseotherwise308 * @return <code>true</code> if all conflict in this model are resolved; <code>false</code> otherwise 302 309 */ 303 310 public boolean isResolvedCompletely() { … … 313 320 314 321 /** 315 * builds the command(s) to apply the conflict resolutions to my primitive 316 * 317 * @param my my primitive 318 * @param their their primitive 319 * @return the list of commands 322 * Builds the command(s) to apply the conflict resolutions to my primitive 323 * 324 * @param conflict The conflict information 325 * @return The list of commands 320 326 */ 321 327 public List<Command> buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
Note:
See TracChangeset
for help on using the changeset viewer.