Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Young <consult.awy@gmail.com>2015-03-03 14:14:47 (GMT)
committerAlan Young <consult.awy@gmail.com>2015-04-10 06:52:20 (GMT)
commit2811d9f331111d9e8014ff2f4bf7dd2707cc56fc (patch)
tree5787e92c77de26af783cdb27c761da720d73970e
parent87153e86a3340d3ace31efb4330e60cc937d34f2 (diff)
downloadstroke-2811d9f331111d9e8014ff2f4bf7dd2707cc56fc.zip
stroke-2811d9f331111d9e8014ff2f4bf7dd2707cc56fc.tar.bz2
Remove unused imports & fix some uses of generics.
Change-Id: Id919d64f05964e5cb5657d22c7eaf6ae7199bb7a
Diffstat
-rw-r--r--src/com/isode/stroke/elements/DiscoInfo.java8
-rw-r--r--src/com/isode/stroke/elements/DiscoItems.java8
-rw-r--r--src/com/isode/stroke/parser/AaltoXMLParser.java3
-rw-r--r--src/com/isode/stroke/parser/AttributeMap.java8
-rw-r--r--src/com/isode/stroke/parser/GenericPayloadParserFactory.java8
-rw-r--r--src/com/isode/stroke/parser/payloadparsers/PubSubCreateParser.java7
-rw-r--r--src/com/isode/stroke/parser/payloadparsers/PubSubSubscribeParser.java7
-rw-r--r--src/com/isode/stroke/parser/payloadparsers/RosterParser.java7
-rw-r--r--src/com/isode/stroke/parser/payloadparsers/SearchPayloadParserFactory.java7
-rw-r--r--src/com/isode/stroke/serializer/MessageSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubCreateSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubEventCollectionSerializer.java8
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubEventDeleteSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubOwnerDeleteSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubSubscribeSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/PubSubSubscriptionSerializer.java7
-rw-r--r--src/com/isode/stroke/serializer/payloadserializers/SearchPayloadSerializer.java7
-rw-r--r--src/com/isode/stroke/streamstack/ConnectionLayer.java8
-rw-r--r--src/com/isode/stroke/streamstack/XMPPLayer.java8
19 files changed, 25 insertions, 111 deletions
diff --git a/src/com/isode/stroke/elements/DiscoInfo.java b/src/com/isode/stroke/elements/DiscoInfo.java
index 4ef1537..35786e7 100644
--- a/src/com/isode/stroke/elements/DiscoInfo.java
+++ b/src/com/isode/stroke/elements/DiscoInfo.java
@@ -3,7 +3,7 @@
* All rights reserved.
*/
/*
- * Copyright (c) 2012, Isode Limited, London, England.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.elements;
@@ -174,7 +174,7 @@ public class DiscoInfo extends Payload {
* @return Copy of the list of identities. Non-null.
*/
public List<Identity> getIdentities() {
- return new ArrayList(identities_);
+ return new ArrayList<Identity>(identities_);
}
/**
@@ -191,7 +191,7 @@ public class DiscoInfo extends Payload {
* @return Copy of the list of features. Nonnull.
*/
public List<String> getFeatures() {
- return new ArrayList(features_);
+ return new ArrayList<String>(features_);
}
/**
@@ -221,7 +221,7 @@ public class DiscoInfo extends Payload {
* @return A copy of the list, where the contents are references to the same objects.
*/
public List<Form> getExtensions() {
- return new ArrayList(extensions_);
+ return new ArrayList<Form>(extensions_);
}
}
diff --git a/src/com/isode/stroke/elements/DiscoItems.java b/src/com/isode/stroke/elements/DiscoItems.java
index 8ecd12a..c6aa6dc 100644
--- a/src/com/isode/stroke/elements/DiscoItems.java
+++ b/src/com/isode/stroke/elements/DiscoItems.java
@@ -1,9 +1,5 @@
/*
- * Copyright (c) 2010, Kevin Smith.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2012, Isode Limited, London, England.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.elements;
@@ -85,7 +81,7 @@ public class DiscoItems extends Payload {
}
public List<Item> getItems() {
- return new ArrayList(items_);
+ return new ArrayList<Item>(items_);
}
public void addItem(Item item) {
diff --git a/src/com/isode/stroke/parser/AaltoXMLParser.java b/src/com/isode/stroke/parser/AaltoXMLParser.java
index 99618fa..c635654 100644
--- a/src/com/isode/stroke/parser/AaltoXMLParser.java
+++ b/src/com/isode/stroke/parser/AaltoXMLParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012, Isode Limited, London, England.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.parser;
@@ -8,7 +8,6 @@ import com.fasterxml.aalto.AsyncInputFeeder;
import com.fasterxml.aalto.AsyncXMLStreamReader;
import com.fasterxml.aalto.stax.InputFactoryImpl;
import com.isode.stroke.base.ByteArray;
-import com.isode.stroke.eventloop.EventLoop;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
diff --git a/src/com/isode/stroke/parser/AttributeMap.java b/src/com/isode/stroke/parser/AttributeMap.java
index 0e43785..7cd01ad 100644
--- a/src/com/isode/stroke/parser/AttributeMap.java
+++ b/src/com/isode/stroke/parser/AttributeMap.java
@@ -1,9 +1,5 @@
/*
- * Copyright (c) 2010-2012, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.parser;
@@ -94,7 +90,7 @@ public class AttributeMap {
* Internal method (used for unit tests).
*/
public List<Entry> getEntries() {
- return new ArrayList(attributes);
+ return new ArrayList<Entry>(attributes);
}
private String getInternal(String name, String ns) {
diff --git a/src/com/isode/stroke/parser/GenericPayloadParserFactory.java b/src/com/isode/stroke/parser/GenericPayloadParserFactory.java
index 76f3fda..779efc8 100644
--- a/src/com/isode/stroke/parser/GenericPayloadParserFactory.java
+++ b/src/com/isode/stroke/parser/GenericPayloadParserFactory.java
@@ -1,9 +1,5 @@
/*
- * Copyright (c) 2010, 2011 Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, 2011 Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.parser;
@@ -12,7 +8,7 @@ public class GenericPayloadParserFactory<T extends PayloadParser> implements Pay
private final String tag_;
private final String xmlns_;
- private final Class payloadClass_;
+ private final Class<? extends PayloadParser> payloadClass_;
public GenericPayloadParserFactory(final String tag, final Class<? extends PayloadParser> payloadClass) {
this(tag, "", payloadClass);
diff --git a/src/com/isode/stroke/parser/payloadparsers/PubSubCreateParser.java b/src/com/isode/stroke/parser/payloadparsers/PubSubCreateParser.java
index 8c56dc6..b1d03d1 100644
--- a/src/com/isode/stroke/parser/payloadparsers/PubSubCreateParser.java
+++ b/src/com/isode/stroke/parser/payloadparsers/PubSubCreateParser.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -13,7 +9,6 @@ import com.isode.stroke.parser.AttributeMap;
import com.isode.stroke.parser.GenericPayloadParser;
import com.isode.stroke.parser.PayloadParser;
import com.isode.stroke.parser.PayloadParserFactoryCollection;
-import com.isode.stroke.elements.PubSubConfigure;
import com.isode.stroke.elements.PubSubCreate;
public class PubSubCreateParser extends GenericPayloadParser<PubSubCreate> {
diff --git a/src/com/isode/stroke/parser/payloadparsers/PubSubSubscribeParser.java b/src/com/isode/stroke/parser/payloadparsers/PubSubSubscribeParser.java
index dbc8449..475ea94 100644
--- a/src/com/isode/stroke/parser/payloadparsers/PubSubSubscribeParser.java
+++ b/src/com/isode/stroke/parser/payloadparsers/PubSubSubscribeParser.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -14,7 +10,6 @@ import com.isode.stroke.parser.GenericPayloadParser;
import com.isode.stroke.parser.PayloadParser;
import com.isode.stroke.parser.PayloadParserFactoryCollection;
import com.isode.stroke.jid.JID;
-import com.isode.stroke.elements.PubSubOptions;
import com.isode.stroke.elements.PubSubSubscribe;
public class PubSubSubscribeParser extends GenericPayloadParser<PubSubSubscribe> {
diff --git a/src/com/isode/stroke/parser/payloadparsers/RosterParser.java b/src/com/isode/stroke/parser/payloadparsers/RosterParser.java
index 0cdc30c..bb57c55 100644
--- a/src/com/isode/stroke/parser/payloadparsers/RosterParser.java
+++ b/src/com/isode/stroke/parser/payloadparsers/RosterParser.java
@@ -1,14 +1,9 @@
/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.parser.payloadparsers;
-import com.isode.stroke.elements.Payload;
import com.isode.stroke.elements.RosterItemPayload;
import com.isode.stroke.elements.RosterPayload;
import com.isode.stroke.jid.JID;
diff --git a/src/com/isode/stroke/parser/payloadparsers/SearchPayloadParserFactory.java b/src/com/isode/stroke/parser/payloadparsers/SearchPayloadParserFactory.java
index 2fa34af..c2203c8 100644
--- a/src/com/isode/stroke/parser/payloadparsers/SearchPayloadParserFactory.java
+++ b/src/com/isode/stroke/parser/payloadparsers/SearchPayloadParserFactory.java
@@ -1,16 +1,11 @@
/*
- * Copyright (c) 2010 Remko Tronçon
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, 2011 Isode Limited, London, England.
+ * Copyright (c) 2010-2015 Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.parser.payloadparsers;
import com.isode.stroke.parser.GenericPayloadParserFactory;
-import com.isode.stroke.parser.PayloadParser;
public class SearchPayloadParserFactory extends GenericPayloadParserFactory<SearchPayloadParser> {
diff --git a/src/com/isode/stroke/serializer/MessageSerializer.java b/src/com/isode/stroke/serializer/MessageSerializer.java
index e86b186..e293f1e 100644
--- a/src/com/isode/stroke/serializer/MessageSerializer.java
+++ b/src/com/isode/stroke/serializer/MessageSerializer.java
@@ -1,16 +1,11 @@
/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.serializer;
import com.isode.stroke.elements.Message;
-import com.isode.stroke.elements.Stanza;
import com.isode.stroke.serializer.xml.XMLElement;
public class MessageSerializer extends GenericStanzaSerializer<Message>{
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubCreateSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubCreateSerializer.java
index 45b4128..8b5d1e8 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubCreateSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubCreateSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,7 +8,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubConfigure;
import com.isode.stroke.elements.PubSubCreate;
public class PubSubCreateSerializer extends GenericPayloadSerializer<PubSubCreate> {
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventCollectionSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventCollectionSerializer.java
index 194d9bb..0e8e161 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventCollectionSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventCollectionSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,9 +8,7 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubEventAssociate;
import com.isode.stroke.serializer.xml.XMLRawTextNode;
-import com.isode.stroke.elements.PubSubEventDisassociate;
import com.isode.stroke.elements.PubSubEventCollection;
public class PubSubEventCollectionSerializer extends GenericPayloadSerializer<PubSubEventCollection> {
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventDeleteSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventDeleteSerializer.java
index 1c54016..dd91489 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubEventDeleteSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubEventDeleteSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,7 +8,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubEventRedirect;
import com.isode.stroke.serializer.xml.XMLRawTextNode;
import com.isode.stroke.elements.PubSubEventDelete;
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubOwnerDeleteSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubOwnerDeleteSerializer.java
index 6518f56..96a586a 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubOwnerDeleteSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubOwnerDeleteSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,7 +8,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubOwnerRedirect;
import com.isode.stroke.serializer.xml.XMLRawTextNode;
import com.isode.stroke.elements.PubSubOwnerDelete;
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscribeSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscribeSerializer.java
index 9a886b9..690b4c9 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscribeSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscribeSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,7 +8,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubOptions;
import com.isode.stroke.elements.PubSubSubscribe;
public class PubSubSubscribeSerializer extends GenericPayloadSerializer<PubSubSubscribe> {
diff --git a/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscriptionSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscriptionSerializer.java
index 41e6f9d..da834b4 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscriptionSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/PubSubSubscriptionSerializer.java
@@ -1,9 +1,5 @@
/*
-* Copyright (c) 2014, Isode Limited, London, England.
-* All rights reserved.
-*/
-/*
-* Copyright (c) 2014, Remko Tronçon.
+* Copyright (c) 2013-2015, Isode Limited, London, England.
* All rights reserved.
*/
@@ -12,7 +8,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.PayloadSerializerCollection;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.elements.PubSubSubscribeOptions;
import com.isode.stroke.serializer.xml.XMLRawTextNode;
import com.isode.stroke.elements.PubSubSubscription;
diff --git a/src/com/isode/stroke/serializer/payloadserializers/SearchPayloadSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/SearchPayloadSerializer.java
index f4a0f8f..3edfe23 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/SearchPayloadSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/SearchPayloadSerializer.java
@@ -1,9 +1,5 @@
/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.serializer.payloadserializers;
@@ -11,7 +7,6 @@ package com.isode.stroke.serializer.payloadserializers;
import com.isode.stroke.elements.SearchPayload;
import com.isode.stroke.serializer.GenericPayloadSerializer;
import com.isode.stroke.serializer.xml.XMLElement;
-import com.isode.stroke.serializer.xml.XMLTextNode;
/**
* SearchPayload to String.
diff --git a/src/com/isode/stroke/streamstack/ConnectionLayer.java b/src/com/isode/stroke/streamstack/ConnectionLayer.java
index 7333c0b..0927a32 100644
--- a/src/com/isode/stroke/streamstack/ConnectionLayer.java
+++ b/src/com/isode/stroke/streamstack/ConnectionLayer.java
@@ -1,17 +1,11 @@
/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-/*
- * Copyright (c) 2010, Isode Limited, London, England.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.streamstack;
import com.isode.stroke.base.ByteArray;
import com.isode.stroke.network.Connection;
-import com.isode.stroke.signals.Signal1;
import com.isode.stroke.signals.Slot1;
public class ConnectionLayer implements LowLayer {
diff --git a/src/com/isode/stroke/streamstack/XMPPLayer.java b/src/com/isode/stroke/streamstack/XMPPLayer.java
index 34c25b5..2042bb0 100644
--- a/src/com/isode/stroke/streamstack/XMPPLayer.java
+++ b/src/com/isode/stroke/streamstack/XMPPLayer.java
@@ -1,10 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-/*
- * Copyright (c) 2010-2011, Isode Limited, London, England.
+ * Copyright (c) 2010-2015, Isode Limited, London, England.
* All rights reserved.
*/
package com.isode.stroke.streamstack;
@@ -13,7 +8,6 @@ import com.isode.stroke.base.ByteArray;
import com.isode.stroke.elements.Element;
import com.isode.stroke.elements.ProtocolHeader;
import com.isode.stroke.elements.StreamType;
-import com.isode.stroke.eventloop.EventLoop;
import com.isode.stroke.parser.PayloadParserFactoryCollection;
import com.isode.stroke.parser.XMPPParser;
import com.isode.stroke.parser.XMPPParserClient;