Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2015-03-03 14:14:47 (GMT) |
|---|---|---|
| committer | Alan Young <consult.awy@gmail.com> | 2015-04-10 06:52:20 (GMT) |
| commit | 2811d9f331111d9e8014ff2f4bf7dd2707cc56fc (patch) | |
| tree | 5787e92c77de26af783cdb27c761da720d73970e /src/com/isode/stroke/parser | |
| parent | 87153e86a3340d3ace31efb4330e60cc937d34f2 (diff) | |
| download | stroke-2811d9f331111d9e8014ff2f4bf7dd2707cc56fc.zip stroke-2811d9f331111d9e8014ff2f4bf7dd2707cc56fc.tar.bz2 | |
Remove unused imports & fix some uses of generics.
Change-Id: Id919d64f05964e5cb5657d22c7eaf6ae7199bb7a
Diffstat (limited to 'src/com/isode/stroke/parser')
7 files changed, 9 insertions, 38 deletions
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> { |