Skip to content

Commit 514bcc9

Browse files
author
Sean Foley
committed
version 5.5.0 artifacts
1 parent 2608276 commit 514bcc9

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

IPAddress/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project name="Create IP Address API" default="run" basedir=".">
22
<description>Create IP address jar</description>
3-
<property name="version" value="5.4.2"/>
3+
<property name="version" value="5.5.0"/>
44

55
<property name="rootOffset" value="."/>
66
<property name="rootdistdir" location="${rootOffset}/dist"/>

IPAddress/dist/IPAddress.jar

110 KB
Binary file not shown.

IPAddress/src/inet.ipaddr/inet/ipaddr/IPAddressSeqRange.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ public boolean contains(IPAddressSeqRange other) {
856856
* If within or above the range, it is the distance to the lower boundary of the sequential range. If below the, returns the number of addresses following the address to the lower range boundary.
857857
* <p>
858858
* The method does not return null if this range does not contain the address. You can call {@link #contains(IPAddress)} or you can compare with {@link #getCount()} to check for containment.
859-
* An address is in the range if 0 <= {@link #enumerate(IPAddress)} < {@link #getCount()}.
859+
* An address is in the range if 0 &lt;= {@link #enumerate(IPAddress)} &lt; {@link #getCount()}.
860860
* <p>
861861
* Returns null when the argument is a multi-valued subnet. The argument must be an individual address.
862862
* <p>

IPAddress/src/inet.ipaddr/inet/ipaddr/format/util/BaseDualIPv4v6Tries.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public boolean add(IPAddress addr) {
196196
* <p>
197197
* Returns true if the prefix block or address address exists already in one the two tries, false otherwise.
198198
* <p>
199-
* Use {@link #getAddedNode(Address)} to get the node for the address rather than just checking for its existence.
199+
* Use {@link #getAddedNode(IPAddress)} to get the node for the address rather than just checking for its existence.
200200
*
201201
* @param addr
202202
* @return
@@ -217,12 +217,12 @@ public boolean contains(IPAddress addr) {
217217
* <p>
218218
* Returns true if the prefix block or address was removed, false if not already in one of the two tries.
219219
* <p>
220-
* You can also remove by calling {@link #getAddedNode(Address)} to get the node and then calling {@link BinaryTreeNode#remove()} on the node.
220+
* You can also remove by calling {@link #getAddedNode(IPAddress)} to get the node and then calling {@link BinaryTreeNode#remove()} on the node.
221221
* <p>
222222
* When an address is removed, the corresponding node may remain in the trie if it remains a subnet block for two sub-nodes.
223223
* If the corresponding node can be removed from the trie, it will be.
224224
*
225-
* @see #removeElementsContainedBy(Address)
225+
* @see #removeElementsContainedBy(IPAddress)
226226
* @param addr
227227
* @return
228228
*/
@@ -240,7 +240,7 @@ public boolean remove(IPAddress addr) {
240240
* <p>
241241
* Returns true if the subnet or address is contained by a trie element, false otherwise.
242242
* <p>
243-
* To get all the containing addresses, use {@link #elementsContaining(Address)}.
243+
* To get all the containing addresses, use {@link #elementsContaining(IPAddress)}.
244244
*
245245
* @param addr
246246
* @return

IPAddress/src/inet.ipaddr/inet/ipaddr/test/TrieTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -2583,6 +2583,7 @@ <R extends AddressTrie<T>, T extends Address> void testContainment(
25832583
}
25842584

25852585
} else if(set instanceof WrappedMap) {
2586+
@SuppressWarnings("unchecked")
25862587
WrappedMap<T,?> wrapped = (WrappedMap<T,?>) set;
25872588
AddressTrieMap<T, ?> trieMap = wrapped.map;
25882589
AssociativeAddressTrie<T,?> trie = trieMap.asTrie();
@@ -3123,6 +3124,7 @@ private <R extends AddressTrie<T>, T extends Address> void testBoundedClone(Navi
31233124
AddressTrieSet<T> trieSet = (AddressTrieSet<T>) set;
31243125
newTrie = trieSet.asTrie();
31253126
} else if(set instanceof WrappedMap) {
3127+
@SuppressWarnings("unchecked")
31263128
WrappedMap<T, ?> wrapped = (WrappedMap<T, ?>) set;
31273129
newTrie = wrapped.map.asTrie();
31283130
} else {
@@ -3335,6 +3337,7 @@ <T extends Address, V> void testSetEdges(
33353337
testBoundedTrieIterators(trieSet, ordered, lowerInd, upperInd, AddressTrieSet::containingFirstIterator);
33363338
testBoundedTrieIterators(trieSet, ordered, lowerInd, upperInd, AddressTrieSet::blockSizeIterator);
33373339
} else if(set instanceof WrappedMap) {
3340+
@SuppressWarnings("unchecked")
33383341
WrappedMap<T,?> wrappedMap = (WrappedMap<T,?>) set;
33393342
testBoundedMapIterators(wrappedMap, ordered, lowerInd, upperInd, EntrySet::iterator);
33403343
testBoundedMapIterators(wrappedMap, ordered, lowerInd, upperInd, EntrySet::containingFirstIterator);

0 commit comments

Comments
 (0)