You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/11/03 23:46:33 UTC
svn commit: r710202 - in /labs/vysper/src/main/java/org/apache/vysper/xmpp:
delivery/StanzaRelayBroker.java modules/roster/RosterGroup.java
modules/roster/RosterItem.java modules/roster/handler/RosterIQHandler.java
Author: berndf
Date: Mon Nov 3 14:46:33 2008
New Revision: 710202
URL: http://svn.apache.org/viewvc?rev=710202&view=rev
Log:
[vysper] LABS-119: on roster-set modify name and groups
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java?rev=710202&r1=710201&r2=710202&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java Mon Nov 3 14:46:33 2008
@@ -49,7 +49,7 @@
// TODO if received <presence/> from another server with no 'to', broadcast to subscribed entities
// TODO if received <iq/>/get/set with no 'to', see 3920bis#11.1.4
- throw new RuntimeException("not yet implemented");
+ throw new RuntimeException("server as the direct receiver of stanza not yet implemented");
//return;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java?rev=710202&r1=710201&r2=710202&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java Mon Nov 3 14:46:33 2008
@@ -46,4 +46,9 @@
public int hashCode() {
return name != null ? name.hashCode() : 0;
}
+
+ @Override
+ public String toString() {
+ return name;
+ }
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java?rev=710202&r1=710201&r2=710202&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java Mon Nov 3 14:46:33 2008
@@ -63,10 +63,19 @@
return name;
}
+ public void setName(String name) {
+ this.name = name;
+ }
+
public List<RosterGroup> getGroups() {
return Collections.unmodifiableList(groups);
}
+ public void setGroups(List<RosterGroup> newGroups) {
+ this.groups.clear();
+ this.groups.addAll(newGroups);
+ }
+
public SubscriptionType getSubscriptionType() {
return subscriptionType;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java?rev=710202&r1=710201&r2=710202&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java Mon Nov 3 14:46:33 2008
@@ -199,10 +199,11 @@
synchronized (existingItem) {
if (setRosterItem.getName() != null) {
- // TODO set name on item
- logger.debug("{} roster: set roster item name to {}", user.getBareJID(), setRosterItem.getName());
+ existingItem.setName(setRosterItem.getName());
+ logger.debug("{} roster: set roster item name to {}", user.getBareJID().getCanonicalizedName(), setRosterItem.getName());
}
- // TODO set groups on item
+ existingItem.setGroups(setRosterItem.getGroups());
+ logger.debug("{} roster: roster item groups set to {}", user.getBareJID().getCanonicalizedName(), setRosterItem.getGroups());
}
return RosterStanzaUtils.createRosterItemIQ(user, stanza.getID(), IQStanzaType.RESULT, existingItem);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org