Mercurial Mercurial > beem > trunk / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/asmack-beem/beem_patches/50-improved-pubsub.patch
author Nikita Kozlov <nikita@beem-project.com>
Sun, 16 Jan 2011 12:44:59 +0100
changeset 844 30d32b73be7c
parent 804 eaecdcf75b02
permissions -rw-r--r--
fix Bug #321 I have commented the PrivacyListManagerAdapter initialization because the exception came from the underneath code. Also, since the feature isn't finished (especially tested) and enabled in the gui, it will be safer.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
804
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
--- ../../../src/smack/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java	(révision 11644)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
+++ org/jivesoftware/smackx/pubsub/provider/ItemProvider.java	(copie de travail)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
@@ -45,6 +45,8 @@
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
 		}
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
 		else
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
 		{
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
+		    while (tag != XmlPullParser.START_TAG)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
+			tag = parser.next();
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
 			String payloadElemName = parser.getName();
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
 			String payloadNS = parser.getNamespace();
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
--- ../../../src/org/jivesoftware/smackx/pubsub/Node.java	(révision 11644)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
+++ org/jivesoftware/smackx/pubsub/Node.java	(copie de travail)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
 
@@ -60,7 +60,7 @@
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
 	 *
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 
 	 *   For example, OpenFire requires the server to be prefixed by <b>pubsub</b>
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
 	 */
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    18
 
-	void setTo(String toAddress)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    19
 
+	public void setTo(String toAddress)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    20
 
 	{
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    21
 
 		to = toAddress;
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    22
 
 	}
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    23
 
--- ../../../src/org/jivesoftware/smackx/pubsub/LeafNode.java	(révision 11644)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    24
 
+++ org/jivesoftware/smackx/pubsub/LeafNode.java	(copie de travail)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    25
 
@@ -34,7 +34,7 @@
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    26
 
  */
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    27
 
 public class LeafNode extends Node
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    28
 
 {
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    29
 
-	LeafNode(Connection connection, String nodeName)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    30
 
+	public LeafNode(Connection connection, String nodeName)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    31
 
 	{
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    32
 
 		super(connection, nodeName);
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    33
 
 	}
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    34
 
--- ../../../src/org/jivesoftware/smackx/pubsub/PubSubManager.java	(révision 11644)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    35
 
+++ org/jivesoftware/smackx/pubsub/PubSubManager.java	(copie de travail)
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    36
 
@@ -43,8 +43,8 @@
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    37
 
  */
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    38
 
 final public class PubSubManager
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    39
 
 {
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    40
 
-	private Connection con;
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    41
 
-	private String to;
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    42
 
+	protected Connection con;
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    43
 
+	protected String to;
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    44
 
 	private Map<String, Node> nodeMap = new ConcurrentHashMap<String, Node>();
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    45
eaecdcf75b02 Complete user avatar implementation in reception
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    46
 
 	/**
BEEM