Commits

Jan Brohl committed fa0a949

Neue Lizenz: 2-Clause-BSD

Comments (0)

Files changed (14)

+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 import java.io.IOException;
 import java.text.ParseException;
 

src/de/scoutnet/api/API.java

 package de.scoutnet.api;
 
+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 import java.io.IOException;
 import java.text.ParseException;
 
 import org.json.JSONException;
 
-/*
- Copyright (c) 2012, Jan Brohl
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
-
 public class API extends ScoutnetObject {
 	public static Event getEvent(int id) throws JSONException, IOException,
 			ParseException {
 		return (Section) getForPath("section/" + id + "/");
 	}
 
-	public static SectionCollection getSections(int[] ids) throws JSONException,
-			IOException, ParseException {
+	public static SectionCollection getSections(int[] ids)
+			throws JSONException, IOException, ParseException {
 		return (SectionCollection) queryForPath("sections/", ids);
 	}
 

src/de/scoutnet/api/Event.java

 package de.scoutnet.api;
 
+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 import java.util.Date;
 import java.util.Map;
 
 
 	public abstract String getDescription();
 
+	public abstract Date getEndDate();
+
+	public abstract Date getEndTime();
+
+	public abstract int getGroup_id();
+
+	public abstract int getId();
+
+	public abstract Map<Integer, String> getKeywords();
+
 	public abstract String getKind();
 
 	public abstract String getLastModifiedBy();
 
+	public abstract Date getLastModifiedOn();
+
 	public abstract String getLocation();
 
+	public abstract Date getStartDate();
+
+	public abstract Date getStartTime();
+
 	public abstract String getTitle();
 
+	public abstract int getUid();
+
 	public abstract String getUrl();
 
 	public abstract String getUrlText();
 
 	public abstract String getZip();
 
-	public abstract int getGroup_id();
-
-	public abstract int getId();
-
-	public abstract int getUid();
-
-	public abstract Date getEndDate();
-
-	public abstract Date getEndTime();
-
-	public abstract Date getLastModifiedOn();
-
-	public abstract Date getStartDate();
-
-	public abstract Date getStartTime();
-
-	public abstract Map<Integer, String> getKeywords();
-
 }

src/de/scoutnet/api/EventCollection.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
 public class EventCollection extends ScoutnetCollectionImpl<Event> {
 
 	public EventCollection(String kind, String element_kind, Event[] elements) {

src/de/scoutnet/api/EventImpl.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
  */
 
 import java.text.DateFormat;
 		last_modified_on = dt.parse(jso.getString("last_modified_on"));
 		start_date = d.parse(jso.getString("start_date"));
 		start_time = t.parse(jso.getString("start_time"));
-		keywords = new HashMap<Integer,String>();
+		keywords = new HashMap<Integer, String>();
 		JSONObject kw = jso.getJSONObject("keywords");
 		@SuppressWarnings("unchecked")
 		Iterator<String> it = kw.keys();
 		}
 
 	}
-	/* (non-Javadoc)
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getDescription()
 	 */
 	@Override
 		return description;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getEnd_date()
