Renamed allocateMultiBitLens to allocateBitLengths, fixed two javadoc

issues, committed new IPAddress.jar
seancfoley · Dec 15, 2022 · 7149de2 · 7149de2
1 parent ef39467
commit 7149de2
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 9 deletions.
diff --git a/IPAddress/.classpath b/IPAddress/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/inet.ipaddr"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 11.0.14">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk 11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/IPAddress/.settings/org.eclipse.jdt.core.prefs b/IPAddress/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=9
+org.eclipse.jdt.core.compiler.source=11
diff --git a/IPAddress/IP Address test fast performance dist.launch b/IPAddress/IP Address test fast performance dist.launch
@@ -6,6 +6,8 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;IPAddress&quot; path=&quot;5&quot; type=&quot;4&quot;/&gt;&#10;"/>
@@ -15,6 +17,7 @@
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/IPAddress/dist/IPAddress.jar&quot; path=&quot;4&quot; type=&quot;2&quot;/&gt;&#10;"/>
     </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="IPAddress"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="fast performance"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="IPAddress"/>
 </launchConfiguration>
diff --git a/IPAddress/IP Address test fast performance.launch b/IPAddress/IP Address test fast performance.launch
@@ -6,8 +6,11 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="inet.ipaddr.test.TestRunner"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="IPAddress"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="fast performance"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="IPAddress"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2g"/>

diff --git a/IPAddress/IP Address test slow.launch b/IPAddress/IP Address test slow.launch
@@ -6,9 +6,11 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="inet.ipaddr.test.TestRunner"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="IPAddress"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Xmx1024m"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="IPAddress"/>
 </launchConfiguration>
diff --git a/IPAddress/build.xml b/IPAddress/build.xml
@@ -1,6 +1,6 @@
 <project name="Create IP Address API" default="run" basedir=".">
 	<description>Create IP address jar</description>
-	<property name="version" value="5.3.4"/>
+	<property name="version" value="5.4.0"/>
 
 	<property name="rootOffset" value="."/>
 	<property name="rootdistdir" location="${rootOffset}/dist"/>

diff --git a/IPAddress/dist/IPAddress.jar b/IPAddress/dist/IPAddress.jar
diff --git a/IPAddress/maintenance_instructions.txt b/IPAddress/maintenance_instructions.txt
@@ -49,6 +49,10 @@ Figure out your branching strategy for the release, if applicable, branch if nec
 If your previous release is based on the master branch,
 you will first want to ensure you create a branch for the previous release before you check your new code into master for the new release.
 
+If you create the new branch on github, you might not be able to see it with "git branch -r" or most other git commands.
+Use "git ls-remote --heads origin" to see it.  From there, I believe "refs/heads/<branchname>" is the full branch name and you maybe be able to use that name to track it 
+See https://stackoverflow.com/a/50192006/6801443 and https://intellipaat.com/community/13708/git-list-remote-branches-how-do-i-list-all-remote-branches-in-git-1-7).
+
 B Github
 
 1. Edit the release "version" property in build.xml

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/IPAddressSeqRange.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/IPAddressSeqRange.java
@@ -595,7 +595,7 @@ public String toNormalizedString(String separator) {
 
 	/**
 	 * Produces a normalized string for the address range.
-	 * It has the format "lower -> upper" where lower and upper are the normalized strings for the lowest and highest addresses in the range, given by {@link #getLower()} and {@link #getUpper()}.
+	 * It has the format "lower -&gt; upper" where lower and upper are the normalized strings for the lowest and highest addresses in the range, given by {@link #getLower()} and {@link #getUpper()}.
 	 */
 	@Override
 	public String toNormalizedString() {
@@ -612,7 +612,7 @@ public String toCanonicalString(String separator) {
 
 	/**
 	 * Produces a canonical string for the address range.
-	 * It has the format "lower -> upper" where lower and upper are the canonical strings for the lowest and highest addresses in the range, given by {@link #getLower()} and {@link #getUpper()}.
+	 * It has the format "lower -&gt; upper" where lower and upper are the canonical strings for the lowest and highest addresses in the range, given by {@link #getLower()} and {@link #getUpper()}.
 	 */
 	@Override
 	public String toCanonicalString() {

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/PrefixBlockAllocator.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/PrefixBlockAllocator.java
@@ -324,7 +324,7 @@ public AllocatedBlock<E>[] allocateSizes(long ...blockSizes)  {
 	 * The reserved count is ignored when allocating by bit-length.
 	 */
 	@SuppressWarnings("unchecked")
-	public AllocatedBlock<E>[] allocateMultiBitLens(int ...bitLengths)  {
+	public AllocatedBlock<E>[] allocateBitLengths(int ...bitLengths)  {
 		List<Integer> lengths = new ArrayList<>(bitLengths.length);
 		for(int i = 0; i < bitLengths.length; i++) {
 			lengths.add(bitLengths[i]);

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/format/validate/Validator.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/format/validate/Validator.java
@@ -2045,6 +2045,7 @@ Basically, validatePrefix is the only one that does not make a final decision on
 
 
 
+	@Override
 	public int validatePrefix(CharSequence fullAddr, IPVersion version) throws AddressStringException {
 		return validatePrefixLenString(fullAddr, version);
 	}

diff --git a/IPAddress/src/inet.ipaddr/inet/ipaddr/test/IPAddressTest.java b/IPAddress/src/inet.ipaddr/inet/ipaddr/test/IPAddressTest.java
@@ -4080,7 +4080,7 @@ void testAllocator(String blocksStrs[], int bitLengths[], ExpectedBlock expected
 	@SuppressWarnings("unchecked")
 	<E extends IPAddress> void testAllocator(PrefixBlockAllocator<E> alloc, E blocks[], int bitLengths[], ExpectedBlock expected[]) {
 		alloc.addAvailable(blocks);
-		AllocatedBlock<E>[] allocatedBlocks = alloc.allocateMultiBitLens(bitLengths);
+		AllocatedBlock<E>[] allocatedBlocks = alloc.allocateBitLengths(bitLengths);
 		for(int i = 0; i < allocatedBlocks.length; i++) {
 			AllocatedBlock<E> ab = allocatedBlocks[i];
 			if(expected == null || expected.length <= i) {