You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/07/08 23:29:49 UTC
svn commit: r792330 - in /mina/sandbox/vysper/trunk/src:
main/java/org/apache/vysper/xmpp/modules/core/base/handler/
main/java/org/apache/vysper/xmpp/protocol/
main/java/org/apache/vysper/xmpp/stanza/
main/java/org/apache/vysper/xmpp/xmldecoder/ main/j...
Author: ngn
Date: Wed Jul 8 21:29:47 2009
New Revision: 792330
URL: http://svn.apache.org/viewvc?rev=792330&view=rev
Log:
Rename XMLElement.getNamespace() to XMLElement.getNamespacePrefix() to clarify it's intent
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java Wed Jul 8 21:29:47 2009
@@ -49,7 +49,7 @@
public boolean verify(Stanza stanza) {
if (stanza == null) return false;
if (!getName().equals(stanza.getName())) return false;
- String namespaceURI = stanza.getNamespace();
+ String namespaceURI = stanza.getNamespacePrefix();
if (namespaceURI == null) return false;
return namespaceURI.equals(NamespaceURIs.JABBER_CLIENT) || namespaceURI.equals(NamespaceURIs.JABBER_SERVER);
}
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java Wed Jul 8 21:29:47 2009
@@ -118,7 +118,7 @@
// another try to get a dictionary
if (namespaceHandlerDictionary == null) {
- namespace = xmlElement.getNamespace();
+ namespace = xmlElement.getNamespacePrefix();
namespaceHandlerDictionary = dictionaries.get(namespace);
}
if (namespaceHandlerDictionary != null) return namespaceHandlerDictionary.get(stanza);
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Wed Jul 8 21:29:47 2009
@@ -75,7 +75,7 @@
public static StanzaBuilder createDirectReply(XMPPCoreStanza original, boolean fromIsServerOnly, String type) {
if (original == null) throw new IllegalArgumentException();
- StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespace());
+ StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespacePrefix());
// reverse to and from
Entity newTo = original.getFrom();
if (newTo != null) {
@@ -103,7 +103,7 @@
* @return
*/
public static StanzaBuilder createClone(XMLElement original, boolean deep, List<Attribute> replacingAttributes) {
- StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespace());
+ StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespacePrefix());
List<Attribute> replacingAttributesCopy = new ArrayList<Attribute>(replacingAttributes);
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java Wed Jul 8 21:29:47 2009
@@ -44,7 +44,7 @@
}
public XMPPCoreStanza(Stanza stanza) {
- super(stanza.getName(), stanza.getNamespace(), stanza.getAttributes(), stanza.getInnerFragments());
+ super(stanza.getName(), stanza.getNamespacePrefix(), stanza.getAttributes(), stanza.getInnerFragments());
}
@Override
@@ -73,7 +73,7 @@
}
public boolean isServerCall() {
- return getNamespace().equals(NamespaceURIs.JABBER_SERVER);
+ return getNamespacePrefix().equals(NamespaceURIs.JABBER_SERVER);
}
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java Wed Jul 8 21:29:47 2009
@@ -102,7 +102,7 @@
} else if (particle.isOpeningOnlyElement()) {
XMLElement incompleteElement = getElementForOpening(particle, createStanza);
List<XMLFragment> innerFragments = convert(particles, particle.getElementName());
- XMLElement completedElement = createElementOrStanza(incompleteElement.getName(), incompleteElement.getAttributes(), incompleteElement.getNamespace(), innerFragments, createStanza);
+ XMLElement completedElement = createElementOrStanza(incompleteElement.getName(), incompleteElement.getAttributes(), incompleteElement.getNamespacePrefix(), innerFragments, createStanza);
fragments.add(completedElement);
} else if (particle.isClosingOnlyElement()) {
String closingElementName = getElementNameForClosingOnly(particle);
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java Wed Jul 8 21:29:47 2009
@@ -40,7 +40,7 @@
if (second == null) return false;
if (!first.getName().equals(second.getName())) return false;
- if (!first.getNamespace().equals(second.getNamespace())) return false;
+ if (!first.getNamespacePrefix().equals(second.getNamespacePrefix())) return false;
return equalsAttributes(first.getAttributes(), second.getAttributes());
}
@@ -55,7 +55,7 @@
if (second == null) return false;
if (!first.getName().equals(second.getName())) return false;
- if (!first.getNamespace().equals(second.getNamespace())) return false;
+ if (!first.getNamespacePrefix().equals(second.getNamespacePrefix())) return false;
boolean attrEquals = equalsAttributes(first.getAttributes(), second.getAttributes());
if (!attrEquals) return false;
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java Wed Jul 8 21:29:47 2009
@@ -57,7 +57,7 @@
private void renderXMLElement(XMLElement element, StringBuilder openElementBuffer, StringBuilder elementContentBuffer, StringBuilder closeElementBuffer) {
String name = element.getName();
- String namespace = element.getNamespace();
+ String namespace = element.getNamespacePrefix();
openElementBuffer.append("<");
renderElementName(openElementBuffer, element, namespace, name);
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java Wed Jul 8 21:29:47 2009
@@ -42,26 +42,26 @@
* if the namespace is 'http://ns.org', then element name b is prefixed with a.
* NOTE: the namespace value must NOT be "b"!
*/
- private String namespace;
+ private String namespacePrefix;
private List<Attribute> attributes;
private List<XMLFragment> innerFragments;
protected XMLElementVerifier xmlElementVerifier;
- public XMLElement(String name, String namespace, Attribute[] attributes, XMLFragment[] innerFragments) {
- this(name, namespace, FragmentFactory.asList(attributes), FragmentFactory.asList(innerFragments));
+ public XMLElement(String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
+ this(name, namespacePrefix, FragmentFactory.asList(attributes), FragmentFactory.asList(innerFragments));
}
- public XMLElement(String name, String namespace, List<Attribute> attributes, XMLFragment[] innerFragments) {
- this(name, namespace, attributes, FragmentFactory.asList(innerFragments));
+ public XMLElement(String name, String namespacePrefix, List<Attribute> attributes, XMLFragment[] innerFragments) {
+ this(name, namespacePrefix, attributes, FragmentFactory.asList(innerFragments));
}
- public XMLElement(String name, String namespace, Attribute[] attributes, List<XMLFragment> innerFragments) {
- this(name, namespace, FragmentFactory.asList(attributes), innerFragments);
+ public XMLElement(String name, String namespacePrefix, Attribute[] attributes, List<XMLFragment> innerFragments) {
+ this(name, namespacePrefix, FragmentFactory.asList(attributes), innerFragments);
}
- public XMLElement(String name, String namespace, List<Attribute> attributes, List<XMLFragment> innerFragments) {
- this.namespace = namespace == null ? NamespaceAttribute.DEFAULT_NAMESPACE : namespace;
+ public XMLElement(String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
+ this.namespacePrefix = namespacePrefix == null ? NamespaceAttribute.DEFAULT_NAMESPACE : namespacePrefix;
this.name = name;
this.attributes = (attributes == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(attributes);
this.innerFragments = (innerFragments == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(innerFragments);
@@ -72,8 +72,8 @@
return name;
}
- public String getNamespace() {
- return namespace;
+ public String getNamespacePrefix() {
+ return namespacePrefix;
}
public List<Attribute> getAttributes() {
@@ -203,7 +203,7 @@
return false;
}
if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) return false;
+ if (namespacePrefix != null ? !namespacePrefix.equals(that.namespacePrefix) : that.namespacePrefix != null) return false;
return true;
}
@@ -212,7 +212,7 @@
public int hashCode() {
int result;
result = (name != null ? name.hashCode() : 0);
- result = 29 * result + (namespace != null ? namespace.hashCode() : 0);
+ result = 29 * result + (namespacePrefix != null ? namespacePrefix.hashCode() : 0);
result = 29 * result + (attributes != null ? attributes.hashCode() : 0);
result = 29 * result + (innerFragments != null ? innerFragments.hashCode() : 0);
return result;
Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java Wed Jul 8 21:29:47 2009
@@ -197,6 +197,6 @@
XMLElement xmlElement = ((XMLElement) onlySubelement);
boolean nameEquals = name == null ? xmlElement.getName() == null : name.equals(xmlElement.getName());
if (namespaceURI == null) namespaceURI = NamespaceAttribute.DEFAULT_NAMESPACE;
- return nameEquals && namespaceURI.equals(xmlElement.getNamespace());
+ return nameEquals && namespaceURI.equals(xmlElement.getNamespacePrefix());
}
}
Modified: mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java Wed Jul 8 21:29:47 2009
@@ -124,7 +124,7 @@
Stanza stanzaParsed = (Stanza) protocolDecoderOutput.get(0);
String stanzaName = stanzaParsed.getName();
assertEquals("stream", stanzaName);
- String stanzaNS = stanzaParsed.getNamespace();
+ String stanzaNS = stanzaParsed.getNamespacePrefix();
assertEquals("stream", stanzaNS);
}
Modified: mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java (original)
+++ mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java Wed Jul 8 21:29:47 2009
@@ -54,7 +54,7 @@
protected Stanza executeIQLogic(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
incomingStanza = stanza;
- StanzaBuilder responseBuilder = new StanzaBuilder("iq", stanza.getNamespace());
+ StanzaBuilder responseBuilder = new StanzaBuilder("iq", stanza.getNamespacePrefix());
if (stanza.getID() != null) responseBuilder.addAttribute("id", stanza.getID());
responseBuilder.addAttribute("type", IQStanzaType.RESULT.value());
Modified: mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java (original)
+++ mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java Wed Jul 8 21:29:47 2009
@@ -51,7 +51,7 @@
if (namespaceURI == null) return true;
boolean elementNamespaceMatches = false;
- if (namespaceURI != null && namespaceURI.equals(stanza.getNamespace())) elementNamespaceMatches = true;
+ if (namespaceURI != null && namespaceURI.equals(stanza.getNamespacePrefix())) elementNamespaceMatches = true;
boolean outerNamespaceMatches = false;
boolean innerNamespaceMatches = false;
Modified: mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java?rev=792330&r1=792329&r2=792330&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java (original)
+++ mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java Wed Jul 8 21:29:47 2009
@@ -38,7 +38,7 @@
getFinalStanza();
assertEquals("message", xmlElement.getName());
- assertEquals("jabber:test", xmlElement.getNamespace());
+ assertEquals("jabber:test", xmlElement.getNamespacePrefix());
assertEquals("cn", xmlElement.getXMLLang());
assertSame(Collections.emptyList(), xmlElement.getInnerElements());