+	 */
+	@Override
+	public Date getEndDate() {
+		return end_date;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getEnd_time()
+	 */
+	@Override
+	public Date getEndTime() {
+		return end_time;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getGroup_id()
+	 */
+	@Override
+	public int getGroup_id() {
+		return group_id;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getId()
+	 */
+	@Override
+	public int getId() {
+		return id;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getKeywords()
+	 */
+	@Override
+	public Map<Integer, String> getKeywords() {
+		return keywords;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getKind()
 	 */
 	@Override
 		return kind;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getLastModifiedBy()
 	 */
 	@Override
 		return last_modified_by;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getLast_modified_on()
+	 */
+	@Override
+	public Date getLastModifiedOn() {
+		return last_modified_on;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getLocation()
 	 */
 	@Override
 		return location;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getStart_date()
+	 */
+	@Override
+	public Date getStartDate() {
+		return start_date;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getStart_time()
+	 */
+	@Override
+	public Date getStartTime() {
+		return start_time;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getTitle()
 	 */
 	@Override
 		return title;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Event#getUid()
+	 */
+	@Override
+	public int getUid() {
+		return uid;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getUrl()
 	 */
 	@Override
 		return url;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getUrlText()
 	 */
 	@Override
 		return url_text;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Event#getZip()
 	 */
 	@Override
 		return zip;
 	}
 
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getGroup_id()
-	 */
-	@Override
-	public int getGroup_id() {
-		return group_id;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getId()
-	 */
-	@Override
-	public int getId() {
-		return id;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getUid()
-	 */
-	@Override
-	public int getUid() {
-		return uid;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getEnd_date()
-	 */
-	@Override
-	public Date getEndDate() {
-		return end_date;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getEnd_time()
-	 */
-	@Override
-	public Date getEndTime() {
-		return end_time;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getLast_modified_on()
-	 */
-	@Override
-	public Date getLastModifiedOn() {
-		return last_modified_on;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getStart_date()
-	 */
-	@Override
-	public Date getStartDate() {
-		return start_date;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getStart_time()
-	 */
-	@Override
-	public Date getStartTime() {
-		return start_time;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Event#getKeywords()
-	 */
-	@Override
-	public Map<Integer, String> getKeywords() {
-		return keywords;
-	}
-
-
 }

src/de/scoutnet/api/Group.java

 package de.scoutnet.api;
 
+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 import java.io.IOException;
 import java.text.ParseException;
 
 
 public interface Group {
 
-	public abstract EventCollection getEvents() throws JSONException, IOException,
-			ParseException;
+	public abstract String getCity();
+
+	public abstract String getCountry();
+
+	public abstract String getDistrict();
+
+	public abstract EventCollection getEvents() throws JSONException,
+			IOException, ParseException;
 
 	public abstract EventCollection getEvents(String query, String[] args)
 			throws JSONException, IOException, ParseException;
 
+	public abstract String getFederalState();
+
+	public abstract int getGlobalId();
+
+	public abstract String getInternalId();
+
+	public abstract String getKind();
+
+	public abstract String getLayer();
+
+	public abstract String getName();
+
 	public abstract Group getParent() throws JSONException, IOException,
 			ParseException;
 
 	public abstract SectionCollection getSections() throws JSONException,
 			IOException, ParseException;
 
-	public abstract String getCity();
-
-	public abstract String getCountry();
-
-	public abstract String getDistrict();
-
-	public abstract String getFederalState();
-
-	public abstract String getInternalId();
-
-	public abstract String getKind();
-
-	public abstract String getLayer();
-
-	public abstract String getName();
-
 	public abstract String getZip();
 
-	public abstract int getGlobalId();
-
 }

src/de/scoutnet/api/GroupCollection.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
 public class GroupCollection extends ScoutnetCollectionImpl<Group> {
 
 	public GroupCollection(String kind, String element_kind, Group[] elements) {

src/de/scoutnet/api/GroupImpl.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
 import java.io.IOException;
 import java.text.ParseException;
 
 		global_id = jso.getInt("global_id");
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getCity()
+	 */
+	@Override
+	public String getCity() {
+		return city;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getCountry()
+	 */
+	@Override
+	public String getCountry() {
+		return country;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getDistrict()
+	 */
+	@Override
+	public String getDistrict() {
+		return district;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#events()
 	 */
 	@Override
 		return (EventCollection) getForPath("group/" + global_id + "/events/");
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#events(java.lang.String, java.lang.String[])
 	 */
 	@Override
 				"group/" + global_id + "/events/", query, args);
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getFederal_state()
+	 */
+	@Override
+	public String getFederalState() {
+		return federal_state;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getGlobal_id()
+	 */
+	@Override
+	public int getGlobalId() {
+		return global_id;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getInternal_id()
+	 */
+	@Override
+	public String getInternalId() {
+		return internal_id;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getKind()
+	 */
+	@Override
+	public String getKind() {
+		return kind;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getLayer()
+	 */
+	@Override
+	public String getLayer() {
+		return layer;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Group#getName()
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#parent()
 	 */
 	@Override
 		return (Group) getForPath("group/" + global_id + "/parent/");
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#parents()
 	 */
 	@Override
 		return (GroupCollection) getForPath("group/" + global_id + "/parents/");
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#sections()
 	 */
 	@Override
 				+ "/sections/");
 	}
 
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getCity()
-	 */
-	@Override
-	public String getCity() {
-		return city;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getCountry()
-	 */
-	@Override
-	public String getCountry() {
-		return country;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getDistrict()
-	 */
-	@Override
-	public String getDistrict() {
-		return district;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getFederal_state()
-	 */
-	@Override
-	public String getFederalState() {
-		return federal_state;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getInternal_id()
-	 */
-	@Override
-	public String getInternalId() {
-		return internal_id;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getKind()
-	 */
-	@Override
-	public String getKind() {
-		return kind;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getLayer()
-	 */
-	@Override
-	public String getLayer() {
-		return layer;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getName()
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Group#getZip()
 	 */
 	@Override
 		return zip;
 	}
 
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Group#getGlobal_id()
-	 */
-	@Override
-	public int getGlobalId() {
-		return global_id;
-	}
-
 }

src/de/scoutnet/api/ScoutnetCollection.java

 package de.scoutnet.api;
 
+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 interface ScoutnetCollection<T> {
 
-	public abstract String toString();
-
-	public abstract String getKind();
-
 	public abstract String getElement_kind();
 
 	public abstract T[] getElements();
 
+	public abstract String getKind();
+
+	@Override
+	public abstract String toString();
+
 }

src/de/scoutnet/api/ScoutnetCollectionImpl.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
-class ScoutnetCollectionImpl<T> extends ScoutnetObject implements ScoutnetCollection<T> {
+class ScoutnetCollectionImpl<T> extends ScoutnetObject implements
+		ScoutnetCollection<T> {
 	protected String kind, element_kind;
 	protected T[] elements;
 
 		this.element_kind = element_kind;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.ScoutnetCollection#getElement_kind()
+	 */
+	@Override
+	public String getElement_kind() {
+		return element_kind;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.ScoutnetCollection#getElements()
+	 */
+	@Override
+	public T[] getElements() {
+		return elements;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.ScoutnetCollection#getKind()
+	 */
+	@Override
+	public String getKind() {
+		return kind;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.ScoutnetCollection#toString()
 	 */
 	@Override
 		}
 		return out + "})";
 	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.ScoutnetCollection#getKind()
-	 */
-	@Override
-	public String getKind() {
-		return kind;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.ScoutnetCollection#getElement_kind()
-	 */
-	@Override
-	public String getElement_kind() {
-		return element_kind;
-	}
-
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.ScoutnetCollection#getElements()
-	 */
-	@Override
-	public T[] getElements() {
-		return elements;
-	}
 }

src/de/scoutnet/api/ScoutnetObject.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
  */
 
 import java.io.BufferedReader;

src/de/scoutnet/api/Section.java

 package de.scoutnet.api;
 
+/*
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
+
 public interface Section {
 
 	public abstract String getColor();
 
+	public abstract int getEndAge();
+
+	public abstract int getId();
+
 	public abstract String getKind();
 
 	public abstract String getName();
 
-	public abstract int getId();
-
 	public abstract int getStartAge();
 
-	public abstract int getEndAge();
-
 }

src/de/scoutnet/api/SectionCollection.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
 public class SectionCollection extends ScoutnetCollectionImpl<Section> {
 
 	public SectionCollection(String kind, String element_kind,

src/de/scoutnet/api/SectionImpl.java

 package de.scoutnet.api;
 
 /*
- Copyright (c) 2012, Jan Brohl
- All rights reserved.
+ * @author Jan Brohl <janbrohl@t-online.de>
+ * Copyright (c) 2012, Jan Brohl <janbrohl@t-online.de>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * <ul>
+ * <li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * <li> 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.
+ * </ul>
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
+ */
 
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
- */
 import org.json.JSONException;
 import org.json.JSONObject;
 
 		end_age = jso.getInt("end_age");
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Section#getColor()
 	 */
 	@Override
 		return color;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Section#getEnd_age()
+	 */
+	@Override
+	public int getEndAge() {
+		return end_age;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.scoutnet.api.Section#getId()
+	 */
+	@Override
+	public int getId() {
+		return id;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Section#getKind()
 	 */
 	@Override
 		return kind;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Section#getName()
 	 */
 	@Override
 		return name;
 	}
 
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Section#getId()
-	 */
-	@Override
-	public int getId() {
-		return id;
-	}
-
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see de.scoutnet.api.Section#getStart_age()
 	 */
 	@Override
 		return start_age;
 	}
 
-	/* (non-Javadoc)
-	 * @see de.scoutnet.api.Section#getEnd_age()
-	 */
-	@Override
-	public int getEndAge() {
-		return end_age;
-	}
-
 }