Changeset 36091 in osm for applications/editors/josm/plugins/turnrestrictions
- Timestamp:
- 2023-05-30T21:32:07+02:00 (19 months ago)
- Location:
- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdTransferable.java
r32519 r36091 30 30 * See also {@link #getPrimitiveIds()} and {@link #getAsString()} 31 31 */ 32 p ublicstatic final DataFlavor[] SUPPORTED_FLAVORS = new DataFlavor[] {32 private static final DataFlavor[] SUPPORTED_FLAVORS = new DataFlavor[] { 33 33 PRIMITIVE_ID_LIST_FLAVOR, 34 34 DataFlavor.stringFlavor … … 49 49 50 50 /** 51 * <p>If flavor is {@link #PRIMITIVE_ID_ SET_FLAVOR}, replies a the list of51 * <p>If flavor is {@link #PRIMITIVE_ID_LIST_FLAVOR}, replies a the list of 52 52 * transferred {@link PrimitiveId}s</p> 53 53 * -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ExceptValueModel.java
r32519 r36091 130 130 * model. 131 131 * 132 * @param vehicleType one of the standard vehicle types from {@ see#STANDARD_VEHICLE_EXCEPTION_VALUES}132 * @param vehicleType one of the standard vehicle types from {@link #STANDARD_VEHICLE_EXCEPTION_VALUES} 133 133 * @return true if {@code vehicleType} is currently set as exception in this 134 134 * model. … … 147 147 * Sets the {@code vehicleType} as exception in this turn restriction. 148 148 * 149 * @param vehicleType one of the standard vehicle types from {@ see#STANDARD_VEHICLE_EXCEPTION_VALUES}149 * @param vehicleType one of the standard vehicle types from {@link #STANDARD_VEHICLE_EXCEPTION_VALUES} 150 150 * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type 151 151 */ … … 162 162 * on whether {@code setOrRemove} is true or false, respectively. 163 163 * 164 * @param vehicleType one of the standard vehicle types from {@ see#STANDARD_VEHICLE_EXCEPTION_VALUES}164 * @param vehicleType one of the standard vehicle types from {@link #STANDARD_VEHICLE_EXCEPTION_VALUES} 165 165 * @param setOrRemove if true, the exception is set; otherwise, it is removed 166 166 * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type … … 177 177 * Removes the {@code vehicleType} as exception in this turn restriction 178 178 * 179 * @param vehicleType one of the standard vehicle types from {@ see#STANDARD_VEHICLE_EXCEPTION_VALUES}179 * @param vehicleType one of the standard vehicle types from {@link #STANDARD_VEHICLE_EXCEPTION_VALUES} 180 180 * @exception IllegalArgumentException thrown if {@code vehicleType} isn't a standard vehicle type 181 181 */ … … 199 199 if (this == obj) 200 200 return true; 201 if (obj == null) 202 return false; 203 if (getClass() != obj.getClass()) 201 if (!(obj instanceof ExceptValueModel)) 204 202 return false; 205 203 ExceptValueModel other = (ExceptValueModel) obj; -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java
r34567 r36091 46 46 * Constructor 47 47 * 48 * @param selectionModel the selection model used in the list. Must not be null.49 48 * @param layer the layer this model is displaying the selection from. Must not be null. 50 49 * @throws IllegalArgumentException thrown if {@code layer} is null -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberModel.java
r32519 r36091 96 96 if (this == obj) 97 97 return true; 98 if (obj == null) 99 return false; 100 if (getClass() != obj.getClass()) 98 if (!(obj instanceof RelationMemberModel)) 101 99 return false; 102 100 RelationMemberModel other = (RelationMemberModel) obj; -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java
r36009 r36091 61 61 public class TurnRestrictionEditor extends JDialog implements NavigationControler { 62 62 63 /** the property name for the current turn restriction 64 * @link #setRelation(Relation) 65 * @link #getRelation() 66 */ 67 public static final String TURN_RESTRICION_PROP = RelationEditor.class.getName() + ".turnRestriction"; 68 69 /** the property name for the current relation snapshot 70 * @link #getRelationSnapshot() 71 */ 72 public static final String TURN_RESTRICION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".turnRestrictionSnapshot"; 63 /** The property name for the current turn restriction, see {@link #setTurnRestriction(Relation)} and 64 * {@link #getTurnRestriction()} 65 */ 66 public static final String TURN_RESTRICTION_PROP = RelationEditor.class.getName() + ".turnRestriction"; 67 68 /** the property name for the current relation snapshot, see {@link #getTurnRestrictionSnapshot()} 69 */ 70 public static final String TURN_RESTRICTION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".turnRestrictionSnapshot"; 73 71 74 72 /** … … 192 190 193 191 /** 194 * builds the UI192 * Builds the UI 195 193 */ 196 194 protected void build() { … … 265 263 setTurnRestrictionSnapshot(turnRestriction == null ? null : new Relation(turnRestriction)); 266 264 this.turnRestriction = turnRestriction; 267 support.firePropertyChange(TURN_RESTRIC ION_PROP, null, this.turnRestriction);265 support.firePropertyChange(TURN_RESTRICTION_PROP, null, this.turnRestriction); 268 266 updateTitle(); 269 267 } … … 309 307 protected void setTurnRestrictionSnapshot(Relation snapshot) { 310 308 turnRestrictionSnapshot = snapshot; 311 support.firePropertyChange(TURN_RESTRIC ION_SNAPSHOT_PROP, null, turnRestrictionSnapshot);309 support.firePropertyChange(TURN_RESTRICTION_SNAPSHOT_PROP, null, turnRestrictionSnapshot); 312 310 } 313 311 … … 779 777 @Override 780 778 public void propertyChange(PropertyChangeEvent evt) { 781 if (evt.getPropertyName().equals(TURN_RESTRIC ION_PROP)) {779 if (evt.getPropertyName().equals(TURN_RESTRICTION_PROP)) { 782 780 updateEnabledState(); 783 781 } … … 807 805 @Override 808 806 public void propertyChange(PropertyChangeEvent evt) { 809 if (evt.getPropertyName().equals(TURN_RESTRIC ION_PROP)) {807 if (evt.getPropertyName().equals(TURN_RESTRICTION_PROP)) { 810 808 updateEnabledState(); 811 809 } … … 839 837 @Override 840 838 public void propertyChange(PropertyChangeEvent evt) { 841 if (evt.getPropertyName().equals(TURN_RESTRIC ION_PROP)) {839 if (evt.getPropertyName().equals(TURN_RESTRICTION_PROP)) { 842 840 updateEnabledState(); 843 841 } -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorManager.java
r33537 r36091 71 71 if (this == obj) 72 72 return true; 73 if (obj == null) 74 return false; 75 if (getClass() != obj.getClass()) 73 if (!(obj instanceof DialogContext)) 76 74 return false; 77 75 DialogContext other = (DialogContext) obj; … … 175 173 * is currently open. Returns null, if relation is null. 176 174 * 175 * See also {@link #isOpenInEditor(OsmDataLayer, Relation)} 176 * 177 177 * @param layer the layer 178 178 * @param relation the relation 179 179 * @return the editor for the turn restriction managed by layer. Null, if no such editor 180 180 * is currently open. 181 *182 * @link #isOpenInEditor(OsmDataLayer, Relation)183 181 */ 184 182 public TurnRestrictionEditor getEditorForRelation(OsmDataLayer layer, Relation relation) { -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java
r32519 r36091 274 274 * <p>If {@code vias} is null, all vias are removed. All primitives 275 275 * in {@code vias} must be assigned to a dataset and the dataset 276 * must be equal to the dataset of this editor model, see {@link #getDataSet()}</p>277 * 278 * <p>null values in {@ linkvias} are skipped.</p>276 * must be equal to the dataset of this editor model, see {@link OsmPrimitive#getDataSet()}</p> 277 * 278 * <p>null values in {@code vias} are skipped.</p> 279 279 * 280 280 * @param vias the list of vias -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java
r33537 r36091 185 185 * @throws IllegalArgumentException thrown if {@code layer} is null 186 186 */ 187 public TurnRestrictionSelectionPopupPanel(OsmDataLayer layer, Collection<Relation> editCandi ates) {187 public TurnRestrictionSelectionPopupPanel(OsmDataLayer layer, Collection<Relation> editCandidates) { 188 188 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 189 189 this.layer = layer; 190 build(editCandi ates);190 build(editCandidates); 191 191 } 192 192 -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListModel.java
r33537 r36091 209 209 * Sets the selected turn restrictions 210 210 * 211 * @ returnsel the list of selected turn restrictions211 * @param sel the list of selected turn restrictions 212 212 */ 213 213 public void setSelectedTurnRestrictions(List<Relation> sel) { … … 227 227 * Returns the index of a turn restriction 228 228 * 229 * @param tr Turn restriction relation to check 229 230 * @return index of relation (-1, if not found) 230 231 */ -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/Issue.java
r32519 r36091 13 13 * An issue represents a data integrity violation in a turn restriction. 14 14 * 15 * The issue has a {@ seeSeverity}. It is described to the user with a HTML formatted16 * text (see {@ see#getText()}) and it suggests a list of possible actions to fix17 * the issue (see {@ see#getActions()}).15 * The issue has a {@link Severity}. It is described to the user with a HTML formatted 16 * text (see {@link #getText()}) and it suggests a list of possible actions to fix 17 * the issue (see {@link #getActions()}). 18 18 * 19 19 */ … … 26 26 /** 27 27 * Creates a new issue associated with a parent model. Severity is 28 * initialized to {@ seeSeverity#WARNING}.28 * initialized to {@link Severity#WARNING}. 29 29 * 30 30 * @param parent the parent model. Must not be null. -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssueView.java
r32519 r36091 23 23 24 24 /** 25 * An IssueView is a view on an individual {@ seeIssue}.25 * An IssueView is a view on an individual {@link Issue}. 26 26 */ 27 27 public class IssueView extends JPanel { … … 35 35 * Builds the style sheet used in the internal help browser 36 36 * 37 * @ return the style sheet37 * @param view the {@code HtmlPanel} where the {@link StyleSheet} should be adapted 38 38 */ 39 39 protected void initStyleSheet(HtmlPanel view) { -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesModel.java
r32519 r36091 84 84 * turn restriction editor model. If {@code editorModel} is null, the 85 85 * list of issues is cleared. 86 *87 * @param editorModel the editor model.88 86 */ 89 87 public void populate() { -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesView.java
r32519 r36091 14 14 15 15 /** 16 * IssuesView provides a view on a {@ seeIssuesModel}.16 * IssuesView provides a view on a {@link IssuesModel}. 17 17 */ 18 18 public class IssuesView extends VerticallyScrollablePanel implements Observer { -
applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java
r34567 r36091 40 40 * @param from the way with role "from" 41 41 * @param to the way with role "to" 42 * @param intersect the intersection node43 42 */ 44 43 public TurnRestrictionLegSplitRequiredError(IssuesModel parent, Way from, Way to) {
Note:
See TracChangeset
for help on using the changeset viewer.