Changeset 5698 in josm
- Timestamp:
- 2013-02-06T17:16:30+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r5132 r5698 107 107 108 108 109 //HelperClass 110 //saves a way and the "inside" side 111 // insideToTheLeft: if true left side is "in", false -right side is "in". Left and right are determined along the orientation of way. 109 /** 110 * HelperClass - saves a way and the "inside" side. 111 * 112 * insideToTheLeft: if true left side is "in", false -right side is "in". 113 * Left and right are determined along the orientation of way. 114 */ 112 115 public static class WayInPolygon { 113 116 public final Way way; … … 937 940 /** 938 941 * Finds all ways that form inner or outer boundaries. 939 * @param Collection<Way>A list of (splitted) ways that form a multigon and share common end nodes on intersections.940 * @param Collection<Way>this list is filled with ways that are to be discarded941 * @return Collection<Collection<Way>>A list of ways that form the outer and inner boundaries of the multigon.942 * @param multigonWays A list of (splitted) ways that form a multigon and share common end nodes on intersections. 943 * @param discardedResult this list is filled with ways that are to be discarded 944 * @return A list of ways that form the outer and inner boundaries of the multigon. 942 945 */ 943 946 public static List<AssembledPolygon> findBoundaryPolygons(Collection<WayInPolygon> multigonWays, List<Way> discardedResult) { … … 1034 1037 /** 1035 1038 * This method checks if polygons have several touching parts and splits them in several polygons. 1036 * @param polygon the polygonto process.1039 * @param polygons the polygons to process. 1037 1040 */ 1038 1041 public static List<AssembledPolygon> fixTouchingPolygons(List<AssembledPolygon> polygons) -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r5590 r5698 305 305 } 306 306 307 /** 308 * Get the directory where cached content of any kind should be stored. 309 * 310 * If the directory doesn't exist on the file system, it will be created 311 * by this method. 312 * 313 * @return the cache directory 314 */ 307 315 public File getCacheDirectory() { 308 316 if (cacheDirFile != null) -
trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java
r3095 r5698 846 846 * Returns the Split parent of this Node, or null. 847 847 * 848 * This method isn't called getParent(), in order to avoid problems 849 * with recursive object creation when using XmlDecoder. 850 * 848 851 * @return the value of the parent property. 849 * @see # setParent850 */ 851 public Split getParent() { return parent; }852 * @see #parent_set 853 */ 854 public Split parent_get() { return parent; } 852 855 853 856 /** … … 855 858 * value of this property is null. 856 859 * 860 * This method isn't called setParent(), in order to avoid problems 861 * with recursive object creation when using XmlEncoder. 862 * 857 863 * @param parent a Split or null 858 * @see # getParent859 */ 860 public void setParent(Split parent) {864 * @see #parent_get 865 */ 866 public void parent_set(Split parent) { 861 867 this.parent = parent; 862 868 } … … 918 924 919 925 private Node siblingAtOffset(int offset) { 920 Split parent = getParent();926 Split parent = parent_get(); 921 927 if (parent == null) 922 928 return null; … … 1015 1021 throw new IllegalArgumentException("children must be a non-null List"); 1016 1022 for(Node child : this.children) { 1017 child. setParent(null);1023 child.parent_set(null); 1018 1024 } 1019 1025 this.children = new ArrayList<Node>(children); 1020 1026 for(Node child : this.children) { 1021 child. setParent(this);1027 child.parent_set(this); 1022 1028 } 1023 1029 } … … 1125 1131 */ 1126 1132 public final boolean isVertical() { 1127 Split parent = getParent();1133 Split parent = parent_get(); 1128 1134 return (parent != null) ? parent.isRowLayout() : false; 1129 1135 } -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r5647 r5698 208 208 /** 209 209 * Tests if given point is to the right side of path consisting of 3 points. 210 * 211 * (Imagine the path is continued beyond the endpoints, so you get two rays 212 * starting from lineP2 and going through lineP1 and lineP3 respectively 213 * which divide the plane into two parts. The test returns true, if testPoint 214 * lies in the part that is to the right when traveling in the direction 215 * lineP1, lineP2, lineP3.) 216 * 210 217 * @param lineP1 first point in path 211 218 * @param lineP2 second point in path … … 365 372 /** 366 373 * This method tests if secondNode is clockwise to first node. 374 * 375 * The line through the two points commonNode and firstNode divides the 376 * plane into two parts. The test returns true, if secondNode lies in 377 * the part that is to the right when traveling in the direction from 378 * commonNode to firstNode. 379 * 367 380 * @param commonNode starting point for both vectors 368 381 * @param firstNode first vector end node
Note:
See TracChangeset
for help on using the changeset viewer.