doc/asmack-beem/beem_patches/50-public-info-features.patch
author Nikita Kozlov <nikita@mbdsys.com>
Sun, 05 Dec 2010 18:45:47 +0100
changeset 811 6cbb9b3117b7
parent 797 fbd3585af53e
permissions -rwxr-xr-x
merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
797
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     1
   Copyright (C) 2010 by Frederic-Charles Barthelery,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     2
                         Jean-Manuel Da Silva,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     3
                         Nikita Kozlov,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     4
                         Philippe Lago,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     5
                         Jean Baptiste Vergely,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     6
                         Vincent Veronis.
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     7
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     8
   Licensed under the Apache License, Version 2.0 (the "License");
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
     9
   you may not use this file except in compliance with the License.
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    10
   You may obtain a copy of the License at
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    11
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    12
       http://www.apache.org/licenses/LICENSE-2.0
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    13
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    14
   Unless required by applicable law or agreed to in writing, software
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    15
   distributed under the License is distributed on an "AS IS" BASIS,
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    16
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    17
   See the License for the specific language governing permissions and
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    18
   limitations under the License.
fbd3585af53e Explicit Apache License 2.0 for asmack_patches
Da Risk <darisk972@gmail.com>
parents: 793
diff changeset
    19
793
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    20
--- org/jivesoftware/smackx/packet/DiscoverInfo.java	2010-07-22 22:16:27.000000000 +0200
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    21
+++ org/jivesoftware/smackx/packet/DiscoverInfo.java	2010-07-22 22:58:43.000000000 +0200
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    22
@@ -62,7 +62,7 @@
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    23
      *
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    24
      * @return an Iterator on the discovered features of an XMPP entity
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    25
      */
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    26
-    Iterator<Feature> getFeatures() {
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    27
+    public Iterator<Feature> getFeatures() {
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    28
         synchronized (features) {
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    29
             return Collections.unmodifiableList(features).iterator();
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    30
         }
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    31
@@ -266,4 +266,4 @@
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    32
             return buf.toString();
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    33
         }
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    34
     }
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    35
-}
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    36
\ Pas de fin de ligne à la fin du fichier.
4fb9df09ffdf #286 : Initial implementation of XEP-0115 : Entity Capabilities
Da Risk <darisk972@gmail.com>
parents:
diff changeset
    37
+}