Changeset 63 in josm


Ignore:
Timestamp:
2006-03-16T00:30:49+01:00 (14 years ago)
Author:
imi
Message:
  • updated legal stuff (MinML2 License).
  • fixed that 410 on delete is not an error.
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONTRIBUTION

    r41 r63  
    1 The XML Parser is JDOM 1.0 and comes from www.jdom.org.
    2 It is licensed under "JDOM license", a modified Apache License
    3 with Aknowledgement removed.
     1One XML Parser is JDOM 1.0 which comes from www.jdom.org and
     2is licensed under "JDOM license", a modified Apache License
     3with Aknowledgement removed. The other is MinML2 from
     4http://www.wilson.co.uk/xml/minml2.htm. The license is
     5attached below.
    46
    57The icons are inspired and stolen from gnome-media package
     
    1416
    1517Imi.
     18
     19
     20
     21All content of MinML2.jar is licensed under:
     22----------------MinML2 license--------------------
     23Copyright (c) 1999, John Wilson (tug@wilson.co.uk).
     24All rights reserved.
     25Redistribution and use in source and binary forms,
     26with or without modification, are permitted provided
     27that the following conditions are met:
     28
     29Redistributions of source code must retain the above
     30copyright notice, this list of conditions and the
     31following disclaimer.
     32
     33Redistributions in binary form must reproduce the
     34above copyright notice, this list of conditions and
     35the following disclaimer in the documentation and/or
     36other materials provided with the distribution.
     37
     38All advertising materials mentioning features or use
     39of this software must display the following acknowledgement:
     40
     41This product includes software developed by John Wilson.
     42The name of John Wilson may not be used to endorse or promote
     43products derived from this software without specific prior
     44written permission.
     45
     46THIS SOFTWARE IS PROVIDED BY JOHN WILSON ``AS IS'' AND ANY
     47EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     48THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
     49PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JOHN WILSON
     50BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
     51EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
     52TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     53DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
     54ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     55LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
     56IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     57OF THE POSSIBILITY OF SUCH DAMAGE
     58--------------------------------------------------
  • LICENSE

    r36 r63  
    11JOSM and all files included in this archive and the source archive from
    22
    3 http://www.eigenheimstrasse.de/josm
    4 
    5 except the JDOM files and parts of UTM.java are copyrighted 2005-2006
    6 by Immanuel Scholz.
    7 
     3http://www.eigenheimstrasse.de/svn/josm
     4
     5except the JDOM files, MinML2 files and parts of UTM.java are
     6copyrighted 2005-2006 by Immanuel Scholz.
    87The files are distributed under the terms of the following License:
    98
  • README

    r41 r63  
    1 This is a readme.txt to the Java OpenStreetMap Editor Beta
     1This is a readme.txt to the Java OpenStreetMap Editor
    22
    33
  • src/org/openstreetmap/josm/io/OsmServerWriter.java

    r61 r63  
    167167                                OsmWriter.outputSingle(out, osm, true);
    168168                                out.close();
    169                                
    170                                 StringWriter o = new StringWriter();
    171                                 OsmWriter.outputSingle(o, osm, true);
    172                                 System.out.println(o.getBuffer().toString());
    173169                        }
    174170
     
    179175                        String retMsg = con.getResponseMessage();
    180176                        con.disconnect();
    181                         if (retCode != 200)
     177                        if (retCode == 410 && requestMethod.equals("DELETE"))
     178                                return; // everything fine.. was already deleted.
     179                        if (retCode != 200) {
     180                                StringWriter o = new StringWriter();
     181                                OsmWriter.outputSingle(o, osm, true);
     182                                System.out.println(o.getBuffer().toString());
    182183                                throw new RuntimeException(retCode+" "+retMsg);
     184                        }
    183185                } catch (UnknownHostException e) {
    184186                        throw new RuntimeException("Unknown host: "+e.getMessage(), e);
Note: See TracChangeset for help on using the changeset viewer.