Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2014-11-13 15:15:41 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2014-11-26 09:39:53 (GMT) |
| commit | b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf (patch) | |
| tree | 39893e33d2bb88f0eef3e04ae9533bb1d6139c17 /src/com/isode/stroke/elements | |
| parent | 47cad5fd7883b8c7273ea11073643aa585b485c6 (diff) | |
| download | stroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.zip stroke-b89bf2f3363bac56fcc5d02f5fb690c73eaaacdf.tar.bz2 | |
Bring Stroke inline with Swiften with respect to MAM
Some patches for MAM had gone into swiften without being ported to stroke. This patch should bring stroke
update to date with Swiften.
The swiften patches in question are
9b762e1cf26cfe12cf601d9ea95cf91b3f95c799 -- Add node attribute to MAMQuery
8096f80861667381b777af774cfd446d6fc8cda8 -- Brining XEP-0313 (MAM) implementation in line with version 3.0.
Test-information:
Ran the updated JUnit tests in Eclipse they all passed ok.
Ran make and make test in a stroke checkout. Everything build ok and the JUNit tests passed.
Change-Id: I95bf5d598808f48fe2d7af12c0f07d852d68c115
Diffstat (limited to 'src/com/isode/stroke/elements')
| -rw-r--r-- | src/com/isode/stroke/elements/MAMArchived.java | 34 | ||||
| -rw-r--r-- | src/com/isode/stroke/elements/MAMFin.java | 60 | ||||
| -rw-r--r-- | src/com/isode/stroke/elements/MAMQuery.java | 10 |
3 files changed, 70 insertions, 34 deletions
diff --git a/src/com/isode/stroke/elements/MAMArchived.java b/src/com/isode/stroke/elements/MAMArchived.java deleted file mode 100644 index c8ab2d9..0000000 --- a/src/com/isode/stroke/elements/MAMArchived.java +++ /dev/null @@ -1,34 +0,0 @@ -/* -* Copyright (c) 2014 Kevin Smith and Remko Tronçon -* All rights reserved. -*/ - -/* -* Copyright (c) 2014, Isode Limited, London, England. -* All rights reserved. -*/ - -package com.isode.stroke.elements; - -import com.isode.stroke.jid.JID; - -public class MAMArchived extends Payload { - public void setBy(JID by) { - by_ = by; - } - - public JID getBy() { - return by_; - } - - public void setID(String id) { - id_ = id; - } - - public String getID() { - return id_; - } - - private JID by_; - private String id_; -} diff --git a/src/com/isode/stroke/elements/MAMFin.java b/src/com/isode/stroke/elements/MAMFin.java new file mode 100644 index 0000000..ebc39e8 --- /dev/null +++ b/src/com/isode/stroke/elements/MAMFin.java @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2014 Kevin Smith and Remko Tronçon +* All rights reserved. +*/ + +/* +* Copyright (c) 2014, Isode Limited, London, England. +* All rights reserved. +*/ + +package com.isode.stroke.elements; + +public class MAMFin extends Payload { + + private boolean isComplete_; + + private boolean isStable_; + + private ResultSet resultSet_; + + private String queryID_; + + public MAMFin() { + isComplete_ = false; + isStable_ = true; + } + + public boolean isComplete() { + return isComplete_; + } + + public void setComplete(boolean isComplete) { + this.isComplete_ = isComplete; + } + + public boolean isStable() { + return isStable_; + } + + public void setStable(boolean isStable) { + this.isStable_ = isStable; + } + + public ResultSet getResultSet() { + return resultSet_; + } + + public void setResultSet(ResultSet resultSet) { + this.resultSet_ = resultSet; + } + + public String getQueryID() { + return queryID_; + } + + public void setQueryID(String queryID) { + this.queryID_ = queryID; + } + +} diff --git a/src/com/isode/stroke/elements/MAMQuery.java b/src/com/isode/stroke/elements/MAMQuery.java index 6da30b5..b889a8e 100644 --- a/src/com/isode/stroke/elements/MAMQuery.java +++ b/src/com/isode/stroke/elements/MAMQuery.java @@ -11,6 +11,7 @@ package com.isode.stroke.elements; public class MAMQuery extends Payload { + public void setQueryID(String queryID) { queryID_ = queryID; } @@ -19,6 +20,14 @@ public class MAMQuery extends Payload { return queryID_; } + public void setNode(String node) { + node_ = node; + } + + public String getNode() { + return node_; + } + public void setForm(Form form) { form_ = form; } @@ -36,6 +45,7 @@ public class MAMQuery extends Payload { } private String queryID_; + private String node_; private Form form_; private ResultSet resultSet_; } |