Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2015-04-30 16:12:17 (GMT) |
|---|---|---|
| committer | Alan Young <consult.awy@gmail.com> | 2015-05-01 08:18:03 (GMT) |
| commit | 6385fd0f848ffd829ca52a04a90989730a10616f (patch) | |
| tree | 53aaf2b63d2a974c3fa26429c6d235203ff9893b /src/com/isode/stroke/elements | |
| parent | cd8e073cabc9a39abb14527b6e968ece1586b7ec (diff) | |
| download | stroke-6385fd0f848ffd829ca52a04a90989730a10616f.zip stroke-6385fd0f848ffd829ca52a04a90989730a10616f.tar.bz2 | |
Add parser & serializer for SecurityLabel & SecurityLabelsCatalog
Change visibility of some methods in SecurityLabel &
SecurityLabelsCatalog and provide default values for strings and
collections in those clases.
Change-Id: I1ea3f6b20deac1d1ac7999dd304e2e755d5e7c8a
Diffstat (limited to 'src/com/isode/stroke/elements')
| -rw-r--r-- | src/com/isode/stroke/elements/SecurityLabel.java | 40 | ||||
| -rw-r--r-- | src/com/isode/stroke/elements/SecurityLabelsCatalog.java | 21 |
2 files changed, 31 insertions, 30 deletions
diff --git a/src/com/isode/stroke/elements/SecurityLabel.java b/src/com/isode/stroke/elements/SecurityLabel.java index 8134811..d20d529 100644 --- a/src/com/isode/stroke/elements/SecurityLabel.java +++ b/src/com/isode/stroke/elements/SecurityLabel.java @@ -10,53 +10,53 @@ import java.util.Collection; public class SecurityLabel extends Payload { private Collection<String> equivalentLabels = new ArrayList<String>(); - private String foregroundColor; - private String displayMarking; - private String backgroundColor; - private String label; + private String foregroundColor = ""; + private String displayMarking = ""; + private String backgroundColor = ""; + private String label = ""; - final Collection<String> getEquivalentLabels() { + public final Collection<String> getEquivalentLabels() { return equivalentLabels; } - void setEquivalentLabels(final Collection<String> value) { - this.equivalentLabels = value ; + public void setEquivalentLabels(final Collection<String> value) { + this.equivalentLabels = value; } - void addEquivalentLabel(final String value) { + public void addEquivalentLabel(final String value) { this.equivalentLabels.add(value); } - final String getForegroundColor() { + public final String getForegroundColor() { return foregroundColor; } - void setForegroundColor(final String value) { - this.foregroundColor = value ; + public void setForegroundColor(final String value) { + this.foregroundColor = value; } - final String getDisplayMarking() { + public final String getDisplayMarking() { return displayMarking; } - void setDisplayMarking(final String value) { - this.displayMarking = value ; + public void setDisplayMarking(final String value) { + this.displayMarking = value; } - final String getBackgroundColor() { + public final String getBackgroundColor() { return backgroundColor; } - void setBackgroundColor(final String value) { - this.backgroundColor = value ; + public void setBackgroundColor(final String value) { + this.backgroundColor = value; } - final String getLabel() { + public final String getLabel() { return label; } - void setLabel(final String value) { - this.label = value ; + public void setLabel(final String value) { + this.label = value; } } diff --git a/src/com/isode/stroke/elements/SecurityLabelsCatalog.java b/src/com/isode/stroke/elements/SecurityLabelsCatalog.java index 4bb9493..29cf3f7 100644 --- a/src/com/isode/stroke/elements/SecurityLabelsCatalog.java +++ b/src/com/isode/stroke/elements/SecurityLabelsCatalog.java @@ -4,38 +4,39 @@ */ package com.isode.stroke.elements; +import java.util.ArrayList; import java.util.Collection; import com.isode.stroke.jid.JID; public class SecurityLabelsCatalog extends Payload { private JID to_; - private String name_; - private String description_; - private Collection<Item> items_; + private String name_ = ""; + private String description_ = ""; + private Collection<Item> items_ = new ArrayList<Item>(); - public class Item { + public static class Item { private SecurityLabel label_; - private String selector_; + private String selector_ = ""; private boolean default_; public SecurityLabel getLabel() { return label_; } - void setLabel(SecurityLabel label) { + public void setLabel(SecurityLabel label) { label_ = label; } - final String getSelector() { return selector_; } + public final String getSelector() { return selector_; } - void setSelector(final String selector) { + public void setSelector(final String selector) { selector_ = selector; } - boolean getIsDefault() { return default_; } + public boolean getIsDefault() { return default_; } - void setIsDefault(boolean isDefault) { + public void setIsDefault(boolean isDefault) { default_ = isDefault; } }; |