Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 5817)
+++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 5818)
@@ -78,9 +78,4 @@
private UserInfo userInfo;
- /**
- *
- * @param model provides the user id of the current user and accepts the changesets
- * after download
- */
public DownloadOpenChangesetsTask() {
super(tr("Downloading open changesets ...", false /* don't ignore exceptions */));
Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 5817)
+++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 5818)
@@ -130,5 +130,9 @@
}
- /** Enable this action only if something is selected */
+ /**
+ * Enable this action only if something is selected
+ *
+ * @param selection the current selection, gets tested for emptyness
+ */
@Override protected void updateEnabledState(Collection < ? extends OsmPrimitive > selection) {
setEnabled(selection != null && !selection.isEmpty());
@@ -137,6 +141,6 @@
/**
* This method analyzes ways and creates multipolygon.
- * @param selectedWays
- * @return null, if there was a problem with the ways.
+ * @param selectedWays list of selected ways
+ * @return null, if there was a problem with the ways.
*/
private MultipolygonCreate analyzeWays(Collection < Way > selectedWays) {
@@ -155,6 +159,6 @@
/**
* Builds a relation from polygon ways.
- * @param pol
- * @return
+ * @param pol data storage class containing polygon information
+ * @return multipolygon relation
*/
private Relation createRelation(MultipolygonCreate pol) {
@@ -182,106 +186,107 @@
* This method removes tags/value pairs from inner and outer ways and put them on relation if necessary
* Function was extended in reltoolbox plugin by Zverikk and copied back to the core
- * @param relation
+ * @param relation the multipolygon style relation to process
+ * @return a list of commands to execute
*/
private List removeTagsFromWaysIfNeeded( Relation relation ) {
- Map values = new HashMap();
-
- if( relation.hasKeys() ) {
- for( String key : relation.keySet() ) {
- values.put(key, relation.get(key));
- }
- }
-
- List innerWays = new ArrayList();
- List outerWays = new ArrayList();
-
- Set conflictingKeys = new TreeSet();
-
- for( RelationMember m : relation.getMembers() ) {
-
- if( m.hasRole() && "inner".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
- innerWays.add(m.getWay());
- }
-
- if( m.hasRole() && "outer".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
- Way way = m.getWay();
- outerWays.add(way);
+ Map values = new HashMap();
+
+ if( relation.hasKeys() ) {
+ for( String key : relation.keySet() ) {
+ values.put(key, relation.get(key));
+ }
+ }
+
+ List innerWays = new ArrayList();
+ List outerWays = new ArrayList();
+
+ Set conflictingKeys = new TreeSet();
+
+ for( RelationMember m : relation.getMembers() ) {
+
+ if( m.hasRole() && "inner".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
+ innerWays.add(m.getWay());
+ }
+
+ if( m.hasRole() && "outer".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
+ Way way = m.getWay();
+ outerWays.add(way);
- for( String key : way.keySet() ) {
- if( !values.containsKey(key) ) { //relation values take precedence
- values.put(key, way.get(key));
- } else if( !relation.hasKey(key) && !values.get(key).equals(way.get(key)) ) {
- conflictingKeys.add(key);
- }
- }
- }
- }
-
- // filter out empty key conflicts - we need second iteration
- if( !Main.pref.getBoolean("multipoly.alltags", false) )
- for( RelationMember m : relation.getMembers() )
- if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
- for( String key : values.keySet() )
- if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
- conflictingKeys.add(key);
-
- for( String key : conflictingKeys )
- values.remove(key);
-
- for( String linearTag : Main.pref.getCollection("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS) )
- values.remove(linearTag);
-
- if( values.containsKey("natural") && values.get("natural").equals("coastline") )
- values.remove("natural");
-
- values.put("area", "yes");
-
- List commands = new ArrayList();
- boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
-
- for( String key : values.keySet() ) {
- List affectedWays = new ArrayList();
- String value = values.get(key);
-
- for( Way way : innerWays ) {
- if( way.hasKey(key) && (value.equals(way.get(key))) ) {
- affectedWays.add(way);
- }
- }
-
- if( moveTags ) {
- // remove duplicated tags from outer ways
- for( Way way : outerWays ) {
- if( way.hasKey(key) ) {
- affectedWays.add(way);
- }
- }
- }
-
- if( affectedWays.size() > 0 ) {
+ for( String key : way.keySet() ) {
+ if( !values.containsKey(key) ) { //relation values take precedence
+ values.put(key, way.get(key));
+ } else if( !relation.hasKey(key) && !values.get(key).equals(way.get(key)) ) {
+ conflictingKeys.add(key);
+ }
+ }
+ }
+ }
+
+ // filter out empty key conflicts - we need second iteration
+ if( !Main.pref.getBoolean("multipoly.alltags", false) )
+ for( RelationMember m : relation.getMembers() )
+ if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
+ for( String key : values.keySet() )
+ if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
+ conflictingKeys.add(key);
+
+ for( String key : conflictingKeys )
+ values.remove(key);
+
+ for( String linearTag : Main.pref.getCollection("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS) )
+ values.remove(linearTag);
+
+ if( values.containsKey("natural") && values.get("natural").equals("coastline") )
+ values.remove("natural");
+
+ values.put("area", "yes");
+
+ List commands = new ArrayList();
+ boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
+
+ for( String key : values.keySet() ) {
+ List affectedWays = new ArrayList();
+ String value = values.get(key);
+
+ for( Way way : innerWays ) {
+ if( way.hasKey(key) && (value.equals(way.get(key))) ) {
+ affectedWays.add(way);
+ }
+ }
+
+ if( moveTags ) {
+ // remove duplicated tags from outer ways
+ for( Way way : outerWays ) {
+ if( way.hasKey(key) ) {
+ affectedWays.add(way);
+ }
+ }
+ }
+
+ if( affectedWays.size() > 0 ) {
// reset key tag on affected ways
- commands.add(new ChangePropertyCommand(affectedWays, key, null));
- }
- }
-
- if( moveTags ) {
- // add those tag values to the relation
-
- boolean fixed = false;
- Relation r2 = new Relation(relation);
- for( String key : values.keySet() ) {
- if( !r2.hasKey(key) && !key.equals("area") ) {
- if( relation.isNew() )
- relation.put(key, values.get(key));
- else
- r2.put(key, values.get(key));
- fixed = true;
- }
- }
- if( fixed && !relation.isNew() )
- commands.add(new ChangeCommand(relation, r2));
- }
-
- return commands;
+ commands.add(new ChangePropertyCommand(affectedWays, key, null));
+ }
+ }
+
+ if( moveTags ) {
+ // add those tag values to the relation
+
+ boolean fixed = false;
+ Relation r2 = new Relation(relation);
+ for( String key : values.keySet() ) {
+ if( !r2.hasKey(key) && !key.equals("area") ) {
+ if( relation.isNew() )
+ relation.put(key, values.get(key));
+ else
+ r2.put(key, values.get(key));
+ fixed = true;
+ }
+ }
+ if( fixed && !relation.isNew() )
+ commands.add(new ChangeCommand(relation, r2));
+ }
+
+ return commands;
}
}
Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 5817)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 5818)
@@ -272,5 +272,5 @@
* @param targetNode the target node the collection of nodes is merged to. Must not be null.
* @param targetLocationNode this node's location will be used for the targetNode.
- * @throw IllegalArgumentException thrown if layer is null
+ * @throws IllegalArgumentException thrown if layer is null
*/
public static Command mergeNodes(OsmDataLayer layer, Collection nodes, Node targetNode, Node targetLocationNode) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 5817)
+++ /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 5818)
@@ -119,5 +119,5 @@
* Replies the user name
*
- * @return the user name. Never null, but may be the empty string
+ * @return the user name. Never null, but may be the empty string
*/
public String getName() {
@@ -128,5 +128,5 @@
* Returns the list of user names
*
- * @returns list of names
+ * @return list of names
*/
public ArrayList getNames() {
@@ -147,4 +147,5 @@
*
* @param name
+ * @return true if the name is in the names list
*/
public boolean hasName(String name) {
@@ -160,4 +161,5 @@
* always bound to a user with the same name.
*
+ * @return the user id
*/
public long getId() {