Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-04-03 10:34:54 +02:00
commit 026e6bfbb7

View file

@ -104,7 +104,8 @@ public abstract class Entity implements Serializable {
private Map<String, String> tags = null;
private final long id;
private boolean dataLoaded;
private int modify;
private int modify;
private int version;
public static final int MODIFY_UNKNOWN = 0;
public static final int MODIFY_DELETED = -1;
public static final int MODIFY_MODIFIED = 1;
@ -173,6 +174,14 @@ public abstract class Entity implements Serializable {
return tags.get(key);
}
public int getVersion() {
return version;
}
public void setVersion(int version) {
this.version = version;
}
public Map<String, String> getTags() {
if(tags == null){
return Collections.emptyMap();