diff --git a/IPAddress/.classpath b/IPAddress/.classpath index 3aabed2b..362921c5 100644 --- a/IPAddress/.classpath +++ b/IPAddress/.classpath @@ -1,7 +1,7 @@ - + diff --git a/IPAddress/.settings/org.eclipse.jdt.core.prefs b/IPAddress/.settings/org.eclipse.jdt.core.prefs index e1cf9537..1a070d39 100644 --- 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 index 5f23d368..4cd90928 100644 --- a/IPAddress/IP Address test fast performance dist.launch +++ b/IPAddress/IP Address test fast performance dist.launch @@ -6,6 +6,8 @@ + + @@ -15,6 +17,7 @@ + diff --git a/IPAddress/IP Address test fast performance.launch b/IPAddress/IP Address test fast performance.launch index a97216a1..709c55e1 100644 --- a/IPAddress/IP Address test fast performance.launch +++ b/IPAddress/IP Address test fast performance.launch @@ -6,8 +6,11 @@ + + + diff --git a/IPAddress/IP Address test slow.launch b/IPAddress/IP Address test slow.launch index 865c8c51..b7e15254 100644 --- a/IPAddress/IP Address test slow.launch +++ b/IPAddress/IP Address test slow.launch @@ -6,9 +6,11 @@ + + diff --git a/IPAddress/build.xml b/IPAddress/build.xml index bb24d6db..874d467a 100644 --- a/IPAddress/build.xml +++ b/IPAddress/build.xml @@ -1,6 +1,6 @@ Create IP address jar - + diff --git a/IPAddress/dist/IPAddress.jar b/IPAddress/dist/IPAddress.jar index eea09340..9ad24c1e 100644 Binary files a/IPAddress/dist/IPAddress.jar and b/IPAddress/dist/IPAddress.jar differ diff --git a/IPAddress/maintenance_instructions.txt b/IPAddress/maintenance_instructions.txt index 2beebb4e..c1a2d02e 100644 --- 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/" 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 index c11408bc..c0e6e712 100644 --- 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 -> 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 -> 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 index bc3dd053..579fc3a6 100644 --- a/IPAddress/src/inet.ipaddr/inet/ipaddr/PrefixBlockAllocator.java +++ b/IPAddress/src/inet.ipaddr/inet/ipaddr/PrefixBlockAllocator.java @@ -324,7 +324,7 @@ public AllocatedBlock[] allocateSizes(long ...blockSizes) { * The reserved count is ignored when allocating by bit-length. */ @SuppressWarnings("unchecked") - public AllocatedBlock[] allocateMultiBitLens(int ...bitLengths) { + public AllocatedBlock[] allocateBitLengths(int ...bitLengths) { List 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 index 442cf031..045084b1 100644 --- 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 index 22a5ad4b..0cc7fdf8 100644 --- 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") void testAllocator(PrefixBlockAllocator alloc, E blocks[], int bitLengths[], ExpectedBlock expected[]) { alloc.addAvailable(blocks); - AllocatedBlock[] allocatedBlocks = alloc.allocateMultiBitLens(bitLengths); + AllocatedBlock[] allocatedBlocks = alloc.allocateBitLengths(bitLengths); for(int i = 0; i < allocatedBlocks.length; i++) { AllocatedBlock ab = allocatedBlocks[i]; if(expected == null || expected.length <= i) {