Menu
▾
▴
[Openfast-commit] SF.net SVN: openfast:[307] branches/generics-cleanup
|
From: <ope...@li...> - 2013-05-01 11:07:13
|
Revision: 307
http://sourceforge.net/p/openfast/code/307
Author: joshseidel
Date: 2013-05-01 11:06:58 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Add annotations and other various Java 7 features.
Modified Paths:
--------------
branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java
branches/generics-cleanup/src/main/java/org/openfast/BitVector.java
branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java
branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java
branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java
branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java
branches/generics-cleanup/src/main/java/org/openfast/Context.java
branches/generics-cleanup/src/main/java/org/openfast/Global.java
branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java
branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java
branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java
branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java
branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java
branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java
branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java
branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java
branches/generics-cleanup/src/main/java/org/openfast/QName.java
branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java
branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java
branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java
branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java
branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java
branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java
branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java
branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java
branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java
branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java
branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java
branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java
branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java
branches/generics-cleanup/src/main/java/org/openfast/examples/consumer/FastMessageConsumer.java
branches/generics-cleanup/src/main/java/org/openfast/examples/consumer/Main.java
branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java
branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java
branches/generics-cleanup/src/main/java/org/openfast/examples/performance/HexadecimalInputStream.java
branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java
branches/generics-cleanup/src/main/java/org/openfast/examples/producer/FastMessageProducer.java
branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java
branches/generics-cleanup/src/main/java/org/openfast/examples/producer/MulticastFastMessageProducer.java
branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java
branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java
branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java
branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java
branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java
branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java
branches/generics-cleanup/src/main/java/org/openfast/extensions/MapFieldParser.java
branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java
branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java
branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockWriter.java
branches/generics-cleanup/src/main/java/org/openfast/impl/CmeTcpReplayMessageBlockReader.java
branches/generics-cleanup/src/main/java/org/openfast/impl/CmeTcpReplayMessageBlockWriter.java
branches/generics-cleanup/src/main/java/org/openfast/logging/FastMessageLogger.java
branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java
branches/generics-cleanup/src/main/java/org/openfast/logging/Loggers.java
branches/generics-cleanup/src/main/java/org/openfast/session/AbstractSessionControlProtocol.java
branches/generics-cleanup/src/main/java/org/openfast/session/BasicClient.java
branches/generics-cleanup/src/main/java/org/openfast/session/BasicOpenFastContext.java
branches/generics-cleanup/src/main/java/org/openfast/session/ConnectionListener.java
branches/generics-cleanup/src/main/java/org/openfast/session/FastServer.java
branches/generics-cleanup/src/main/java/org/openfast/session/LocalConnection.java
branches/generics-cleanup/src/main/java/org/openfast/session/LocalEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/MessageListener.java
branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/Session.java
branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_0.java
branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java
branches/generics-cleanup/src/main/java/org/openfast/session/SessionFactory.java
branches/generics-cleanup/src/main/java/org/openfast/session/SessionHandler.java
branches/generics-cleanup/src/main/java/org/openfast/session/SessionListener.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastClientEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastConnection.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java
branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastServerEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpConnection.java
branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ComposedDecimalConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/DynamicTemplateReferenceConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/GroupConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/SequenceConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/StaticTemplateReferenceConverter.java
branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/VariableLengthInstructionConverter.java
branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java
branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java
branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java
branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java
branches/generics-cleanup/src/main/java/org/openfast/template/Group.java
branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java
branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java
branches/generics-cleanup/src/main/java/org/openfast/template/Scalar.java
branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java
branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java
branches/generics-cleanup/src/main/java/org/openfast/template/TwinValue.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/AbstractFieldParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/ByteVectorParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/ScalarParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/SequenceParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/StringParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/TemplateParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/TemplateRefParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/VariableLengthScalarParser.java
branches/generics-cleanup/src/main/java/org/openfast/template/loader/XMLMessageTemplateLoader.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/AlwaysPresentOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/ConstantOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/CopyOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/DefaultOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaDecimalOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaIntegerOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaStringOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/IncrementIntegerOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/NoneOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/Operator.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/operator/TailOperatorCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/ComposedDecimalSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/DynamicTemplateReferenceSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/GroupSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/ScalarSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SequenceSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializingContext.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/StaticTemplateReferenceSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/TemplateSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/VariableLengthScalarSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/serializer/XMLMessageTemplateSerializer.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/ByteVectorType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/DateType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/DecimalConverter.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/DecimalType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/IntegerType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/SimpleType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/StringType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/UnsignedIntegerType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/AsciiString.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/ByteVectorType.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/IntegerCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NotStopBitEncodedTypeCodec.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableAsciiString.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SignedInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/UnicodeString.java
branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/UnsignedInteger.java
branches/generics-cleanup/src/main/java/org/openfast/util/ArrayIterator.java
branches/generics-cleanup/src/main/java/org/openfast/util/Key.java
branches/generics-cleanup/src/main/java/org/openfast/util/RecordingInputStream.java
branches/generics-cleanup/src/main/java/org/openfast/util/RecordingOutputStream.java
branches/generics-cleanup/src/main/java/org/openfast/util/SimpleIntegerMap.java
branches/generics-cleanup/src/main/java/org/openfast/util/UnboundedCache.java
branches/generics-cleanup/src/main/java/org/openfast/util/Util.java
branches/generics-cleanup/src/main/java/org/openfast/util/XmlWriter.java
branches/generics-cleanup/src/test/java/org/openfast/DictionaryTest.java
branches/generics-cleanup/src/test/java/org/openfast/ExhaustiveOperatorTest.java
branches/generics-cleanup/src/test/java/org/openfast/TemplateTest.java
branches/generics-cleanup/src/test/java/org/openfast/acceptance/EncodingDecodingAcceptanceTest.java
branches/generics-cleanup/src/test/java/org/openfast/codec/FastDecoderTest.java
branches/generics-cleanup/src/test/java/org/openfast/impl/CmeMessageBlockReaderWriterTest.java
branches/generics-cleanup/src/test/java/org/openfast/impl/CmeTcpReplayMessageBlockReaderWriterTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/SCP_1_1_Test.java
branches/generics-cleanup/src/test/java/org/openfast/session/SessionControlProtocol_1_1Test.java
branches/generics-cleanup/src/test/java/org/openfast/session/multicast/MulticastOutputStreamTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ComposedDecimalConverterTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ScalarConverterTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/SequenceConverterTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/TemplateDefinitionTest.java
branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/VariableLengthInstructionConverterTest.java
branches/generics-cleanup/src/test/java/org/openfast/submitted/BitVectorOobExceptionTest.java
branches/generics-cleanup/src/test/java/org/openfast/submitted/EbsDecodingErrorTest.java
branches/generics-cleanup/src/test/java/org/openfast/submitted/OpraFeedTest.java
branches/generics-cleanup/src/test/java/org/openfast/submitted/TemplateDictionaryScopeTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/BasicTemplateRegistryTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/DynamicTemplateReferenceTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/GroupTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/ScalarTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/SequenceTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/Array.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/ScalarParserTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/SequenceParserTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/StringParserTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/TemplateRefParserTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/loader/XMLMessageTemplateLoaderTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaByteVectorOperatorTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaStringOperatorTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaUnicodeOperatorTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/ComposedDecimalTest.java
branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/SingleFieldDecimalTest.java
branches/generics-cleanup/src/test/java/org/openfast/test/IOExceptionOnCloseStream.java
branches/generics-cleanup/src/test/java/org/openfast/test/IOExceptionThrowingStream.java
branches/generics-cleanup/src/test/java/org/openfast/test/OpenFastTestCase.java
branches/generics-cleanup/src/test/java/org/openfast/test/TestUtil.java
branches/generics-cleanup/src/test/java/org/openfast/util/ArrayIteratorTest.java
branches/generics-cleanup/src/test/java/org/openfast/util/SimpleIntegerMapTest.java
branches/generics-cleanup/src/test/java/org/openfast/util/UtilTest.java
Property Changed:
----------------
branches/generics-cleanup/
Index: branches/generics-cleanup
===================================================================
--- branches/generics-cleanup 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup 2013-05-01 11:06:58 UTC (rev 307)
Property changes on: branches/generics-cleanup
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/trunk:267-298
+/branches/generics-cleanup:300-306
+/trunk:267-299
\ No newline at end of property
Modified: branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -28,9 +28,10 @@
public class ApplicationTypeDictionary implements Dictionary {
- private Map<QName, Map<QName, ScalarValue>> dictionary = new HashMap<QName, Map<QName, ScalarValue>>();
+ private Map<QName, Map<QName, ScalarValue>> dictionary = new HashMap<>();
- public ScalarValue lookup(Group template, QName key, QName applicationType) {
+ @Override
+ public ScalarValue lookup(Group template, QName key, QName applicationType) {
if (dictionary.containsKey(template.getTypeReference())) {
Map<QName, ScalarValue> applicationTypeMap = dictionary.get(template.getTypeReference());
if (applicationTypeMap.containsKey(key))
@@ -39,11 +40,13 @@
return ScalarValue.UNDEFINED;
}
- public void reset() {
- dictionary = new HashMap<QName, Map<QName, ScalarValue>>();
+ @Override
+ public void reset() {
+ dictionary = new HashMap<>();
}
- public void store(Group group, QName applicationType, QName key, ScalarValue value) {
+ @Override
+ public void store(Group group, QName applicationType, QName key, ScalarValue value) {
if (!dictionary.containsKey(group.getTypeReference())) {
dictionary.put(group.getTypeReference(), new HashMap<QName, ScalarValue>());
}
@@ -51,7 +54,8 @@
applicationTypeDictionary.put(key, value);
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuilder builder = new StringBuilder();
Iterator<QName> templateIterator = dictionary.keySet().iterator();
while (templateIterator.hasNext()) {
Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVector.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/BitVector.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/BitVector.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -67,7 +67,8 @@
return ((bytes[fieldIndex / 7] & (1 << (6 - (fieldIndex % 7)))) > 0);
}
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if ((obj == null) || !(obj instanceof BitVector)) {
return false;
}
@@ -86,7 +87,8 @@
return true;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return bytes.hashCode();
}
@@ -94,7 +96,8 @@
return (bytes.length > 1) && ((bytes[bytes.length - 1] & VALUE_BITS_SET) == 0);
}
- public String toString() {
+ @Override
+ public String toString() {
return "BitVector [" + ByteUtil.convertByteArrayToBitString(bytes) + "]";
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -22,16 +22,19 @@
public class BitVectorReader {
public static final BitVectorReader NULL = new BitVectorReader(null) {
- public boolean read() {
+ @Override
+ public boolean read() {
throw new IllegalStateException();
}
- public boolean hasMoreBitsSet() {
+ @Override
+ public boolean hasMoreBitsSet() {
return false;
}
};
public static final BitVectorReader INFINITE_TRUE = new BitVectorReader(null) {
- public boolean read() {
+ @Override
+ public boolean read() {
return true;
}
};
@@ -54,7 +57,8 @@
return vector.indexOfLastSet() > index;
}
- public String toString() {
+ @Override
+ public String toString() {
return vector.toString();
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -28,7 +28,8 @@
this.value = value;
}
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if ((obj == null) || !(obj instanceof BitVectorValue)) {
return false;
}
@@ -40,7 +41,8 @@
return other.value.equals(this.value);
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return value.hashCode();
}
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -47,13 +47,13 @@
}
public static byte[] convertHexStringToByteArray(String hexString) {
- if (hexString == null) {
+ if (hexString == null) {
return new byte[0];
}
- hexString = hexString.replaceAll(" ", "");
- byte[] bytes = new byte[hexString.length() / 2];
- for (int i = 0; i < hexString.length(); i += 2) {
- bytes[i / 2] = (byte) Integer.parseInt(hexString.substring(i, i + 2), 16);
+ String hexStringReplaced = hexString.replaceAll(" ", "");
+ byte[] bytes = new byte[hexStringReplaced.length() / 2];
+ for (int i = 0; i < hexStringReplaced.length(); i += 2) {
+ bytes[i / 2] = (byte) Integer.parseInt(hexStringReplaced.substring(i, i + 2), 16);
}
return bytes;
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -37,11 +37,13 @@
this.length = length;
}
- public byte[] getBytes() {
+ @Override
+ public byte[] getBytes() {
return value;
}
- public String serialize() {
+ @Override
+ public String serialize() {
StringBuffer builder = new StringBuffer(value.length * 2);
for (byte v : value) {
String hex = Integer.toHexString(v & 0xff);
@@ -50,11 +52,13 @@
return builder.toString();
}
- public String toString() {
+ @Override
+ public String toString() {
return new String(value, offset, length);
}
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if ((obj == null) || !(obj instanceof ByteVectorValue)) {
return false;
}
@@ -73,7 +77,8 @@
return true;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return value.hashCode();
}
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/Context.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -47,14 +47,14 @@
public class Context implements OpenFastContext {
private TemplateRegistry templateRegistry = new BasicTemplateRegistry();
private int lastTemplateId;
- private final Map<String, Dictionary> dictionaries = new HashMap<String, Dictionary>();
+ private final Map<String, Dictionary> dictionaries = new HashMap<>();
private ErrorHandler errorHandler = ErrorHandler.DEFAULT;
private QName currentApplicationType;
private final List<TemplateRegisteredListener> listeners = Collections.emptyList();
private boolean traceEnabled;
private Trace encodeTrace;
private Trace decodeTrace;
- private final Map<QName, Cache> caches = new HashMap<QName, Cache>();
+ private final Map<QName, Cache> caches = new HashMap<>();
private final OpenFastContext parentContext;
private FastMessageLogger logger = null;
@@ -67,14 +67,16 @@
dictionaries.put("template", new TemplateDictionary());
dictionaries.put("type", new ApplicationTypeDictionary());
}
- public int getTemplateId(MessageTemplate template) {
+ @Override
+ public int getTemplateId(MessageTemplate template) {
if (!templateRegistry.isRegistered(template)) {
errorHandler.error(FastConstants.D9_TEMPLATE_NOT_REGISTERED, "The template " + template + " has not been registered.");
return 0;
}
return templateRegistry.getId(template);
}
- public MessageTemplate getTemplate(int templateId) {
+ @Override
+ public MessageTemplate getTemplate(int templateId) {
if (!templateRegistry.isRegistered(templateId)) {
errorHandler.error(FastConstants.D9_TEMPLATE_NOT_REGISTERED, "The template with id " + templateId
+ " has not been registered.");
@@ -82,7 +84,8 @@
}
return templateRegistry.get(templateId);
}
- public void registerTemplate(int templateId, MessageTemplate template) {
+ @Override
+ public void registerTemplate(int templateId, MessageTemplate template) {
templateRegistry.register(templateId, template);
Iterator<TemplateRegisteredListener> iter = listeners.iterator();
while (iter.hasNext()) {
@@ -116,7 +119,8 @@
dict.reset();
}
}
- public void setErrorHandler(ErrorHandler errorHandler) {
+ @Override
+ public void setErrorHandler(ErrorHandler errorHandler) {
this.errorHandler = errorHandler;
}
public void newMessage(MessageTemplate template) {
@@ -125,10 +129,12 @@
public void setCurrentApplicationType(QName name) {
currentApplicationType = name;
}
- public TemplateRegistry getTemplateRegistry() {
+ @Override
+ public TemplateRegistry getTemplateRegistry() {
return templateRegistry;
}
- public void setTemplateRegistry(TemplateRegistry registry) {
+ @Override
+ public void setTemplateRegistry(TemplateRegistry registry) {
this.templateRegistry = registry;
}
public boolean isTraceEnabled() {
@@ -171,14 +177,16 @@
}
caches.get(key).store(index, value);
}
- public FastMessageLogger getLogger() {
+ @Override
+ public FastMessageLogger getLogger() {
if (logger == null) {
return parentContext.getLogger();
}
return logger;
}
- public void setLogger(FastMessageLogger logger) {
+ @Override
+ public void setLogger(FastMessageLogger logger) {
this.logger = logger;
}
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/Global.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/Global.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/Global.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -28,7 +28,7 @@
public final class Global {
private static ErrorHandler errorHandler = ErrorHandler.DEFAULT;
private static int currentImplicitId = (int) (System.currentTimeMillis() % 10000);
- private static final ThreadLocal<ByteArrayOutputStream> buffers = new ThreadLocal<ByteArrayOutputStream>();
+ private static final ThreadLocal<ByteArrayOutputStream> buffers = new ThreadLocal<>();
public static void setErrorHandler(ErrorHandler handler) {
if (handler == null) {
Modified: branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -28,9 +28,10 @@
public class GlobalDictionary implements Dictionary {
- protected Map<QName, ScalarValue> table = new HashMap<QName, ScalarValue>();
+ protected Map<QName, ScalarValue> table = new HashMap<>();
- public ScalarValue lookup(Group template, QName key, QName applicationType) {
+ @Override
+ public ScalarValue lookup(Group template, QName key, QName applicationType) {
if (!table.containsKey(key)) {
return ScalarValue.UNDEFINED;
}
@@ -38,15 +39,18 @@
return table.get(key);
}
- public void store(Group group, QName applicationType, QName key, ScalarValue value) {
+ @Override
+ public void store(Group group, QName applicationType, QName key, ScalarValue value) {
table.put(key, value);
}
- public void reset() {
+ @Override
+ public void reset() {
table.clear();
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuilder builder = new StringBuilder();
Iterator<QName> keyIterator = table.keySet().iterator();
while (keyIterator.hasNext()) {
Modified: branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -61,7 +61,7 @@
}
public Iterator<FieldValue> iterator() {
- return new ArrayIterator<FieldValue>(values);
+ return new ArrayIterator<>(values);
}
public int getInt(int fieldIndex) {
@@ -348,7 +348,8 @@
return getValue(fieldName) != null;
}
- public FieldValue copy() {
+ @Override
+ public FieldValue copy() {
FieldValue[] copies = new FieldValue[values.length];
for (int i = 0; i < copies.length; ++i) {
copies[i] = values[i].copy();
Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -24,11 +24,13 @@
public interface MessageBlockReader {
MessageBlockReader NULL = new MessageBlockReader() {
- public boolean readBlock(InputStream in) {
+ @Override
+ public boolean readBlock(InputStream in) {
return true;
}
- public void messageRead(InputStream in, Message message) { }
+ @Override
+ public void messageRead(InputStream in, Message message) { }
@Override
public String toString() {
Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -6,7 +6,8 @@
public interface MessageBlockWriter {
MessageBlockWriter NULL = new MessageBlockWriter() {
- public void writeBlockLength(OutputStream out, Message message, byte[] encodedMessage) throws IOException {
+ @Override
+ public void writeBlockLength(OutputStream out, Message message, byte[] encodedMessage) throws IOException {
}
};
Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -85,7 +85,8 @@
context.registerTemplate(templateId, template);
}
- public void close() {
+ @Override
+ public void close() {
try {
in.close();
} catch (IOException e) {
@@ -97,16 +98,18 @@
return in;
}
- public void addMessageHandler(MessageTemplate template, MessageHandler handler) {
+ @Override
+ public void addMessageHandler(MessageTemplate template, MessageHandler handler) {
if (templateHandlers == Collections.EMPTY_MAP) {
- templateHandlers = new HashMap<MessageTemplate, MessageHandler>();
+ templateHandlers = new HashMap<>();
}
templateHandlers.put(template, handler);
}
- public void addMessageHandler(MessageHandler handler) {
+ @Override
+ public void addMessageHandler(MessageHandler handler) {
if (handlers == Collections.EMPTY_LIST) {
- handlers = new ArrayList<MessageHandler>(4);
+ handlers = new ArrayList<>(4);
}
handlers.add(handler);
}
@@ -115,7 +118,8 @@
context.setTemplateRegistry(registry);
}
- public TemplateRegistry getTemplateRegistry() {
+ @Override
+ public TemplateRegistry getTemplateRegistry() {
return context.getTemplateRegistry();
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -93,7 +93,8 @@
encoder.registerTemplate(templateId, template);
}
- public void close() {
+ @Override
+ public void close() {
try {
out.close();
} catch (IOException e) {
@@ -105,16 +106,18 @@
return out;
}
- public void addMessageHandler(MessageTemplate template, MessageHandler handler) {
+ @Override
+ public void addMessageHandler(MessageTemplate template, MessageHandler handler) {
if (templateHandlers == Collections.EMPTY_MAP) {
- templateHandlers = new HashMap<MessageTemplate, MessageHandler>();
+ templateHandlers = new HashMap<>();
}
templateHandlers.put(template, handler);
}
- public void addMessageHandler(MessageHandler handler) {
+ @Override
+ public void addMessageHandler(MessageHandler handler) {
if (handlers == Collections.EMPTY_LIST) {
- handlers = new ArrayList<MessageHandler>(4);
+ handlers = new ArrayList<>(4);
}
handlers.add(handler);
}
@@ -133,7 +136,8 @@
this.blockWriter = blockWriter;
}
- public TemplateRegistry getTemplateRegistry() {
+ @Override
+ public TemplateRegistry getTemplateRegistry() {
return context.getTemplateRegistry();
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -7,32 +7,40 @@
public class NullOpenFastContext implements OpenFastContext {
- public MessageTemplate getTemplate(int templateId) {
+ @Override
+ public MessageTemplate getTemplate(int templateId) {
return null;
}
- public int getTemplateId(MessageTemplate template) {
+ @Override
+ public int getTemplateId(MessageTemplate template) {
return 0;
}
- public TemplateRegistry getTemplateRegistry() {
+ @Override
+ public TemplateRegistry getTemplateRegistry() {
return null;
}
- public void registerTemplate(int templateId, MessageTemplate template) {
+ @Override
+ public void registerTemplate(int templateId, MessageTemplate template) {
}
- public void setErrorHandler(ErrorHandler errorHandler) {
+ @Override
+ public void setErrorHandler(ErrorHandler errorHandler) {
}
- public void setTemplateRegistry(TemplateRegistry registry) {
+ @Override
+ public void setTemplateRegistry(TemplateRegistry registry) {
}
- public FastMessageLogger getLogger() {
+ @Override
+ public FastMessageLogger getLogger() {
return FastMessageLogger.NULL;
}
- public void setLogger(FastMessageLogger logger) {
+ @Override
+ public void setLogger(FastMessageLogger logger) {
}
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -27,6 +27,8 @@
public abstract NumericValue subtract(NumericValue priorValue);
public abstract NumericValue add(NumericValue addend);
public abstract boolean equals(int value);
- public abstract long toLong();
- public abstract int toInt();
+ @Override
+ public abstract long toLong();
+ @Override
+ public abstract int toInt();
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/QName.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/QName.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/QName.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -51,7 +51,8 @@
return name;
}
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if (obj == this)
return true;
if (obj == null || obj.getClass() != this.getClass())
@@ -60,11 +61,13 @@
return other.namespace.equals(namespace) && other.name.equals(name);
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return name.hashCode() + 31 * namespace.hashCode();
}
- public String toString() {
+ @Override
+ public String toString() {
if (namespace.equals(""))
return name;
return name + "[" + namespace + "]";
Modified: branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -59,7 +59,8 @@
return false;
}
- public FieldValue copy() {
+ @Override
+ public FieldValue copy() {
return this; // immutable objects don't need actual copies.
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -48,19 +48,20 @@
public void add(GroupValue value) {
if (elements == Collections.EMPTY_LIST) {
- elements = new ArrayList<GroupValue>();
+ elements = new ArrayList<>();
}
elements.add(value);
}
public void add(FieldValue[] values) {
if (elements == Collections.EMPTY_LIST) {
- elements = new ArrayList<GroupValue>();
+ elements = new ArrayList<>();
}
elements.add(new GroupValue(sequence.getGroup(), values));
}
- public boolean equals(Object other) {
+ @Override
+ public boolean equals(Object other) {
if (other == this) {
return true;
}
@@ -82,11 +83,13 @@
return true;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
return elements.hashCode() * 37 + sequence.hashCode();
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuilder builder = new StringBuilder(4 + elements.size() * 24);
Iterator<GroupValue> iter = elements.iterator();
builder.append("[ ");
@@ -110,7 +113,8 @@
return this.elements.toArray(new GroupValue[elements.size()]);
}
- public FieldValue copy() {
+ @Override
+ public FieldValue copy() {
SequenceValue value = new SequenceValue(this.sequence);
for (GroupValue element : elements) {
value.add((GroupValue) element.copy());
Modified: branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -15,31 +15,36 @@
this.name = nodeName;
}
- public void addNode(Node node) {
+ @Override
+ public void addNode(Node node) {
if (nodes.isEmpty())
- nodes = new ArrayList<Node>(3);
+ nodes = new ArrayList<>(3);
nodes.add(node);
}
- public List<Node> getNodes() {
+ @Override
+ public List<Node> getNodes() {
return nodes;
}
- public String getAttribute(QName name) {
+ @Override
+ public String getAttribute(QName name) {
return attributes.get(name);
}
- public Map<QName, String> getAttributes() {
+ @Override
+ public Map<QName, String> getAttributes() {
return attributes;
}
- public List<Node> getChildren(QName name) {
+ @Override
+ public List<Node> getChildren(QName name) {
List<Node> children = Collections.emptyList();
for (int i = 0; i < nodes.size() && name != null; ++i) {
Node child = (Node)nodes.get(i);
if (name.equals(child.getNodeName())) {
if (children.isEmpty()) {
- children = new ArrayList<Node>();
+ children = new ArrayList<>();
}
children.add(nodes.get(i));
}
@@ -47,22 +52,26 @@
return children;
}
- public QName getNodeName() {
+ @Override
+ public QName getNodeName() {
return name;
}
- public void setAttribute(QName name, String value) {
+ @Override
+ public void setAttribute(QName name, String value) {
if (attributes.isEmpty()) {
- attributes = new HashMap<QName, String>();
+ attributes = new HashMap<>();
}
attributes.put(name, value);
}
- public boolean hasAttribute(QName name) {
+ @Override
+ public boolean hasAttribute(QName name) {
return attributes.containsKey(name);
}
- public boolean hasChild(QName name) {
+ @Override
+ public boolean hasChild(QName name) {
for (int i = 0; i < nodes.size() && name != null; ++i) {
Node child = (Node)nodes.get(i);
if (name.equals(child.getNodeName())) {
Modified: branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -28,9 +28,10 @@
public class TemplateDictionary implements Dictionary {
- protected Map<Group, Map<QName, ScalarValue>> table = new HashMap<Group, Map<QName, ScalarValue>>();
+ protected Map<Group, Map<QName, ScalarValue>> table = new HashMap<>();
- public ScalarValue lookup(Group template, QName key, QName applicationType) {
+ @Override
+ public ScalarValue lookup(Group template, QName key, QName applicationType) {
if (!table.containsKey(template)) {
return ScalarValue.UNDEFINED;
}
@@ -42,11 +43,13 @@
return ScalarValue.UNDEFINED;
}
- public void reset() {
+ @Override
+ public void reset() {
table.clear();
}
- public void store(Group group, QName applicationType, QName key, ScalarValue valueToEncode) {
+ @Override
+ public void store(Group group, QName applicationType, QName key, ScalarValue valueToEncode) {
if (!table.containsKey(group)) {
table.put(group, new HashMap<QName, ScalarValue>());
}
@@ -54,7 +57,8 @@
table.get(group).put(key, valueToEncode);
}
- public String toString() {
+ @Override
+ public String toString() {
StringBuilder builder = new StringBuilder();
Iterator<Group> templateIterator = table.keySet().iterator();
while (templateIterator.hasNext()) {
Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -102,7 +102,8 @@
/**
* Reset the FAST dictionary.
*/
- public void reset() {
+ @Override
+ public void reset() {
context.reset();
}
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -47,7 +47,8 @@
context.newMessage(template);
return template.encode(message, context);
}
- public void reset() {
+ @Override
+ public void reset() {
context.reset();
}
public void registerTemplate(int templateId, MessageTemplate template) {
@@ -55,7 +56,7 @@
}
public void addTemplateRegisteredListener(TemplateRegisteredListener templateRegisteredListener) {
if (listeners.isEmpty()) {
- listeners = new ArrayList<TemplateRegisteredListener>();
+ listeners = new ArrayList<>();
}
listeners.add(templateRegisteredListener);
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -30,7 +30,8 @@
private String indent = "";
private PrintWriter out = new PrintWriter(System.out);
- public void groupStart(Group group) {
+ @Override
+ public void groupStart(Group group) {
print(group);
moveDown();
}
@@ -49,11 +50,13 @@
out.flush();
}
- public void groupEnd() {
+ @Override
+ public void groupEnd() {
moveUp();
}
- public void field(Field field, FieldValue value, FieldValue decodedValue, byte[] encoding, int pmapIndex) {
+ @Override
+ public void field(Field field, FieldValue value, FieldValue decodedValue, byte[] encoding, int pmapIndex) {
StringBuilder scalarDecode = new StringBuilder();
scalarDecode.append(field.getName()).append(": ");
scalarDecode.append(ByteUtil.convertByteArrayToHexString(encoding));
@@ -61,7 +64,8 @@
print(scalarDecode);
}
- public void pmap(byte[] bytes) {
+ @Override
+ public void pmap(byte[] bytes) {
print("PMAP: " + ByteUtil.convertByteArrayToHexString(bytes));
}
Modified: branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -32,28 +32,32 @@
public class BasicEncodeTrace implements Trace {
- private Stack<TraceGroup> stack = new Stack<TraceGroup>();
+ private Stack<TraceGroup> stack = new Stack<>();
private PrintWriter out = new PrintWriter(System.out);
- public void groupStart(Group group) {
+ @Override
+ public void groupStart(Group group) {
TraceGroup traceGroup = new TraceGroup(group);
if (!stack.isEmpty())
stack.peek().addGroup(traceGroup);
stack.push(traceGroup);
}
- public void field(Field field, FieldValue value, FieldValue encoded, byte[] encoding, int pmapIndex) {
+ @Override
+ public void field(Field field, FieldValue value, FieldValue encoded, byte[] encoding, int pmapIndex) {
stack.peek().addField(field, value, encoded, pmapIndex, encoding);
}
- public void groupEnd() {
+ @Override
+ public void groupEnd() {
TraceGroup group = (TraceGroup) stack.pop();
if (stack.isEmpty()) {
out.println(group);
}
}
- public void pmap(byte[] pmap) {
+ @Override
+ public void pmap(byte[] pmap) {
stack.peek().setPmap(pmap);
}
@@ -67,7 +71,7 @@
public TraceGroup(Group group) {
this.group = group;
- this.nodes = new ArrayList<TraceNode>(group.getFieldCount());
+ this.nodes = new ArrayList<>(group.getFieldCount());
}
public void setPmap(byte[] pmap) {
@@ -82,19 +86,21 @@
nodes.add(traceGroup);
}
- public StringBuilder serialize(StringBuilder builder, int indent) {
- builder.append(indent(indent)).append(group.getName()).append("\n");
- indent += 2;
+ @Override
+ public StringBuilder serialize(StringBuilder builder, int indent) {
+ builder.append(indent(indent)).append(group.getName()).append("\n");
+ int indentValue = indent + 2;
if (pmap != null)
- builder.append(indent(indent)).append("PMAP: ").append(ByteUtil.convertByteArrayToBitString(pmap)).append("\n");
+ builder.append(indent(indentValue)).append("PMAP: ").append(ByteUtil.convertByteArrayToBitString(pmap)).append("\n");
for (int i = 0; i < nodes.size(); ++i) {
- nodes.get(i).serialize(builder, indent);
+ nodes.get(i).serialize(builder, indentValue);
}
- indent -= 2;
+ indentValue -= 2;
return builder;
}
- public String toString() {
+ @Override
+ public String toString() {
return serialize(new StringBuilder(), 0).toString();
}
}
@@ -118,7 +124,8 @@
this.encoding = encoding;
}
- public StringBuilder serialize(StringBuilder builder, int indent) {
+ @Override
+ public StringBuilder serialize(StringBuilder builder, int indent) {
builder.append(indent(indent));
builder.append(field.getName()).append("[");
if (field.usesPresenceMapBit())
Modified: branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -25,7 +25,7 @@
import org.openfast.Message;
public class ErrorCode {
- private static final Map<Integer, ErrorCode> ALERT_CODES = new HashMap<Integer, ErrorCode>();
+ private static final Map<Integer, ErrorCode> ALERT_CODES = new HashMap<>();
private final int code;
private final String shortName;
private final String description;
@@ -69,11 +69,13 @@
return type;
}
- public String toString() {
+ @Override
+ public String toString() {
return shortName + ": " + description;
}
- public boolean equals(Object obj) {
+ @Override
+ public boolean equals(Object obj) {
if (obj == this)
return true;
if (obj == null || !(obj instanceof ErrorCode))
Modified: branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -22,20 +22,24 @@
public interface ErrorHandler {
public static final ErrorHandler DEFAULT = new ErrorHandler() {
- public void error(ErrorCode code, String message) {
+ @Override
+ public void error(ErrorCode code, String message) {
code.throwException(message);
}
- public void error(ErrorCode code, String message, Throwable t) {
+ @Override
+ public void error(ErrorCode code, String message, Throwable t) {
throw new FastException(message, code, t);
}
};
public static final ErrorHandler NULL = new ErrorHandler() {
- public void error(ErrorCode code, String message) {
+ @Override
+ public void error(ErrorCode code, String message) {
}
- public void error(ErrorCode code, String message, Throwable t) {
+ @Override
+ public void error(ErrorCode code, String message, Throwable t) {
}
};
Modified: branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java
===================================================================
--- branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java 2013-03-11 16:57:11 UTC (rev 306)
+++ branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java 2013-05-01 11:06:58 UTC (rev 307)
@@ -75,14 +75,16 @@
QName LENGTH_NS_ATTR = new QName("namespace", TEMPLATE_DEFINITION_1_1);
QName LENGTH_ID_ATTR = new QName("id", TEMPLATE_DEFINITION_1_1);
ErrorHandler BASIC_ERROR_HANDLER = new ErrorHandler() {
- public void error(ErrorCode code, String message) {
+ @Override
+ public void error(ErrorCode code, String message) {
if (REPORTABLE.equals(code.getType()))
System.out.println("WARNING: " + message);
else
code.thro...
[truncated message content] |
