Changeset 63 in josm

Timestamp:

2006-03-16T00:30:49+01:00 (18 years ago)

Author:

imi

Message:

• updated legal stuff (MinML2 License).
• fixed that 410 on delete is not an error.

Files:

• CONTRIBUTION (modified) (2 diffs)
• LICENSE (modified) (1 diff)
• README (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (2 diffs)

CONTRIBUTION

@@ -1 @@
-The XML Parser is JDOM 1.0 and comes from www.jdom.org. 
-It is licensed under "JDOM license", a modified Apache License
-with Aknowledgement removed.
+One XML Parser is JDOM 1.0 which comes from www.jdom.org and
+is licensed under "JDOM license", a modified Apache License
+with Aknowledgement removed. The other is MinML2 from
+http://www.wilson.co.uk/xml/minml2.htm. The license is 
+attached below.
 
 The icons are inspired and stolen from gnome-media package 
@@ -14 +16 @@
 
 Imi.
+
+
+
+All content of MinML2.jar is licensed under:
+----------------MinML2 license--------------------
+Copyright (c) 1999, John Wilson (tug@wilson.co.uk). 
+All rights reserved.
+Redistribution and use in source and binary forms,
+with or without modification, are permitted provided
+that the following conditions are met:
+
+Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+All advertising materials mentioning features or use
+of this software must display the following acknowledgement: 
+
+This product includes software developed by John Wilson. 
+The name of John Wilson may not be used to endorse or promote
+products derived from this software without specific prior
+written permission. 
+
+THIS SOFTWARE IS PROVIDED BY JOHN WILSON ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JOHN WILSON
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE
+--------------------------------------------------

LICENSE

@@ -1 +1 @@
 JOSM and all files included in this archive and the source archive from
 
-http://www.eigenheimstrasse.de/josm
-
-except the JDOM files and parts of UTM.java are copyrighted 2005-2006
-by Immanuel Scholz.
-
+http://www.eigenheimstrasse.de/svn/josm
+
+except the JDOM files, MinML2 files and parts of UTM.java are
+copyrighted 2005-2006 by Immanuel Scholz.
 The files are distributed under the terms of the following License:
 

README

@@ -1 @@
-This is a readme.txt to the Java OpenStreetMap Editor Beta
+This is a readme.txt to the Java OpenStreetMap Editor
 
 

src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -167 +167 @@
                                 OsmWriter.outputSingle(out, osm, true);
                                 out.close();
-                                
-                                StringWriter o = new StringWriter();
-                                OsmWriter.outputSingle(o, osm, true);
-                                System.out.println(o.getBuffer().toString());
                         }
 
@@ -179 +175 @@
                         String retMsg = con.getResponseMessage();
                         con.disconnect();
-                        if (retCode != 200)
+                        if (retCode == 410 && requestMethod.equals("DELETE"))
+                                return; // everything fine.. was already deleted.
+                        if (retCode != 200) {
+                                StringWriter o = new StringWriter();
+                                OsmWriter.outputSingle(o, osm, true);
+                                System.out.println(o.getBuffer().toString());
                                 throw new RuntimeException(retCode+" "+retMsg);
+                        }
                 } catch (UnknownHostException e) {
                         throw new RuntimeException("Unknown host: "+e.getMessage(), e);