Skip to content

Fixed StyleMap deserialization #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matiash wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed StyleMap deserialization #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eeda19
Fixed StyleMap deserialization
matiash Nov 24, 2014
fde1490
Removed unused import.
matiash Nov 24, 2014
e4416b4
A Polygon can contain more than one inner boundary.
matiash Nov 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions SimpleKML/src/com/ekito/simpleKML/model/Polygon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
*/
package com.ekito.simpleKML.model;

import java.util.List;

import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;

/**
* A Polygon is defined by an outer boundary and 0 or more inner boundaries. The boundaries, in turn, are defined by LinearRings. When a Polygon is extruded, its boundaries are connected to the ground to form additional polygons, which gives the appearance of a building or a box. Extruded Polygons use {@link PolyStyle} for their color, color mode, and fill.
Expand All @@ -41,8 +44,8 @@ public class Polygon extends Geometry {
private Boundary outerBoundaryIs;

/** The inner boundary is. */
@Element(required=false)
private Boundary innerBoundaryIs;
@ElementList(entry="innerBoundaryIs", inline=true, type=Boundary.class, required=false)
private List<Boundary> innerBoundaryIsList;

/**
* Gets the extrude.
Expand Down Expand Up @@ -121,16 +124,16 @@ public void setOuterBoundaryIs(Boundary outerBoundaryIs) {
*
* @return the inner boundary is
*/
public Boundary getInnerBoundaryIs() {
return innerBoundaryIs;
public List<Boundary> getInnerBoundaryIsList() {
return innerBoundaryIsList;
}

/**
* Sets the inner boundary is.
*
* @param innerBoundaryIs the new inner boundary is
*/
public void setInnerBoundaryIs(Boundary innerBoundaryIs) {
this.innerBoundaryIs = innerBoundaryIs;
public void setInnerBoundaryIs(List<Boundary> innerBoundaryIsList) {
this.innerBoundaryIsList = innerBoundaryIsList;
}
}
3 changes: 1 addition & 2 deletions SimpleKML/src/com/ekito/simpleKML/model/StyleMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.util.List;

import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;

/**
Expand All @@ -26,7 +25,7 @@
public class StyleMap extends StyleSelector {

/** The pair list. */
@ElementList(entry="Pair", inline=false, type=Pair.class, required=false)
@ElementList(entry="Pair", inline=true, type=Pair.class, required=false)
private List<Pair> pairList;

/**
Expand Down