summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-09-07 08:36:35 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-09-07 08:36:50 (GMT)
commitd718c0b3c2b5195ce2e88080f5e06090b4884c2f (patch)
treefc24cf3bc326e012569c4382fb2983959f39251e /src/com/isode/stroke/jid/JID.java
parenta39457d1c736edf4666808906e8c0c7158f2b903 (diff)
downloadstroke-d718c0b3c2b5195ce2e88080f5e06090b4884c2f.zip
stroke-d718c0b3c2b5195ce2e88080f5e06090b4884c2f.tar.bz2
Fixing whitespace
Diffstat (limited to 'src/com/isode/stroke/jid/JID.java')
-rw-r--r--src/com/isode/stroke/jid/JID.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/com/isode/stroke/jid/JID.java b/src/com/isode/stroke/jid/JID.java
index 490a65d..841b84b 100644
--- a/src/com/isode/stroke/jid/JID.java
+++ b/src/com/isode/stroke/jid/JID.java
@@ -207,18 +207,18 @@ public class JID implements Comparable<JID> {
@Override
public String toString() {
String string = new String();
- if (node_.length()!=0) {
- string += node_ + "@";
- }
- string += domain_;
- if (!isBare()) {
- string += "/" + resource_;
- }
- return string;
+ if (node_.length()!=0) {
+ string += node_ + "@";
+ }
+ string += domain_;
+ if (!isBare()) {
+ string += "/" + resource_;
+ }
+ return string;
}
@Override
- public boolean equals(final Object otherObject) {
+ public boolean equals(final Object otherObject) {
if (otherObject == this) {
return true;
}
@@ -237,7 +237,7 @@ public class JID implements Comparable<JID> {
boolean resourceMatch = (resource1 == null && resource2 == null) || (resource1 != null && resource1.equals(resource2));
return nodeMatch && domainMatch && resourceMatch;
}
-
+
/**
* Compare two Jabber IDs by either including the resource part or
* excluding it
@@ -248,11 +248,11 @@ public class JID implements Comparable<JID> {
public int compare(final JID o, CompareType compareType) {
if(this == o) return 0;
if(o == null) return 1;
- if (!node_ .equals(o.node_)) {
- return node_.compareTo(o.node_);
- }
- if (!domain_ .equals(o.domain_)) {
- return domain_.compareTo(o.domain_);
+ if (!node_ .equals(o.node_)) {
+ return node_.compareTo(o.node_);
+ }
+ if (!domain_ .equals(o.domain_)) {
+ return domain_.compareTo(o.domain_);
}
if (compareType == CompareType.WithResource) {
String res1 = getResource();