Skip to content

Commit

Permalink
version 5.5.0 artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean Foley committed Mar 3, 2024
1 parent 2608276 commit 514bcc9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion IPAddress/build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project name="Create IP Address API" default="run" basedir=".">
<description>Create IP address jar</description>
<property name="version" value="5.4.2"/>
<property name="version" value="5.5.0"/>

<property name="rootOffset" value="."/>
<property name="rootdistdir" location="${rootOffset}/dist"/>
Expand Down
Binary file modified IPAddress/dist/IPAddress.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ public boolean contains(IPAddressSeqRange other) {
* 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.
* <p>
* 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.
* An address is in the range if 0 <= {@link #enumerate(IPAddress)} < {@link #getCount()}.
* An address is in the range if 0 &lt;= {@link #enumerate(IPAddress)} &lt; {@link #getCount()}.
* <p>
* Returns null when the argument is a multi-valued subnet. The argument must be an individual address.
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public boolean add(IPAddress addr) {
* <p>
* Returns true if the prefix block or address address exists already in one the two tries, false otherwise.
* <p>
* Use {@link #getAddedNode(Address)} to get the node for the address rather than just checking for its existence.
* Use {@link #getAddedNode(IPAddress)} to get the node for the address rather than just checking for its existence.
*
* @param addr
* @return
Expand All @@ -217,12 +217,12 @@ public boolean contains(IPAddress addr) {
* <p>
* Returns true if the prefix block or address was removed, false if not already in one of the two tries.
* <p>
* You can also remove by calling {@link #getAddedNode(Address)} to get the node and then calling {@link BinaryTreeNode#remove()} on the node.
* You can also remove by calling {@link #getAddedNode(IPAddress)} to get the node and then calling {@link BinaryTreeNode#remove()} on the node.
* <p>
* When an address is removed, the corresponding node may remain in the trie if it remains a subnet block for two sub-nodes.
* If the corresponding node can be removed from the trie, it will be.
*
* @see #removeElementsContainedBy(Address)
* @see #removeElementsContainedBy(IPAddress)
* @param addr
* @return
*/
Expand All @@ -240,7 +240,7 @@ public boolean remove(IPAddress addr) {
* <p>
* Returns true if the subnet or address is contained by a trie element, false otherwise.
* <p>
* To get all the containing addresses, use {@link #elementsContaining(Address)}.
* To get all the containing addresses, use {@link #elementsContaining(IPAddress)}.
*
* @param addr
* @return
Expand Down
3 changes: 3 additions & 0 deletions IPAddress/src/inet.ipaddr/inet/ipaddr/test/TrieTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2583,6 +2583,7 @@ <R extends AddressTrie<T>, T extends Address> void testContainment(
}

} else if(set instanceof WrappedMap) {
@SuppressWarnings("unchecked")
WrappedMap<T,?> wrapped = (WrappedMap<T,?>) set;
AddressTrieMap<T, ?> trieMap = wrapped.map;
AssociativeAddressTrie<T,?> trie = trieMap.asTrie();
Expand Down Expand Up @@ -3123,6 +3124,7 @@ private <R extends AddressTrie<T>, T extends Address> void testBoundedClone(Navi
AddressTrieSet<T> trieSet = (AddressTrieSet<T>) set;
newTrie = trieSet.asTrie();
} else if(set instanceof WrappedMap) {
@SuppressWarnings("unchecked")
WrappedMap<T, ?> wrapped = (WrappedMap<T, ?>) set;
newTrie = wrapped.map.asTrie();
} else {
Expand Down Expand Up @@ -3335,6 +3337,7 @@ <T extends Address, V> void testSetEdges(
testBoundedTrieIterators(trieSet, ordered, lowerInd, upperInd, AddressTrieSet::containingFirstIterator);
testBoundedTrieIterators(trieSet, ordered, lowerInd, upperInd, AddressTrieSet::blockSizeIterator);
} else if(set instanceof WrappedMap) {
@SuppressWarnings("unchecked")
WrappedMap<T,?> wrappedMap = (WrappedMap<T,?>) set;
testBoundedMapIterators(wrappedMap, ordered, lowerInd, upperInd, EntrySet::iterator);
testBoundedMapIterators(wrappedMap, ordered, lowerInd, upperInd, EntrySet::containingFirstIterator);
Expand Down

0 comments on commit 514bcc9

Please sign in to comment.